Merge pull request #123 from digitall/dreamweb_tasmNameMap

Add Function Name Remapping to tasm-recover tool...
author: Bertrand Augereau 2011-12-01 12:35:14 -0800
committer: Bertrand Augereau 2011-12-01 12:35:14 -0800
commit: ec8d8207202d74ebb78ec52720bf8ae70ae2afd4 (patch)
tree: 9e8b535ba79d699c408631419dd80965e6eb40c9
parent: 24c355e04fe7fb536bbfd72bdb998b4dbf265148 (diff)
parent: 349cbc527f33858b6275daaa8f770cd6f7fcd42d (diff)
download: scummvm-rg350-ec8d8207202d74ebb78ec52720bf8ae70ae2afd4.tar.gz
scummvm-rg350-ec8d8207202d74ebb78ec52720bf8ae70ae2afd4.tar.bz2
scummvm-rg350-ec8d8207202d74ebb78ec52720bf8ae70ae2afd4.zip
19 files changed, 5200 insertions, 4453 deletions
diff --git a/devtools/tasmrecover/tasm-recover b/devtools/tasmrecover/tasm-recover
index b0cd1e916d..f0411fa3f9 100755
--- a/devtools/tasmrecover/tasm-recover
+++ b/devtools/tasmrecover/tasm-recover
@@ -353,5 +353,753 @@ generator = cpp(context, "DreamGen", blacklist = [
 	'inventory',
 	'mainscreen',
 	'doload',
-	], skip_dispatch_call = True, header_omit_blacklisted = True)
+	], skip_dispatch_call = True, header_omit_blacklisted = True,
+	function_name_remapping = {
+	# This remaps the function naming at output for readability
+	'bothchannels' : 'bothChannels',
+	'usewire' : 'useWire',
+	'getnamepos' : 'getNamePos',
+	'loadtemptext' : 'loadTempText',
+	'femalefan' : 'femaleFan',
+	'identifyob' : 'identifyOb',
+	'trysoundalloc' : 'trySoundAlloc',
+	'uselighter' : 'useLighter',
+	'showmenu' : 'showMenu',
+	'usepoolreader' : 'usePoolReader',
+	'startdmablock' : 'startDMABlock',
+	'useopenbox' : 'useOpenBox',
+	'clearbuffers' : 'clearBuffers',
+	'channel0only' : 'channel0only',
+	'worktoscreenm' : 'workToScreenM',
+	'removeemm' : 'removeEMM',
+	'getobtextstart' : 'getObTextStart',
+	'dumpdiarykeys' : 'dumpDiaryKeys',
+	'getridofreels' : 'getRidOfReels',
+	'readkey' : 'readKey',
+	'louis' : 'louis',
+	'entrytexts' : 'entryTexts',
+	'buttonenter' : 'buttonEnter',
+	'checkinput' : 'checkInput',
+	'setmode' : 'setMode',
+	'getbackfromops' : 'getBackFromOps',
+	'opensarters' : 'openSarters',
+	'putundercentre' : 'putUnderCentre',
+	'checkobjectsize' : 'checkObjectSize',
+	'titles' : 'titles',
+	'deallocatemem' : 'deallocateMem',
+	'mainscreen' : 'mainScreen',
+	'watchreel' : 'watchReel',
+	'showslots' : 'showSlots',
+	'openfilefromc' : 'openFileFromC',
+	'gettime' : 'getTime',
+	'loadtraveltext' : 'loadTravelText',
+	'fadedos' : 'fadeDOS',
+	'drawfloor' : 'drawFloor',
+	'loadkeypad' : 'loadKeypad',
+	'findtext1' : 'findText1',
+	'isryanholding' : 'isRyanHolding',
+	'interupttest' : 'interruptTest',
+	'usecashcard' : 'useCashCard',
+	'usewall' : 'useWall',
+	'opentomb' : 'openTomb',
+	'buttonfour' : 'buttonFour',
+	'dosometalk' : 'doSomeTalk',
+	'getanyaddir' : 'getAnyAdDir',
+	'showsaveops' : 'showSaveOps',
+	'intromonks1' : 'introMonks1',
+	'resetlocation' : 'resetLocation',
+	'intromonks2' : 'introMonks2',
+	'advisor' : 'advisor',
+	'additionaltext' : 'additionalText',
+	'othersmoker' : 'otherSmoker',
+	'dofade' : 'doFade',
+	'useelevator5' : 'useElevator5',
+	'useelevator4' : 'useElevator4',
+	'useelevator1' : 'useElevator1',
+	'useelevator3' : 'useElevator3',
+	'useelevator2' : 'useElevator2',
+	'buttonone' : 'buttonOne',
+	'keyboardread' : 'keyboardRead',
+	'entercode' : 'enterCode',
+	'getopenedsize' : 'getOpenedSize',
+	'doshake' : 'doShake',
+	'resetkeyboard' : 'resetKeyboard',
+	'soundstartup' : 'soundStartup',
+	'slabdoora' : 'sLabDoorA',
+	'slabdoorc' : 'sLabDoorC',
+	'slabdoorb' : 'sLabDoorB',
+	'slabdoore' : 'sLabDoorE',
+	'slabdoord' : 'sLabDoorD',
+	'adjustup' : 'adjustUp',
+	'slabdoorf' : 'sLabDoorF',
+	'loadintroroom' : 'loadIntroRoom',
+	'mousecall' : 'mouseCall',
+	'train' : 'train',
+	'fadedownmon' : 'fadeDownMon',
+	'loadcart' : 'loadCart',
+	'bartender' : 'bartender',
+	'eden' : 'eden',
+	'showdiary' : 'showDiary',
+	'outofopen' : 'outOfOpen',
+	'dircom' : 'dirCom',
+	'dumpkeypad' : 'dumpKeypad',
+	'showsymbol' : 'showSymbol',
+	'endgameseq' : 'endGameSeq',
+	'setbotleft' : 'setBotLeft',
+	'findfirstpath' : 'findFirstPath',
+	'loadold' : 'loadOld',
+	'useslab' : 'useSLab',
+	'dumpzoom' : 'dumpZoom',
+	'usealtar' : 'useAltar',
+	'manasleep2' : 'manAsleep2',
+	'moretalk' : 'moreTalk',
+	'starttalk' : 'startTalk',
+	'delchar' : 'delChar',
+	'getanyad' : 'getAnyAd',
+	'endgame' : 'endGame',
+	'usepipe' : 'usePipe',
+	'getunderzoom' : 'getUnderZoom',
+	'candles' : 'candles',
+	'backobject' : 'backObject',
+	'rollendcredits2' : 'rollEndCredits2',
+	'reminders' : 'reminders',
+	'selectslot2' : 'selectSlot2',
+	'runtap' : 'runTap',
+	'talk' : 'talk',
+	'getridoftemp2' : 'getRidOfTemp2',
+	'usebalcony' : 'useBalcony',
+	'runendseq' : 'runEndSeq',
+	'decide' : 'decide',
+	'disablesoundint' : 'disableSoundInt',
+	'priesttext' : 'priestText',
+	'openpoolboss' : 'openPoolBoss',
+	'buttontwo' : 'buttonTwo',
+	'fadescreendownhalf' : 'fadeScreenDownHalf',
+	'useplate' : 'usePlate',
+	'candles1' : 'candles1',
+	'lookininterface' : 'lookInInterface',
+	'manasleep' : 'manAsleep',
+	'hotelbell' : 'hotelBell',
+	'loadspeech' : 'loadSpeech',
+	'adjustleft' : 'adjustLeft',
+	'calledenslift' : 'callEdensLift',
+	'useclearbox' : 'useClearBox',
+	'entryanims' : 'entryAnims',
+	'getfreead' : 'getFreeAd',
+	'showarrows' : 'showArrows',
+	'walkintoroom' : 'walkIntoRoom',
+	'usehatch' : 'useHatch',
+	'printoutermon' : 'printOuterMon',
+	'setuppit' : 'setupPit',
+	'showpcx' : 'showPCX',
+	'showdecisions' : 'showDecisions',
+	'checkspeed' : 'checkSpeed',
+	'showkeypad' : 'showKeypad',
+	'removeobfrominv' : 'removeObFromInv',
+	'usecoveredbox' : 'useCoveredBox',
+	'openyourneighbour' : 'openYourNeighbour',
+	'fadescreenuphalf' : 'fadeScreenUpHalf',
+	'getridoftempcharset' : 'getRidOfTempCharset',
+	'heavy' : 'heavy',
+	'usekey' : 'useKey',
+	'locklighton' : 'lockLightOn',
+	'useladderb' : 'useLadderB',
+	'discops' : 'discOps',
+	'middlepanel' : 'middlePanel',
+	'monitorlogo' : 'monitorLogo',
+	'entersymbol' : 'enterSymbol',
+	'dirfile' : 'dirFile',
+	'pickupconts' : 'pickupConts',
+	'locklightoff' : 'lockLightOff',
+	'wearwatch' : 'wearWatch',
+	'runintroseq' : 'runIntroSeq',
+	'nextcolon' : 'nextColon',
+	'attendant' : 'attendant',
+	'nextsymbol' : 'nextSymbol',
+	'monks2text' : 'monks2text',
+	'clearpalette' : 'clearPalette',
+	'cantdrop' : 'cantDrop',
+	'getridofall' : 'getRidOfAll',
+	'copper' : 'copper',
+	'openhoteldoor' : 'openHotelDoor',
+	'blank' : 'blank',
+	'drinker' : 'drinker',
+	'placefreeobject' : 'placeFreeObject',
+	'allpalette' : 'allPalette',
+	'rockstar' : 'rockstar',
+	'adjustright' : 'adjustRight',
+	'putunderzoom' : 'putUnderZoom',
+	'vsync' : 'vSync',
+	'findinvpos' : 'findInvPos',
+	'dumpmenu' : 'dumpMenu',
+	'liftnoise' : 'liftNoise',
+	'workoutframes' : 'workoutFrames',
+	'dumpsymbox' : 'dumpSymBox',
+	'loadgame' : 'loadGame',
+	'getridoftemp' : 'getRidOfTemp',
+	'dumpsymbol' : 'dumpSymbol',
+	'buttonsix' : 'buttonSix',
+	'intro2text' : 'intro2Text',
+	'showouterpad' : 'showOuterPad',
+	'getkeyandlogo' : 'getKeyAndLogo',
+	'selectob' : 'selectOb',
+	'useplinth' : 'usePlinth',
+	'usecooker' : 'useCooker',
+	'loadmenu' : 'loadMenu',
+	'checkforemm' : 'checkForEMM',
+	'receptionist' : 'receptionist',
+	'selectslot' : 'selectSlot',
+	'openfilenocheck' : 'openFileNoCheck',
+	'fadeupmon' : 'fadeUpMon',
+	'fadetowhite' : 'fadeToWhite',
+	'loadsavebox' : 'loadSaveBox',
+	'soundend' : 'soundEnd',
+	'redes' : 'redes',
+	'errormessage1' : 'errorMessage1',
+	'errormessage2' : 'errorMessage2',
+	'errormessage3' : 'errorMessage3',
+	'intromagic2' : 'introMagic2',
+	'intromagic3' : 'introMagic3',
+	'edeninbath' : 'edenInBath',
+	'intromagic1' : 'introMagic1',
+	'showdiarypage' : 'showDiaryPage',
+	'useshield' : 'useShield',
+	'getbacktoops' : 'getBackToOps',
+	'rollendcredits' : 'rollEndCredits',
+	'intro1text' : 'intro1Text',
+	'transfertoex' : 'transferToEx',
+	'steady' : 'steady',
+	'reexfrominv' : 'reExFromInv',
+	'examinventory' : 'examineInventory',
+	'getridoftemp3' : 'getRidOfTemp3',
+	'usedryer' : 'useDryer',
+	'outofinv' : 'outOfInv',
+	'diarykeyp' : 'diaryKeyP',
+	'random' : 'random',
+	'mainman' : 'mainMan',
+	'mansatstill' : 'manSatStill',
+	'channel1only' : 'channel1only',
+	'transfermap' : 'transferMap',
+	'showmonk' : 'showMonk',
+	'diarykeyn' : 'diaryKeyN',
+	'set16colpalette' : 'set16ColPalette',
+	'sparky' : 'sparky',
+	'interviewer' : 'interviewer',
+	'purgeanitem' : 'purgeAnItem',
+	'madman' : 'madman',
+	'chewy' : 'chewy',
+	'madmanstelly' : 'madmansTelly',
+	'constant' : 'constant',
+	'purgealocation' : 'purgeALocation',
+	'sparkydrip' : 'sparkyDrip',
+	'getridofpit' : 'getRidOfPit',
+	'nothelderror' : 'notHeldError',
+	'getsetad' : 'getSetAd',
+	'soldier1' : 'soldier1',
+	'getundercentre' : 'getUnderCentre',
+	'checkforexit' : 'checkForExit',
+	'loadseg' : 'loadSeg',
+	'showkeys' : 'showKeys',
+	'setkeyboardint' : 'setKeyboardInt',
+	'priest' : 'priest',
+	'printmessage2' : 'printmessage2',
+	'loadnews' : 'loadNews',
+	'rollem' : 'rollEm',
+	'hangonpq' : 'hangOnPQ',
+	'savegame' : 'saveGame',
+	'findopenpos' : 'findOpenPos',
+	'describeob' : 'describeOb',
+	'deleteexframe' : 'deleteExFrame',
+	'bossman' : 'bossMan',
+	'dosreturn' : 'DOSReturn',
+	'wheelsound' : 'wheelSound',
+	'playguitar' : 'playGuitar',
+	'searchforsame' : 'searchForSame',
+	'enablesoundint' : 'enableSoundInt',
+	'getback1' : 'getBack1',
+	'fadefromwhite' : 'fadeFromWhite',
+	'usewindow' : 'useWindow',
+	'wearshades' : 'wearShades',
+	'pitinterupt' : 'pitInterrupt',
+	'deleverything' : 'delEverything',
+	'fadescreendown' : 'fadeScreenDown',
+	'poolguard' : 'poolGuard',
+	'openinv' : 'openInv',
+	'lookatplace' : 'lookAtPlace',
+	'useaxe' : 'useAxe',
+	'buttonnought' : 'buttonNought',
+	'useelvdoor' : 'useElvDoor',
+	'putbackobstuff' : 'putBackObStuff',
+	'useladder' : 'useLadder',
+	'realcredits' : 'realCredits',
+	'handclap' : 'handClap',
+	'smokebloke' : 'smokeBloke',
+	'afterintroroom' : 'afterIntroRoom',
+	'buttonnine' : 'buttonNine',
+	'findallopen' : 'findAllOpen',
+	'gamer' : 'gamer',
+	'readfromfile' : 'readFromFile',
+	'initialinv' : 'initialInv',
+	'quitsymbol' : 'quitSymbol',
+	'settopright' : 'setTopRight',
+	'findsetobject' : 'findSetObject',
+	'singlekey' : 'singleKey',
+	'hangone' : 'hangOne',
+	'carparkdrip' : 'carParkDrip',
+	'usediary' : 'useDiary',
+	'deleteexobject' : 'deleteExObject',
+	'moneypoke' : 'moneyPoke',
+	'destselect' : 'destSelect',
+	'restoreems' : 'restoreEMS',
+	'lastdest' : 'lastDest',
+	'removefreeobject' : 'removeFreeObject',
+	'trapdoor' : 'trapDoor',
+	'openlouis' : 'openLouis',
+	'buttonthree' : 'buttonThree',
+	'lookatcard' : 'lookAtCard',
+	'helicopter' : 'helicopter',
+	'setsoundoff' : 'setSoundOff',
+	'setpickup' : 'setPickup',
+	'dropobject' : 'dropObject',
+	'isitright' : 'isItRight',
+	'reexfromopen' : 'reExFromOpen',
+	'drawitall' : 'drawItAll',
+	'usestereo' : 'useStereo',
+	'candles2' : 'candles2',
+	'pickupob' : 'pickupOb',
+	'error' : 'error',
+	'showopbox' : 'showOpBox',
+	'clearbeforeload' : 'clearBeforeLoad',
+	'biblequote' : 'bibleQuote',
+	'doload' : 'doLoad',
+	'showexit' : 'showExit',
+	'usetrainer' : 'useTrainer',
+	'addtopresslist' : 'addToPressList',
+	'dmaend' : 'DMAEnd',
+	'dumpcurrent' : 'dumpCurrent',
+	'showdiarykeys' : 'showDiaryKeys',
+	'dontloadseg' : 'dontLoadSeg',
+	'intro3text' : 'intro3Text',
+	'allocatemem' : 'allocateMem',
+	'useopened' : 'useOpened',
+	'inventory' : 'inventory',
+	'fillopen' : 'fillOpen',
+	'signon' : 'signOn',
+	'deleteextext' : 'deleteExText',
+	'foghornsound' : 'foghornSound',
+	'showloadops' : 'showLoadOps',
+	'examicon' : 'examIcon',
+	'showgun' : 'showGun',
+	'louischair' : 'louisChair',
+	'saveems' : 'saveEMS',
+	'locationpic' : 'locationPic',
+	'opentvdoor' : 'openTVDoor',
+	'triggermessage' : 'triggerMessage',
+	'smallcandle' : 'smallCandle',
+	'swapwithopen' : 'swapWithOpen',
+	'dreamweb' : 'dreamweb',
+	'droperror' : 'dropError',
+	'edenscdplayer' : 'edensCDPlayer',
+	'calledensdlift' : 'callEdensDLift',
+	'checkinside' : 'checkInside',
+	'gates' : 'gates',
+	'newgame' : 'newGame',
+	'setwalk' : 'setWalk',
+	'findpathofpoint' : 'findPathOfPoint',
+	'issetobonmap' : 'isSetObOnMap',
+	'getdestinfo' : 'getDestInfo',
+	'drunk' : 'drunk',
+	'getridoftemptext' : 'getRidOfTempText',
+	'setuptimeduse' : 'setupTimedUse',
+	'grafittidoor' : 'grafittiDoor',
+	'nextdest' : 'nextDest',
+	'makecaps' : 'makeCaps',
+	'read' : 'read',
+	'fadescreenups' : 'fadeScreenUps',
+	'hotelcontrol' : 'hotelControl',
+	'mugger' : 'mugger',
+	'atmospheres' : 'atmospheres',
+	'out22c' : 'out22c',
+	'loadpersonal' : 'loadPersonal',
+	'gettingshot' : 'gettingShot',
+	'settopleft' : 'setTopLeft',
+	'searchforstring' : 'searchForString',
+	'selectopenob' : 'selectOpenOb',
+	'security' : 'security',
+	'buttonfive' : 'buttonFive',
+	'soundonreels' : 'soundOnReels',
+	'usegun' : 'useGun',
+	'autoappear' : 'autoAppear',
+	'openryan' : 'openRyan',
+	'callhotellift' : 'callHotelLift',
+	'showman' : 'showMan',
+	'usefullcart' : 'useFullCart',
+	'newplace' : 'newPlace',
+	'loadsample' : 'loadSample',
+	'usecardreader1' : 'useCardReader1',
+	'usecardreader2' : 'useCardReader2',
+	'usecardreader3' : 'useCardReader3',
+	'tattooman' : 'tattooMan',
+	'usehandle' : 'useHandle',
+	'openfile' : 'openFile',
+	'showpuztext' : 'showPuzText',
+	'incryanpage' : 'incRyanPage',
+	'greyscalesum' : 'greyscaleSum',
+	'buttoneight' : 'buttonEight',
+	'findexobject' : 'findExObject',
+	'clearchanges' : 'clearChanges',
+	'usechurchhole' : 'useChurchHole',
+	'searchforfiles' : 'searchForFiles',
+	'monkspeaking' : 'monkSpeaking',
+	'clearrest' : 'clearRest',
+	'barwoman' : 'barWoman',
+	'credits' : 'credits',
+	'madmanrun' : 'madmanRun',
+	'randomnum1' : 'randomNum1',
+	'keeper' : 'keeper',
+	'afternewroom' : 'afterNewRoom',
+	'getexad' : 'getExAd',
+	'closefile' : 'closeFile',
+	'initialmoncols' : 'initialMonCols',
+	'checkforshake' : 'checkForShake',
+	'usebuttona' : 'useButtonA',
+	'fadescreenup' : 'fadeScreenUp',
+	'generalerror' : 'generalError',
+	'mode640x480' : 'mode640x480',
+	'openeden' : 'openEden',
+	'execcommand' : 'execCommand',
+	'obsthatdothings' : 'obsThatDoThings',
+	'updatesymbolbot' : 'updateSymbolBot',
+	'findpuztext' : 'findPuzText',
+	'usechurchgate' : 'useChurchGate',
+	'monkandryan' : 'monkAndRyan',
+	'allocatebuffers' : 'allocateBuffers',
+	'swapwithinv' : 'swapWithInv',
+	'usecontrol' : 'useControl',
+	'buttonseven' : 'buttonSeven',
+	'redrawmainscrn' : 'redrawMainScrn',
+	'showgroup' : 'showGroup',
+	'buttonpress' : 'buttonPress',
+	'makemainscreen' : 'makeMainScreen',
+	'usewinch' : 'useWinch',
+	'setbotright' : 'setBotRight',
+	'setupemm' : 'setupEMM',
+	'aide' : 'aide',
+	'geteitherad' : 'getEitherAd',
+	'zoomonoff' : 'zoomOnOff',
+	'updatesymboltop' : 'updateSymbolTop',
+	'allpointer' : 'allPointer',
+	'checksoundint' : 'checkSoundInt',
+	'clearreels' : 'clearReels',
+	'malefan' : 'maleFan',
+	'dosaveload' : 'doSaveLoad',
+	'createname' : 'createName',
+	'readcitypic' : 'readCityPic',
+	'getpersontext' : 'getPersonText',
+	'intoinv' : 'inToInv',
+	'parser' : 'parser',
+	'setmouse' : 'setMouse',
+	'intro' : 'intro',
+	'fadescreendowns' : 'fadeScreenDowns',
+	'openhoteldoor2' : 'openHotelDoor2',
+	'getridoftempsp' : 'getRidOfTempsP',
+	'scanfornames' : 'scanForNames',
+	'selectlocation' : 'selectLocation',
+	'undertextline' : 'underTextLine',
+	'sitdowninbar' : 'sitDownInBar',
+	'shownames' : 'showNames',
+	'savefileread' : 'saveFileRead',
+	'emergencypurge' : 'emergencyPurge',
+	'usemenu' : 'useMenu',
+	'alleybarksound' : 'alleyBarkSound',
+	'usecart' : 'useCart',
+	'intromusic' : 'introMusic',
+	'quitkey' : 'quitKey',
+	'processtrigger' : 'processTrigger',
+	'volumeadjust' : 'volumeAdjust',
+	'randomnum2' : 'randomNum2',
+	'loadsecondsample' : 'loadSecondSample',
+	'transfercontoex' : 'transferConToEx',
+	'businessman' : 'businessMan',
+	'panelicons1' : 'panelIcons1',
+	'adjustdown' : 'adjustDown',
+	'withwhat' : 'withWhat',
+	'openob' : 'openOb',
+	'createfile' : 'createFile',
+	'userailing' : 'useRailing',
+	'usehole' : 'useHole',
+	'useobject' : 'useObject',
+	'readdesticon' : 'readDestIcon',
+		'randomnumber' : 'randomNumber',
+	'screenupdate' : 'screenUpdate',
+	'saveload' : 'saveLoad',
+	'switchryanon' : 'switchRyanOn',
+	'switchryanoff' : 'switchRyanOff',
+	'quickquit' : 'quickQuit',
+	'quickquit2' : 'quickQuit2',
+	'seecommandtail' : 'seeCommandTail',
+	'multiget' : 'multiGet',
+	'multiput' : 'multiPut',
+	'multidump' : 'multiDump',
+	'frameoutnm' : 'frameOutnm',
+	'frameoutbh' : 'frameOutbh',
+	'frameoutfx' : 'frameOutfx',
+	'clearwork' : 'clearWork',
+	'printundermon' : 'printUnderMon',
+	'kernchars' : 'kernChars',
+	'getnextword' : 'getNextWord',
+	'getnumber' : 'getNumber',
+	'dumptextline' : 'dumpTextLine',
+	'printboth' : 'printBoth',
+	'printchar' : 'printChar',
+	'printdirect' : 'printDirect',
+	'printslow' : 'printSlow',
+	'printmessage' : 'printMessage',
+	'usetimedtext' : 'useTimedText',
+	'dumptimedtext' : 'dumpTimedText',
+	'setuptimedtemp' : 'setupTimedTemp',
+	'putundertimed' : 'putUnderTimed',
+	'getundertimed' : 'getUnderTimed',
+	'worktoscreen' : 'workToScreen',
+	'convertkey' : 'convertKey',
+	'readabyte' : 'readAByte',
+	'readoneblock' : 'readOneBlock',
+	'printsprites' : 'printSprites',
+	'printasprite' : 'printASprite',
+	'eraseoldobs' : 'eraseOldObs',
+	'oldtonames' : 'oldToNames',
+	'namestoold' : 'namesToOld',
+	'loadpalfromiff' : 'loadPalFromIFF',
+	'clearsprites' : 'clearSprites',
+	'makesprite' : 'makeSprite',
+	'showframe' : 'showFrame',
+	'initman' : 'initMan',
+	'aboutturn' : 'aboutTurn',
+	'readheader' : 'readHeader',
+	'fillspace' : 'fillSpace',
+	'getroomdata' : 'getRoomData',
+	'startloading' : 'startLoading',
+	'showreelframe' : 'showReelFrame',
+	'showgamereel' : 'showGameReel',
+	'getreelframeax' : 'getReelFrameAX',
+	'findsource' : 'findSource',
+	'autosetwalk' : 'autoSetWalk',
+	'checkdest' : 'checkDest',
+	'spriteupdate' : 'spriteUpdate',
+	'dodoor' : 'doDoor',
+	'lockeddoorway' : 'lockedDoorway',
+	'liftsprite' : 'liftSprite',
+	'frameoutv' : 'frameOutV',
+	'modifychar' : 'modifyChar',
+	'allocatework' : 'allocateWork',
+	'lockmon' : 'lockMon',
+	'cancelch0' : 'cancelCh0',
+	'cancelch1' : 'cancelCh1',
+	'getroomspaths' : 'getRoomsPaths',
+	'makebackob' : 'makeBackOb',
+	'dealwithspecial' : 'dealWithSpecial',
+	'plotreel' : 'plotReel',
+	'facerightway' : 'faceRightWay',
+	'crosshair' : 'crossHair',
+	'showrain' : 'showRain',
+	'domix' : 'doMix',
+	'channel0tran' : 'channel0Tran',
+	'makenextblock' : 'makeNextBlock',
+	'loopchannel0' : 'loopChannel0',
+	'parseblaster' : 'parseBlaster',
+	'deltextline' : 'delTextLine',
+	'doblocks' : 'doBlocks',
+	'checkifperson' : 'checkIfPerson',
+	'checkiffree' : 'checkIfFree',
+	'checkifex' : 'checkIfEx',
+	'getreelstart' : 'getReelStart',
+	'findobname' : 'findObName',
+	'copyname' : 'copyName',
+	'commandwithob' : 'commandWithOb',
+	'showpanel' : 'showPanel',
+	'updatepeople' : 'updatePeople',
+	'madmantext' : 'madmanText',
+	'madmode' : 'madMode',
+	'movemap' : 'moveMap',
+	'widedoor' : 'wideDoor',
+	'showallobs' : 'showAllObs',
+	'addalong' : 'addAlong',
+	'addlength' : 'addLength',
+	'getdimension' : 'getDimension',
+	'getxad' : 'getXAd',
+	'getyad' : 'getYAd',
+	'getmapad' : 'getMapAd',
+	'calcmapad' : 'calcMapAd',
+	'calcfrframe' : 'calcFrFrame',
+	'finalframe' : 'finalFrame',
+	'commandonly' : 'commandOnly',
+	'makename' : 'makeName',
+	'findlen' : 'findLen',
+	'blocknametext' : 'blockNameText',
+	'walktotext' : 'walkToText',
+	'personnametext' : 'personNameText',
+	'findxyfrompath' : 'findXYFromPath',
+	'findormake' : 'findOrMake',
+	'setallchanges' : 'setAllChanges',
+	'dochange' : 'doChange',
+	'deletetaken' : 'deleteTaken',
+	'placesetobject' : 'placeSetObject',
+	'removesetobject' : 'removeSetObject',
+	'showallfree' : 'showAllFree',
+	'showallex' : 'showAllEx',
+	'adjustlen' : 'adjustLen',
+	'finishedwalking' : 'finishedWalking',
+	'checkone' : 'checkOne',
+	'getblockofpixel' : 'getBlockOfPixel',
+	'getflagunderp' : 'getFlagUnderP',
+	'walkandexamine' : 'walkAndExamine',
+	'obname' : 'obName',
+	'delpointer' : 'delPointer',
+	'showblink' : 'showBlink',
+	'dumpblink' : 'dumpBlink',
+	'dumppointer' : 'dumpPointer',
+	'showpointer' : 'showPointer',
+	'animpointer' : 'animPointer',
+	'showicon' : 'showIcon',
+	'checkcoords' : 'checkCoords',
+	'readmouse' : 'readMouse',
+	'readmouse1' : 'readMouse1',
+	'readmouse2' : 'readMouse2',
+	'readmouse3' : 'readMouse3',
+	'readmouse4' : 'readMouse4',
+	'waitframes' : 'waitFrames',
+	'drawflags' : 'drawFlags',
+	'blockget' : 'blockGet',
+	'addtopeoplelist' : 'addToPeopleList',
+	'getexpos' : 'getExPos',
+	'paneltomap' : 'panelToMap',
+	'maptopanel' : 'mapToPanel',
+	'dumpmap' : 'dumpMap',
+	'obpicture' : 'obPicture',
+	'delthisone' : 'delThisOne',
+	'transferinv' : 'transferInv',
+	'obicons' : 'obIcons',
+	'pixelcheckset' : 'pixelCheckSet',
+	'turnpathon' : 'turnPathOn',
+	'turnpathoff' : 'turnPathOff',
+	'turnanypathon' : 'turnAnyPathOn',
+	'turnanypathoff' : 'turnAnyPathOff',
+	'isitdescribed' : 'isItDescribed',
+	'checkifset' : 'checkIfSet',
+	'checkifpathison' : 'checkIfPathIsOn',
+	'delsprite' : 'delSprite',
+	'dumpeverything' : 'dumpEverything',
+	'isitworn' : 'isItWorn',
+	'makeworn' : 'makeWorn',
+	'obtoinv' : 'obToInv',
+	'showryanpage' : 'showRyanPage',
+	'findallryan' : 'findAllRyan',
+	'fillryan' : 'fillRyan',
+	'useroutine' : 'useRoutine',
+	'hangon' : 'hangOn',
+	'hangonp' : 'hangOnP',
+	'hangonw' : 'hangOnW',
+	'findnextcolon' : 'findNextColon',
+	'usetext' : 'useText',
+	'sortoutmap' : 'sortOutMap',
+	'showcity' : 'showCity',
+	'examineobtext' : 'examineObText',
+	'wornerror' : 'wornError',
+	'getpersframe' : 'getPersFrame',
+	'convicons' : 'convIcons',
+	'examineob' : 'examineOb',
+	'showwatch' : 'showWatch',
+	'dumpwatch' : 'dumpWatch',
+	'showtime' : 'showTime',
+	'roomname' : 'roomName',
+	'transfertext' : 'transferText',
+	'splitintolines' : 'splitIntoLines',
+	'initrain' : 'initRain',
+	'checkbasemem' : 'checkBaseMem',
+	'clearstartpal' : 'clearStartPal',
+	'clearendpal' : 'clearEndPal',
+	'paltostartpal' : 'palToStartPal',
+	'endpaltostart' : 'endPalToStart',
+	'startpaltoend' : 'startPalToEnd',
+	'paltoendpal' : 'palToEndPal',
+	'fadecalculation' : 'fadeCalculation',
+	'watchcount' : 'watchCount',
+	'zoomicon' : 'zoomIcon',
+	'loadroom' : 'loadRoom',
+	'getundermenu' : 'getUnderMenu',
+	'putundermenu' : 'putUnderMenu',
+	'showoutermenu' : 'showOuterMenu',
+	'textforend' : 'textForEnd',
+	'textformonk' : 'textForMonk',
+	'standardload' : 'standardLoad',
+	'twodigitnum' : 'twoDigitNum',
+	'readsetdata' : 'readSetData',
+	'loadintotemp' : 'loadIntoTemp',
+	'loadintotemp2' : 'loadIntoTemp2',
+	'loadintotemp3' : 'loadIntoTemp3',
+	'loadtempcharset' : 'loadTempCharset',
+	'printcurs' : 'printCurs',
+	'delcurs' : 'delCurs',
+	'hangoncurs' : 'hangOnCurs',
+	'fadeupyellows' : 'fadeUpYellows',
+	'fadeupmonfirst' : 'fadeUpMonFirst',
+	'loadroomssample' : 'loadRoomsSample',
+	'printlogo' : 'printLogo',
+	'usemon' : 'useMon',
+	'scrollmonitor' : 'scrollMonitor',
+	'showcurrentfile' : 'showCurrentFile',
+	'monprint' : 'monPrint',
+	'monmessage' : 'monMessage',
+	'neterror' : 'netError',
+	'randomaccess' : 'randomAccess',
+	'turnonpower' : 'turnOnPower',
+	'showmainops' : 'showMainOps',
+	'showdiscops' : 'showDiscOps',
+	'powerlighton' : 'powerLightOn',
+	'powerlightoff' : 'powerLightOff',
+	'accesslighton' : 'accessLightOn',
+	'accesslightoff' : 'accessLightOff',
+	'playchannel0' : 'playChannel0',
+	'playchannel1' : 'playChannel1',
+	'createpanel' : 'createPanel',
+	'createpanel2' : 'createPanel2',
+	'findroominloc' : 'findRoomInLoc',
+	'autolook' : 'autoLook',
+	'dolook' : 'doLook',
+	'reelsonscreen' : 'reelsOnScreen',
+	'showbyte' : 'showByte',
+	'onedigit' : 'oneDigit',
+	'showword' : 'showWord',
+	'convnum' : 'convNum',
+	'usecharset1' : 'useCharset1',
+	'usetempcharset' : 'useTempCharset',
+	'disablepath' : 'disablePath',
+	'getbackfromob' : 'getBackFromOb',
+	'showfirstuse' : 'showFirstUse',
+	'showseconduse' : 'showSecondUse',
+	'actualload' : 'actualLoad',
+	'actualsave' : 'actualSave',
+	'loadposition' : 'loadPosition',
+	'saveposition' : 'savePosition',
+	'saveseg' : 'saveSeg',
+	'openforsave' : 'openForSave',
+	'makeheader' : 'makeHeader',
+	'savefilewrite' : 'savefileWrite',
+	'storeit' : 'storeIt',
+	'restoreall' : 'restoreAll',
+	'restorereels' : 'restoreReels',
+	'allocateload' : 'allocateLoad',
+	'viewfolder' : 'viewFolder',
+	'loadfolder' : 'loadFolder',
+	'showfolder' : 'showFolder',
+	'showleftpage' : 'showLeftPage',
+	'showrightpage' : 'showRightPage',
+	'nextfolder' : 'nextFolder',
+	'lastfolder' : 'lastFolder',
+	'folderhints' : 'folderHints',
+	'folderexit' : 'folderExit',
+	'getlocation' : 'getLocation',
+	'setlocation' : 'setLocation',
+	'getridofpitsetuppit' : 'getRidOfPitSetupPit',
+	})
 generator.generate('dreamweb') #start routine
diff --git a/devtools/tasmrecover/tasm/cpp.py b/devtools/tasmrecover/tasm/cpp.py
index f93f994681..648b434075 100644
--- a/devtools/tasmrecover/tasm/cpp.py
+++ b/devtools/tasmrecover/tasm/cpp.py
@@ -33,7 +33,7 @@ def parse_bin(s):
 	return v
 
 class cpp:
-	def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = [], skip_dispatch_call = False, header_omit_blacklisted = False):
+	def __init__(self, context, namespace, skip_first = 0, blacklist = [], skip_output = [], skip_dispatch_call = False, header_omit_blacklisted = False, function_name_remapping = { }):
 		self.namespace = namespace
 		fname = namespace.lower() + ".cpp"
 		header = namespace.lower() + ".h"
@@ -82,6 +82,7 @@ class cpp:
 		self.skip_output = skip_output
 		self.skip_dispatch_call = skip_dispatch_call
 		self.header_omit_blacklisted = header_omit_blacklisted
+		self.function_name_remapping = function_name_remapping
 		self.translated = []
 		self.proc_addr = []
 		self.used_data_offsets = set()
@@ -288,7 +289,10 @@ namespace %s {
 				jump_proc = True
 		
 		if jump_proc:
-			return "{ %s(); return; }" %name
+			if name in self.function_name_remapping:
+				return "{ %s(); return; }" %self.function_name_remapping[name]
+			else:
+				return "{ %s(); return; }" %name
 		else:
 			# TODO: name or self.resolve_label(name) or self.mangle_label(name)??
 			if name in self.proc.retlabels:
@@ -310,7 +314,10 @@ namespace %s {
 		if name == 'ax':
 			self.body += "\t__dispatch_call(%s);\n" %self.expand('ax', 2)
 			return
-		self.body += "\t%s();\n" %name
+		if name in self.function_name_remapping:
+			self.body += "\t%s();\n" %self.function_name_remapping[name]
+		else:
+			self.body += "\t%s();\n" %name
 		self.schedule(name)
 
 	def _ret(self):
@@ -501,7 +508,10 @@ namespace %s {
 			
 			self.proc_addr.append((name, self.proc.offset))
 			self.body = str()
-			self.body += "void %sContext::%s() {\n\tSTACK_CHECK;\n" %(self.namespace, name);
+			if name in self.function_name_remapping:
+				self.body += "void %sContext::%s() {\n\tSTACK_CHECK;\n" %(self.namespace, self.function_name_remapping[name]);
+			else:
+				self.body += "void %sContext::%s() {\n\tSTACK_CHECK;\n" %(self.namespace, name);
 			self.proc.optimize()
 			self.unbounded = []
 			self.proc.visit(self, skip)
@@ -552,7 +562,10 @@ namespace %s {
 		fd = open(fname, "wt")
 		fd.write("namespace %s {\n" %self.namespace)
 		for p in procs:
-			fd.write("void %sContext::%s() {\n\t::error(\"%s\");\n}\n\n" %(self.namespace, p, p))
+			if p in self.function_name_remapping:
+				fd.write("void %sContext::%s() {\n\t::error(\"%s\");\n}\n\n" %(self.namespace, self.function_name_remapping[p], self.function_name_remapping[p]))
+			else:
+				fd.write("void %sContext::%s() {\n\t::error(\"%s\");\n}\n\n" %(self.namespace, p, p))
 		fd.write("} /*namespace %s */\n" %self.namespace)
 		fd.close()
 
@@ -641,7 +654,10 @@ public:
 				if self.header_omit_blacklisted == False:
 					self.hd.write("\t//void %s();\n" %p)
 			else:
-				self.hd.write("\tvoid %s();\n" %p)
+				if p in self.function_name_remapping:
+					self.hd.write("\tvoid %s();\n" %self.function_name_remapping[p])
+				else:
+					self.hd.write("\tvoid %s();\n" %p)
 
 		self.hd.write("};\n}\n\n#endif\n")
 		self.hd.close()
diff --git a/engines/dreamweb/backdrop.cpp b/engines/dreamweb/backdrop.cpp
index 3e4b4dcb64..07731e543d 100644
--- a/engines/dreamweb/backdrop.cpp
+++ b/engines/dreamweb/backdrop.cpp
@@ -24,7 +24,7 @@
 
 namespace DreamGen {
 
-void DreamGenContext::doblocks() {
+void DreamGenContext::doBlocks() {
 	uint16 dstOffset = data.word(kMapady) * 320 + data.word(kMapadx);
 	uint16 mapOffset = kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx);
 	const uint8 *mapData = segRef(data.word(kMapdata)).ptr(mapOffset, 0);
@@ -63,7 +63,7 @@ void DreamGenContext::doblocks() {
 	}
 }
 
-uint8 DreamGenContext::getxad(const uint8 *setData, uint8 *result) {
+uint8 DreamGenContext::getXAd(const uint8 *setData, uint8 *result) {
 	uint8 v0 = setData[0];
 	uint8 v1 = setData[1];
 	uint8 v2 = setData[2];
@@ -78,7 +78,7 @@ uint8 DreamGenContext::getxad(const uint8 *setData, uint8 *result) {
 	return 1;
 }
 
-uint8 DreamGenContext::getyad(const uint8 *setData, uint8 *result) {
+uint8 DreamGenContext::getYAd(const uint8 *setData, uint8 *result) {
 	uint8 v0 = setData[3];
 	uint8 v1 = setData[4];
 	if (v0 < data.byte(kMapy))
@@ -90,29 +90,29 @@ uint8 DreamGenContext::getyad(const uint8 *setData, uint8 *result) {
 	return 1;
 }
 
-void DreamGenContext::getmapad() {
-	ch = getmapad((const uint8 *)es.ptr(si, 5));
+void DreamGenContext::getMapAd() {
+	ch = getMapAd((const uint8 *)es.ptr(si, 5));
 }
 
-uint8 DreamGenContext::getmapad(const uint8 *setData) {
+uint8 DreamGenContext::getMapAd(const uint8 *setData) {
 	uint8 xad, yad;
-	if (getxad(setData, &xad) == 0)
+	if (getXAd(setData, &xad) == 0)
 		return 0;
 	data.word(kObjectx) = xad;
-	if (getyad(setData, &yad) == 0)
+	if (getYAd(setData, &yad) == 0)
 		return 0;
 	data.word(kObjecty) = yad;
 	return 1;
 }
 
-void DreamGenContext::calcfrframe() {
+void DreamGenContext::calcFrFrame() {
 	uint8 width, height;
-	calcfrframe(&width, &height);
+	calcFrFrame(&width, &height);
 	cl = width;
 	ch = height;
 }
 
-void DreamGenContext::calcfrframe(uint8* width, uint8* height) {
+void DreamGenContext::calcFrFrame(uint8* width, uint8* height) {
 	const Frame *frame = (const Frame *)segRef(data.word(kFrsegment)).ptr(data.word(kCurrentframe) * sizeof(Frame), sizeof(Frame));
 	data.word(kSavesource) = data.word(kFramesad) + frame->ptr();
 	data.byte(kSavesize+0) = frame->width;
@@ -123,21 +123,21 @@ void DreamGenContext::calcfrframe(uint8* width, uint8* height) {
 	*height = frame->height;
 }
 
-void DreamGenContext::finalframe() {
+void DreamGenContext::finalFrame() {
 	uint16 x, y;
-	finalframe(&x, &y);
+	finalFrame(&x, &y);
 	di = x;
 	bx = y;
 }
 
-void DreamGenContext::finalframe(uint16 *x, uint16 *y) {
+void DreamGenContext::finalFrame(uint16 *x, uint16 *y) {
 	data.byte(kSavex) = (data.word(kObjectx) + data.word(kOffsetx)) & 0xff;
 	data.byte(kSavey) = (data.word(kObjecty) + data.word(kOffsety)) & 0xff;
 	*x = data.word(kObjectx);
 	*y = data.word(kObjecty);
 }
 
-void DreamGenContext::showallobs() {
+void DreamGenContext::showAllObs() {
 	data.word(kListpos) = kSetlist;
 	memset(segRef(data.word(kBuffers)).ptr(kSetlist, 0), 0xff, 128 * 5);
 	data.word(kFrsegment) = data.word(kSetframes);
@@ -148,22 +148,22 @@ void DreamGenContext::showallobs() {
 	SetObject *setEntries = (SetObject *)segRef(data.word(kSetdat)).ptr(0, 128 * sizeof(SetObject));
 	for (size_t i = 0; i < 128; ++i) {
 		SetObject *setEntry = setEntries + i;
-		if (getmapad(setEntry->mapad) == 0)
+		if (getMapAd(setEntry->mapad) == 0)
 			continue;
 		uint8 currentFrame = setEntry->frames[0];
 		data.word(kCurrentframe) = currentFrame;
 		if (currentFrame == 0xff)
 			continue;
-		calcfrframe();
+		calcFrFrame();
 		uint16 x, y;
-		finalframe(&x, &y);
+		finalFrame(&x, &y);
 		setEntry->index = setEntry->frames[0];
 		if ((setEntry->type == 0) && (setEntry->priority != 5) && (setEntry->priority != 6)) {
 			x += data.word(kMapadx);
 			y += data.word(kMapady);
-			showframe(frames, x, y, data.word(kCurrentframe), 0);
+			showFrame(frames, x, y, data.word(kCurrentframe), 0);
 		} else
-			makebackob(setEntry);
+			makeBackOb(setEntry);
 
 		ObjPos *objPos = (ObjPos *)segRef(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(ObjPos));
 		objPos->xMin = data.byte(kSavex);
@@ -175,18 +175,17 @@ void DreamGenContext::showallobs() {
 	}
 }
 
-void DreamGenContext::getdimension()
-{
+void DreamGenContext::getDimension() {
 	uint8 mapXstart, mapYstart;
 	uint8 mapXsize, mapYsize;
-	getdimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
+	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
 	cl = mapXstart;
 	ch = mapYstart;
 	dl = mapXsize;
 	dh = mapYsize;
 }
 
-bool DreamGenContext::addalong(const uint8 *mapFlags) {
+bool DreamGenContext::addAlong(const uint8 *mapFlags) {
 	for (size_t i = 0; i < 11; ++i) {
 		if (mapFlags[3 * i] != 0)
 			return true;
@@ -194,7 +193,7 @@ bool DreamGenContext::addalong(const uint8 *mapFlags) {
 	return false;
 }
 
-bool DreamGenContext::addlength(const uint8 *mapFlags) {
+bool DreamGenContext::addLength(const uint8 *mapFlags) {
 	for (size_t i = 0; i < 10; ++i) {
 		if (mapFlags[3 * 11 * i] != 0)
 			return true;
@@ -202,23 +201,23 @@ bool DreamGenContext::addlength(const uint8 *mapFlags) {
 	return false;
 }
 
-void DreamGenContext::getdimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize) {
+void DreamGenContext::getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize) {
 	const uint8 *mapFlags = segRef(data.word(kBuffers)).ptr(kMapflags, 0);
 
 	uint8 yStart = 0;
-	while (! addalong(mapFlags + 3 * 11 * yStart))
+	while (! addAlong(mapFlags + 3 * 11 * yStart))
 		++yStart;
 
 	uint8 xStart = 0;
-	while (! addlength(mapFlags + 3 * xStart))
+	while (! addLength(mapFlags + 3 * xStart))
 		++xStart;
 
 	uint8 yEnd = 10;
-	while (! addalong(mapFlags + 3 * 11 * (yEnd - 1)))
+	while (! addAlong(mapFlags + 3 * 11 * (yEnd - 1)))
 		--yEnd;
 
 	uint8 xEnd = 11;
-	while (! addlength(mapFlags + 3 * (xEnd - 1)))
+	while (! addLength(mapFlags + 3 * (xEnd - 1)))
 		--xEnd;
 
 	*mapXstart = xStart;
@@ -231,15 +230,15 @@ void DreamGenContext::getdimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *ma
 	data.byte(kMapysize) = *mapYsize << 4;
 }
 
-void DreamGenContext::calcmapad() {
+void DreamGenContext::calcMapAd() {
 	uint8 mapXstart, mapYstart;
 	uint8 mapXsize, mapYsize;
-	getdimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
+	getDimension(&mapXstart, &mapYstart, &mapXsize, &mapYsize);
 	data.word(kMapadx) = data.word(kMapoffsetx) - 8 * (mapXsize + 2 * mapXstart - 11);
 	data.word(kMapady) = data.word(kMapoffsety) - 8 * (mapYsize + 2 * mapYstart - 10);
 }
 
-void DreamGenContext::showallfree() {
+void DreamGenContext::showAllFree() {
 	data.word(kListpos) = kFreelist;
 	ObjPos *listPos = (ObjPos *)segRef(data.word(kBuffers)).ptr(kFreelist, 80 * sizeof(ObjPos));
 	memset(listPos, 0xff, 80 * sizeof(ObjPos));
@@ -250,17 +249,17 @@ void DreamGenContext::showallfree() {
 	data.byte(kCurrentfree) = 0;
 	const DynObject *freeObjects = (const DynObject *)segRef(data.word(kFreedat)).ptr(0, 0);
 	for(size_t i = 0; i < 80; ++i) {
-		uint8 mapad = getmapad(freeObjects[i].mapad);
-		if (mapad != 0) {
+		uint8 mapAd = getMapAd(freeObjects[i].mapad);
+		if (mapAd != 0) {
 			data.word(kCurrentframe) = 3 * data.byte(kCurrentfree);
 			uint8 width, height;
-			calcfrframe(&width, &height);
+			calcFrFrame(&width, &height);
 			uint16 x, y;
-			finalframe(&x, &y);
+			finalFrame(&x, &y);
 			if ((width != 0) || (height != 0)) {
 				x += data.word(kMapadx);
 				y += data.word(kMapady);
-				showframe((Frame *)segRef(data.word(kFrsegment)).ptr(0, 0), x, y, data.word(kCurrentframe) & 0xff, 0);
+				showFrame((Frame *)segRef(data.word(kFrsegment)).ptr(0, 0), x, y, data.word(kCurrentframe) & 0xff, 0);
 				ObjPos *objPos = (ObjPos *)segRef(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(ObjPos));
 				objPos->xMin = data.byte(kSavex);
 				objPos->yMin = data.byte(kSavey);
@@ -275,7 +274,7 @@ void DreamGenContext::showallfree() {
 	}
 }
 
-void DreamGenContext::drawflags() {
+void DreamGenContext::drawFlags() {
 	uint8 *mapFlags = segRef(data.word(kBuffers)).ptr(kMapflags, 0);
 	const uint8 *mapData = segRef(data.word(kMapdata)).ptr(kMap + data.byte(kMapy) * kMapwidth + data.byte(kMapx), 0);
 	const uint8 *backdropFlags = segRef(data.word(kBackdrop)).ptr(kFlags, 0);
@@ -291,7 +290,7 @@ void DreamGenContext::drawflags() {
 	}
 }
 
-void DreamGenContext::showallex() {
+void DreamGenContext::showAllEx() {
 	data.word(kListpos) = kExlist;
 	memset(segRef(data.word(kBuffers)).ptr(kExlist, 100 * 5), 0xff, 100 * 5);
 
@@ -306,15 +305,15 @@ void DreamGenContext::showallex() {
 			continue;
 		if (object->currentLocation != data.byte(kReallocation))
 			continue;
-		if (getmapad(object->mapad) == 0)
+		if (getMapAd(object->mapad) == 0)
 			continue;
 		data.word(kCurrentframe) = 3 * data.byte(kCurrentex);
 		uint8 width, height;
-		calcfrframe(&width, &height);
+		calcFrFrame(&width, &height);
 		uint16 x, y;
-		finalframe(&x, &y);
+		finalFrame(&x, &y);
 		if ((width != 0) || (height != 0)) {
-			showframe((Frame *)segRef(data.word(kFrsegment)).ptr(0, 0), x + data.word(kMapadx), y + data.word(kMapady), data.word(kCurrentframe) & 0xff, 0);
+			showFrame((Frame *)segRef(data.word(kFrsegment)).ptr(0, 0), x + data.word(kMapadx), y + data.word(kMapady), data.word(kCurrentframe) & 0xff, 0);
 			ObjPos *objPos = (ObjPos *)segRef(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(ObjPos));
 			objPos->xMin = data.byte(kSavex);
 			objPos->yMin = data.byte(kSavey);
diff --git a/engines/dreamweb/dreamgen.cpp b/engines/dreamweb/dreamgen.cpp
index f0d471e329..6a888a0b89 100644
--- a/engines/dreamweb/dreamgen.cpp
+++ b/engines/dreamweb/dreamgen.cpp
@@ -28,7 +28,7 @@
 
 namespace DreamGen {
 
-void DreamGenContext::alleybarksound() {
+void DreamGenContext::alleyBarkSound() {
 	STACK_CHECK;
 	ax = es.word(bx+3);
 	_dec(ax);
@@ -38,7 +38,7 @@ void DreamGenContext::alleybarksound() {
 	push(bx);
 	push(es);
 	al = 14;
-	playchannel1();
+	playChannel1();
 	es = pop();
 	bx = pop();
 	ax = 1000;
@@ -46,23 +46,23 @@ nobark:
 	es.word(bx+3) = ax;
 }
 
-void DreamGenContext::intromusic() {
+void DreamGenContext::introMusic() {
 	STACK_CHECK;
 }
 
-void DreamGenContext::foghornsound() {
+void DreamGenContext::foghornSound() {
 	STACK_CHECK;
-	randomnumber();
+	randomNumber();
 	_cmp(al, 198);
 	if (!flags.z())
 		return /* (nofog) */;
 	al = 13;
-	playchannel1();
+	playChannel1();
 }
 
 void DreamGenContext::receptionist() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto gotrecep;
 	_cmp(data.byte(kCardpassflag), 1);
@@ -75,7 +75,7 @@ notsetcard:
 	_cmp(es.word(bx+3), 58);
 	if (!flags.z())
 		goto notdes1;
-	randomnumber();
+	randomNumber();
 	_cmp(al, 30);
 	if (flags.c())
 		goto notdes2;
@@ -85,7 +85,7 @@ notdes1:
 	_cmp(es.word(bx+3), 60);
 	if (!flags.z())
 		goto notdes2;
-	randomnumber();
+	randomNumber();
 	_cmp(al, 240);
 	if (flags.c())
 		goto gotrecep;
@@ -100,8 +100,8 @@ notdes2:
 notendcard:
 	_inc(es.word(bx+3));
 gotrecep:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 	al = es.byte(bx+7);
 	_and(al, 128);
 	if (flags.z())
@@ -109,7 +109,7 @@ gotrecep:
 	data.byte(kTalkedtorecep) = 1;
 }
 
-void DreamGenContext::smokebloke() {
+void DreamGenContext::smokeBloke() {
 	STACK_CHECK;
 	_cmp(data.byte(kRockstardead), 0);
 	if (!flags.z())
@@ -121,17 +121,17 @@ void DreamGenContext::smokebloke() {
 	push(es);
 	push(bx);
 	al = 5;
-	setlocation();
+	setLocation();
 	bx = pop();
 	es = pop();
 notspokento:
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto gotsmokeb;
 	_cmp(es.word(bx+3), 100);
 	if (!flags.z())
 		goto notsmokeb1;
-	randomnumber();
+	randomNumber();
 	_cmp(al, 30);
 	if (flags.c())
 		goto notsmokeb2;
@@ -146,14 +146,14 @@ notsmokeb1:
 notsmokeb2:
 	_inc(es.word(bx+3));
 gotsmokeb:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::attendant() {
 	STACK_CHECK;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 	al = es.byte(bx+7);
 	_and(al, 128);
 	if (flags.z())
@@ -161,16 +161,16 @@ void DreamGenContext::attendant() {
 	data.byte(kTalkedtoattendant) = 1;
 }
 
-void DreamGenContext::manasleep() {
+void DreamGenContext::manAsleep() {
 	STACK_CHECK;
 	al = es.byte(bx+7);
 	_and(al, 127);
 	es.byte(bx+7) = al;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::edeninbath() {
+void DreamGenContext::edenInBath() {
 	STACK_CHECK;
 	_cmp(data.byte(kGeneraldead), 0);
 	if (flags.z())
@@ -178,20 +178,20 @@ void DreamGenContext::edeninbath() {
 	_cmp(data.byte(kSartaindead), 0);
 	if (!flags.z())
 		return /* (notinbath) */;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::malefan() {
+void DreamGenContext::maleFan() {
 	STACK_CHECK;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::femalefan() {
+void DreamGenContext::femaleFan() {
 	STACK_CHECK;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::louis() {
@@ -199,16 +199,16 @@ void DreamGenContext::louis() {
 	_cmp(data.byte(kRockstardead), 0);
 	if (!flags.z())
 		return /* (notlouis1) */;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::louischair() {
+void DreamGenContext::louisChair() {
 	STACK_CHECK;
 	_cmp(data.byte(kRockstardead), 0);
 	if (flags.z())
 		return /* (notlouis2) */;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto notlouisanim;
 	ax = es.word(bx+3);
@@ -223,7 +223,7 @@ void DreamGenContext::louischair() {
 	goto notlouisanim;
 randomlouis:
 	es.word(bx+3) = ax;
-	randomnumber();
+	randomNumber();
 	_cmp(al, 245);
 	if (!flags.c())
 		goto notlouisanim;
@@ -231,34 +231,34 @@ restartlouis:
 	ax = 182;
 	es.word(bx+3) = ax;
 notlouisanim:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::manasleep2() {
+void DreamGenContext::manAsleep2() {
 	STACK_CHECK;
 	al = es.byte(bx+7);
 	_and(al, 127);
 	es.byte(bx+7) = al;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::mansatstill() {
+void DreamGenContext::manSatStill() {
 	STACK_CHECK;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::tattooman() {
+void DreamGenContext::tattooMan() {
 	STACK_CHECK;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::drinker() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto gotdrinker;
 	_inc(es.word(bx+3));
@@ -271,25 +271,25 @@ notdrinker1:
 	_cmp(es.word(bx+3), 106);
 	if (!flags.z())
 		goto gotdrinker;
-	randomnumber();
+	randomNumber();
 	_cmp(al, 3);
 	if (flags.c())
 		goto gotdrinker;
 	es.word(bx+3) = 105;
 gotdrinker:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::bartender() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto gotsmoket;
 	_cmp(es.word(bx+3), 86);
 	if (!flags.z())
 		goto notsmoket1;
-	randomnumber();
+	randomNumber();
 	_cmp(al, 18);
 	if (flags.c())
 		goto notsmoket2;
@@ -304,13 +304,13 @@ notsmoket1:
 notsmoket2:
 	_inc(es.word(bx+3));
 gotsmoket:
-	showgamereel();
+	showGameReel();
 	_cmp(data.byte(kGunpassflag), 1);
 	if (!flags.z())
 		goto notgotgun;
 	es.byte(bx+7) = 9;
 notgotgun:
-	addtopeoplelist();
+	addToPeopleList();
 }
 
 void DreamGenContext::interviewer() {
@@ -323,7 +323,7 @@ notgeneralstart:
 	_cmp(es.word(bx+3), 250);
 	if (flags.z())
 		goto talking;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto talking;
 	_cmp(es.word(bx+3), 259);
@@ -331,7 +331,7 @@ notgeneralstart:
 		goto talking;
 	_inc(es.word(bx+3));
 talking:
-	showgamereel();
+	showGameReel();
 }
 
 void DreamGenContext::soldier1() {
@@ -350,7 +350,7 @@ void DreamGenContext::soldier1() {
 	data.byte(kMandead) = 2;
 	goto gotsoldframe;
 notaftersshot:
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto gotsoldframe;
 	_inc(es.word(bx+3));
@@ -370,8 +370,8 @@ soldierwait:
 	data.byte(kLastweapon) = -1;
 	data.byte(kCombatcount) = 0;
 gotsoldframe:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::rockstar() {
@@ -383,7 +383,7 @@ void DreamGenContext::rockstar() {
 	_cmp(ax, 118);
 	if (flags.z())
 		goto rockcombatend;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto rockspeed;
 	ax = es.word(bx+3);
@@ -414,11 +414,11 @@ notgunonrock:
 gotrockframe:
 	es.word(bx+3) = ax;
 rockspeed:
-	showgamereel();
+	showGameReel();
 	_cmp(es.word(bx+3), 78);
 	if (!flags.z())
 		goto notalkrock;
-	addtopeoplelist();
+	addToPeopleList();
 	data.byte(kPointermode) = 2;
 	data.word(kWatchingtime) = 0;
 	return;
@@ -430,7 +430,7 @@ notalkrock:
 	return;
 rockcombatend:
 	data.byte(kNewlocation) = 45;
-	showgamereel();
+	showGameReel();
 }
 
 void DreamGenContext::helicopter() {
@@ -439,7 +439,7 @@ void DreamGenContext::helicopter() {
 	_cmp(ax, 203);
 	if (flags.z())
 		goto heliwon;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto helispeed;
 	ax = es.word(bx+3);
@@ -477,7 +477,7 @@ notgunonheli:
 gotheliframe:
 	es.word(bx+3) = ax;
 helispeed:
-	showgamereel();
+	showGameReel();
 	al = data.byte(kMapx);
 	es.byte(bx+1) = al;
 	ax = es.word(bx+3);
@@ -512,30 +512,30 @@ void DreamGenContext::mugger() {
 		goto havesetwatch;
 	data.word(kWatchingtime) = 175*2;
 havesetwatch:
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto notmugger;
 	_inc(es.word(bx+3));
 notmugger:
-	showgamereel();
+	showGameReel();
 	al = data.byte(kMapx);
 	es.byte(bx+1) = al;
 	return;
 endmugger1:
 	push(es);
 	push(bx);
-	createpanel2();
-	showicon();
+	createPanel2();
+	showIcon();
 	al = 41;
-	findpuztext();
+	findPuzText();
 	di = 33+20;
 	bx = 104;
 	dl = 241;
 	ah = 0;
-	printdirect();
-	worktoscreen();
+	printDirect();
+	workToScreen();
 	cx = 300;
-	hangon();
+	hangOn();
 	bx = pop();
 	es = pop();
 	push(es);
@@ -543,31 +543,31 @@ endmugger1:
 	es.word(bx+3) = 140;
 	data.byte(kManspath) = 2;
 	data.byte(kFinaldest) = 2;
-	findxyfrompath();
+	findXYFromPath();
 	data.byte(kResetmanxy) = 1;
 	al = 'W';
 	ah = 'E';
 	cl = 'T';
 	ch = 'A';
-	findexobject();
+	findExObject();
 	data.byte(kCommand) = al;
 	data.byte(kObjecttype) = 4;
-	removeobfrominv();
+	removeObFromInv();
 	al = 'W';
 	ah = 'E';
 	cl = 'T';
 	ch = 'B';
-	findexobject();
+	findExObject();
 	data.byte(kCommand) = al;
 	data.byte(kObjecttype) = 4;
-	removeobfrominv();
-	makemainscreen();
+	removeObFromInv();
+	makeMainScreen();
 	al = 48;
 	bl = 68-32;
 	bh = 54+64;
 	cx = 70;
 	dx = 10;
-	setuptimeduse();
+	setupTimedUse();
 	data.byte(kBeenmugged) = 1;
 	bx = pop();
 	es = pop();
@@ -575,11 +575,11 @@ endmugger1:
 
 void DreamGenContext::aide() {
 	STACK_CHECK;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::businessman() {
+void DreamGenContext::businessMan() {
 	STACK_CHECK;
 	data.byte(kPointermode) = 0;
 	data.word(kWatchingtime) = 2;
@@ -595,7 +595,7 @@ void DreamGenContext::businessman() {
 	dx = 1;
 	bl = 68;
 	bh = 174;
-	setuptimeduse();
+	setupTimedUse();
 	es = pop();
 	bx = pop();
 	ax = pop();
@@ -606,7 +606,7 @@ notfirstbiz:
 	_cmp(ax, 49);
 	if (flags.z())
 		return /* (buscombatend) */;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto busspeed;
 	ax = es.word(bx+3);
@@ -643,16 +643,16 @@ buscombatwon:
 	push(bx);
 	push(es);
 	al = 0;
-	turnpathon();
+	turnPathOn();
 	al = 1;
-	turnpathon();
+	turnPathOn();
 	al = 2;
-	turnpathon();
+	turnPathOn();
 	al = 3;
-	turnpathoff();
+	turnPathOff();
 	data.byte(kManspath) = 5;
 	data.byte(kFinaldest) = 5;
-	findxyfrompath();
+	findXYFromPath();
 	data.byte(kResetmanxy) = 1;
 	es = pop();
 	bx = pop();
@@ -661,7 +661,7 @@ buscombatwon:
 gotbusframe:
 	es.word(bx+3) = ax;
 busspeed:
-	showgamereel();
+	showGameReel();
 	al = data.byte(kMapy);
 	es.byte(bx+2) = al;
 	ax = es.word(bx+3);
@@ -676,7 +676,7 @@ buscombatwonend:
 	data.word(kWatchingtime) = 0;
 }
 
-void DreamGenContext::poolguard() {
+void DreamGenContext::poolGuard() {
 	STACK_CHECK;
 	ax = es.word(bx+3);
 	_cmp(ax, 214);
@@ -692,9 +692,9 @@ void DreamGenContext::poolguard() {
 	if (!flags.z())
 		goto notfirstpool;
 	al = 0;
-	turnpathon();
+	turnPathOn();
 notfirstpool:
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto guardspeed;
 	ax = es.word(bx+3);
@@ -738,7 +738,7 @@ notgunonpool:
 gotguardframe:
 	es.word(bx+3) = ax;
 guardspeed:
-	showgamereel();
+	showGameReel();
 	ax = es.word(bx+3);
 	_cmp(ax, 121);
 	if (flags.z())
@@ -757,12 +757,12 @@ combatover1:
 	data.word(kWatchingtime) = 0;
 	data.byte(kPointermode) = 0;
 	al = 0;
-	turnpathon();
+	turnPathOn();
 	al = 1;
-	turnpathoff();
+	turnPathOff();
 	return;
 combatover2:
-	showgamereel();
+	showGameReel();
 	data.word(kWatchingtime) = 2;
 	data.byte(kPointermode) = 0;
 	_inc(data.byte(kCombatcount));
@@ -784,7 +784,7 @@ void DreamGenContext::security() {
 	return;
 notaftersec:
 	data.word(kWatchingtime) = 10;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto gotsecurframe;
 	_inc(es.word(bx+3));
@@ -803,8 +803,8 @@ securwait:
 	data.byte(kLastweapon) = -1;
 	_inc(es.word(bx+3));
 gotsecurframe:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::heavy() {
@@ -826,7 +826,7 @@ void DreamGenContext::heavy() {
 	data.byte(kMandead) = 2;
 	goto gotheavyframe;
 notafterhshot:
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto gotheavyframe;
 	_inc(es.word(bx+3));
@@ -845,13 +845,13 @@ heavywait:
 	_inc(es.word(bx+3));
 	data.byte(kCombatcount) = 0;
 gotheavyframe:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
-void DreamGenContext::bossman() {
+void DreamGenContext::bossMan() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto notboss;
 	ax = es.word(bx+3);
@@ -874,7 +874,7 @@ firstdes:
 	if (flags.z())
 		goto gotallboss;
 	push(ax);
-	randomnumber();
+	randomNumber();
 	cl = al;
 	ax = pop();
 	_cmp(cl, 10);
@@ -890,8 +890,8 @@ secdes:
 gotallboss:
 	es.word(bx+3) = ax;
 notboss:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 	al = es.byte(bx+7);
 	_and(al, 128);
 	if (flags.z())
@@ -899,13 +899,13 @@ notboss:
 	data.byte(kTalkedtoboss) = 1;
 }
 
-void DreamGenContext::carparkdrip() {
+void DreamGenContext::carParkDrip() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		return /* (cantdrip2) */;
 	al = 14;
-	playchannel1();
+	playChannel1();
 }
 
 void DreamGenContext::keeper() {
@@ -926,13 +926,13 @@ void DreamGenContext::keeper() {
 	es.byte(bx+7) = al;
 	return;
 notwaiting:
-	addtopeoplelist();
-	showgamereel();
+	addToPeopleList();
+	showGameReel();
 }
 
 void DreamGenContext::candles1() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto candle1;
 	ax = es.word(bx+3);
@@ -944,12 +944,12 @@ void DreamGenContext::candles1() {
 notendcandle1:
 	es.word(bx+3) = ax;
 candle1:
-	showgamereel();
+	showGameReel();
 }
 
-void DreamGenContext::smallcandle() {
+void DreamGenContext::smallCandle() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto smallcandlef;
 	ax = es.word(bx+3);
@@ -961,12 +961,12 @@ void DreamGenContext::smallcandle() {
 notendsmallcandle:
 	es.word(bx+3) = ax;
 smallcandlef:
-	showgamereel();
+	showGameReel();
 }
 
-void DreamGenContext::intromagic1() {
+void DreamGenContext::introMagic1() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto introm1fin;
 	ax = es.word(bx+3);
@@ -983,7 +983,7 @@ gotintrom1:
 	_inc(data.byte(kIntrocount));
 	push(es);
 	push(bx);
-	intro1text();
+	intro1Text();
 	bx = pop();
 	es = pop();
 	_cmp(data.byte(kIntrocount), 8);
@@ -992,12 +992,12 @@ gotintrom1:
 	_add(data.byte(kMapy), 10);
 	data.byte(kNowinnewroom) = 1;
 introm1fin:
-	showgamereel();
+	showGameReel();
 }
 
 void DreamGenContext::candles() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto candlesfin;
 	ax = es.word(bx+3);
@@ -1009,12 +1009,12 @@ void DreamGenContext::candles() {
 gotcandles:
 	es.word(bx+3) = ax;
 candlesfin:
-	showgamereel();
+	showGameReel();
 }
 
 void DreamGenContext::candles2() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto candles2fin;
 	ax = es.word(bx+3);
@@ -1026,12 +1026,12 @@ void DreamGenContext::candles2() {
 gotcandles2:
 	es.word(bx+3) = ax;
 candles2fin:
-	showgamereel();
+	showGameReel();
 }
 
 void DreamGenContext::gates() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto gatesfin;
 	ax = es.word(bx+3);
@@ -1043,7 +1043,7 @@ void DreamGenContext::gates() {
 	push(bx);
 	push(es);
 	al = 17;
-	playchannel1();
+	playChannel1();
 	es = pop();
 	bx = pop();
 	ax = pop();
@@ -1062,16 +1062,16 @@ gotgates:
 	es.word(bx+3) = ax;
 	push(es);
 	push(bx);
-	intro3text();
+	intro3Text();
 	bx = pop();
 	es = pop();
 gatesfin:
-	showgamereel();
+	showGameReel();
 }
 
-void DreamGenContext::intromagic2() {
+void DreamGenContext::introMagic2() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto introm2fin;
 	ax = es.word(bx+3);
@@ -1083,12 +1083,12 @@ void DreamGenContext::intromagic2() {
 gotintrom2:
 	es.word(bx+3) = ax;
 introm2fin:
-	showgamereel();
+	showGameReel();
 }
 
-void DreamGenContext::intromagic3() {
+void DreamGenContext::introMagic3() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto introm3fin;
 	ax = es.word(bx+3);
@@ -1100,14 +1100,14 @@ void DreamGenContext::intromagic3() {
 gotintrom3:
 	es.word(bx+3) = ax;
 introm3fin:
-	showgamereel();
+	showGameReel();
 	al = data.byte(kMapx);
 	es.byte(bx+1) = al;
 }
 
-void DreamGenContext::intromonks1() {
+void DreamGenContext::introMonks1() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto intromonk1fin;
 	ax = es.word(bx+3);
@@ -1117,7 +1117,7 @@ void DreamGenContext::intromonks1() {
 		goto notendmonk1;
 	_add(data.byte(kMapy), 10);
 	data.byte(kNowinnewroom) = 1;
-	showgamereel();
+	showGameReel();
 	return;
 notendmonk1:
 	_cmp(ax, 30);
@@ -1147,19 +1147,19 @@ gotintromonk1:
 waitstep:
 	push(es);
 	push(bx);
-	intro2text();
+	intro2Text();
 	bx = pop();
 	es = pop();
 	es.byte(bx+6) = -20;
 intromonk1fin:
-	showgamereel();
+	showGameReel();
 	al = data.byte(kMapy);
 	es.byte(bx+2) = al;
 }
 
-void DreamGenContext::intromonks2() {
+void DreamGenContext::introMonks2() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto intromonk2fin;
 	ax = es.word(bx+3);
@@ -1213,10 +1213,10 @@ notendmonk2:
 gotintromonk2:
 	es.word(bx+3) = ax;
 intromonk2fin:
-	showgamereel();
+	showGameReel();
 }
 
-void DreamGenContext::handclap() {
+void DreamGenContext::handClap() {
 	STACK_CHECK;
 }
 
@@ -1288,7 +1288,7 @@ notmonk2text6:
 	cx = 100;
 	dx = 1;
 	ah = 82;
-	{ setuptimedtemp(); return; };
+	{ setupTimedTemp(); return; };
 notmonk2text7:
 	_cmp(data.byte(kIntrocount), 22);
 	if (!flags.z())
@@ -1330,10 +1330,10 @@ gotmonks2text:
 	dx = 1;
 	cx = 120;
 	ah = 82;
-	setuptimedtemp();
+	setupTimedTemp();
 }
 
-void DreamGenContext::intro1text() {
+void DreamGenContext::intro1Text() {
 	STACK_CHECK;
 	_cmp(data.byte(kIntrocount), 2);
 	if (!flags.z())
@@ -1371,10 +1371,10 @@ gotintro1text:
 	_dec(data.byte(kIntrocount));
 	return;
 oktalk2:
-	setuptimedtemp();
+	setupTimedTemp();
 }
 
-void DreamGenContext::intro2text() {
+void DreamGenContext::intro2Text() {
 	STACK_CHECK;
 	_cmp(ax, 5);
 	if (!flags.z())
@@ -1397,10 +1397,10 @@ notintro2text1:
 gotintro2text:
 	dx = 1;
 	ah = 82;
-	setuptimedtemp();
+	setupTimedTemp();
 }
 
-void DreamGenContext::intro3text() {
+void DreamGenContext::intro3Text() {
 	STACK_CHECK;
 	_cmp(ax, 107);
 	if (!flags.z())
@@ -1423,12 +1423,12 @@ notintro3text1:
 gotintro3text:
 	dx = 1;
 	ah = 82;
-	setuptimedtemp();
+	setupTimedTemp();
 }
 
-void DreamGenContext::monkandryan() {
+void DreamGenContext::monkAndRyan() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto notmonkryan;
 	ax = es.word(bx+3);
@@ -1439,7 +1439,7 @@ void DreamGenContext::monkandryan() {
 	_inc(data.byte(kIntrocount));
 	push(es);
 	push(bx);
-	textformonk();
+	textForMonk();
 	bx = pop();
 	es = pop();
 	ax = 77;
@@ -1451,12 +1451,12 @@ void DreamGenContext::monkandryan() {
 gotmonkryan:
 	es.word(bx+3) = ax;
 notmonkryan:
-	showgamereel();
+	showGameReel();
 }
 
-void DreamGenContext::endgameseq() {
+void DreamGenContext::endGameSeq() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto notendseq;
 	ax = es.word(bx+3);
@@ -1470,7 +1470,7 @@ void DreamGenContext::endgameseq() {
 	_inc(data.byte(kIntrocount));
 	push(es);
 	push(bx);
-	textforend();
+	textForEnd();
 	bx = pop();
 	es = pop();
 	ax = 50;
@@ -1482,7 +1482,7 @@ gotendseq:
 	push(es);
 	push(bx);
 	push(ax);
-	fadescreendownhalf();
+	fadeScreenDownHalf();
 	ax = pop();
 	bx = pop();
 	es = pop();
@@ -1494,7 +1494,7 @@ notfadedown:
 	push(es);
 	push(bx);
 	push(ax);
-	fadescreendowns();
+	fadeScreenDowns();
 	data.byte(kVolumeto) = 7;
 	data.byte(kVolumedirection) = 1;
 	ax = pop();
@@ -1506,7 +1506,7 @@ notfadeend:
 		goto notendseq;
 	data.byte(kGetback) = 1;
 notendseq:
-	showgamereel();
+	showGameReel();
 	al = data.byte(kMapy);
 	es.byte(bx+2) = al;
 	ax = es.word(bx+3);
@@ -1514,14 +1514,14 @@ notendseq:
 	if (!flags.z())
 		return /* (notendcreds) */;
 	es.word(bx+3) = 146;
-	rollendcredits();
+	rollEndCredits();
 }
 
-void DreamGenContext::rollendcredits() {
+void DreamGenContext::rollEndCredits() {
 	STACK_CHECK;
 	al = 16;
 	ah = 255;
-	playchannel0();
+	playChannel0();
 	data.byte(kVolume) = 7;
 	data.byte(kVolumeto) = 0;
 	data.byte(kVolumedirection) = -1;
@@ -1531,7 +1531,7 @@ void DreamGenContext::rollendcredits() {
 	bx = 20;
 	ds = data.word(kMapstore);
 	si = 0;
-	multiget();
+	multiGet();
 	es = data.word(kTextfile1);
 	si = 3*2;
 	ax = es.word(si);
@@ -1548,15 +1548,15 @@ endcredits2:
 	push(di);
 	push(es);
 	push(bx);
-	vsync();
+	vSync();
 	cl = 160;
 	ch = 160;
 	di = 75;
 	bx = 20;
 	ds = data.word(kMapstore);
 	si = 0;
-	multiput();
-	vsync();
+	multiPut();
+	vSync();
 	bx = pop();
 	es = pop();
 	di = pop();
@@ -1571,17 +1571,17 @@ onelot:
 	di = 75;
 	dx = 161;
 	ax = 0;
-	printdirect();
+	printDirect();
 	_add(bx, data.word(kLinespacing));
 	cx = pop();
 	if (--cx)
 		goto onelot;
-	vsync();
+	vSync();
 	cl = 160;
 	ch = 160;
 	di = 75;
 	bx = 20;
-	multidump();
+	multiDump();
 	bx = pop();
 	es = pop();
 	di = pop();
@@ -1605,9 +1605,9 @@ gotnext:
 	if (--cx)
 		goto endcredits1;
 	cx = 100;
-	hangon();
-	paneltomap();
-	fadescreenuphalf();
+	hangOn();
+	panelToMap();
+	fadeScreenUpHalf();
 }
 
 void DreamGenContext::priest() {
@@ -1617,18 +1617,18 @@ void DreamGenContext::priest() {
 		return /* (priestspoken) */;
 	data.byte(kPointermode) = 0;
 	data.word(kWatchingtime) = 2;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		return /* (priestwait) */;
 	_inc(es.word(bx+3));
 	push(es);
 	push(bx);
-	priesttext();
+	priestText();
 	bx = pop();
 	es = pop();
 }
 
-void DreamGenContext::madmanstelly() {
+void DreamGenContext::madmansTelly() {
 	STACK_CHECK;
 	ax = es.word(bx+3);
 	_inc(ax);
@@ -1638,10 +1638,10 @@ void DreamGenContext::madmanstelly() {
 	ax = 300;
 notendtelly:
 	es.word(bx+3) = ax;
-	showgamereel();
+	showGameReel();
 }
 
-void DreamGenContext::priesttext() {
+void DreamGenContext::priestText() {
 	STACK_CHECK;
 	_cmp(es.word(bx+3), 2);
 	if (flags.c())
@@ -1660,7 +1660,7 @@ void DreamGenContext::priesttext() {
 	bh = 80;
 	cx = 54;
 	dx = 1;
-	setuptimeduse();
+	setupTimedUse();
 }
 
 void DreamGenContext::drunk() {
@@ -1671,13 +1671,13 @@ void DreamGenContext::drunk() {
 	al = es.byte(bx+7);
 	_and(al, 127);
 	es.byte(bx+7) = al;
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::advisor() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto noadvisor;
 	goto noadvisor;
@@ -1693,7 +1693,7 @@ notendadvis:
 	if (!flags.z())
 		goto gotadvframe;
 	push(ax);
-	randomnumber();
+	randomNumber();
 	cl = al;
 	ax = pop();
 	_cmp(cl, 3);
@@ -1703,13 +1703,13 @@ notendadvis:
 gotadvframe:
 	es.word(bx+3) = ax;
 noadvisor:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::copper() {
 	STACK_CHECK;
-	checkspeed();
+	checkSpeed();
 	if (!flags.z())
 		goto nocopper;
 	ax = es.word(bx+3);
@@ -1728,7 +1728,7 @@ notendcopper:
 		goto gotcopframe;
 mightwait:
 	push(ax);
-	randomnumber();
+	randomNumber();
 	cl = al;
 	ax = pop();
 	_cmp(cl, 7);
@@ -1738,8 +1738,8 @@ mightwait:
 gotcopframe:
 	es.word(bx+3) = ax;
 nocopper:
-	showgamereel();
-	addtopeoplelist();
+	showGameReel();
+	addToPeopleList();
 }
 
 void DreamGenContext::train() {
@@ -1752,7 +1752,7 @@ void DreamGenContext::train() {
 	_inc(ax);
 	goto gottrainframe;
 notrainyet:
-	randomnumber();
+	randomNumber();
 	_cmp(al, 253);
 	if (flags.c())
 		return /* (notrainatall) */;
@@ -1765,16 +1765,16 @@ notrainyet:
 	ax = 5;
 gottrainframe:
 	es.word(bx+3) = ax;
-	showgamereel();
+	showGameReel();
 }
 
-void DreamGenContext::checkforexit() {
+void DreamGenContext::checkForExit() {
 	STACK_CHECK;
 	cl = data.byte(kRyanx);
 	_add(cl, 12);
 	ch = data.byte(kRyany);
 	_add(ch, 12);
-	checkone();
+	checkOne();
 	data.byte(kLastflag) = cl;
 	data.byte(kLastflagex) = ch;
 	data.byte(kFlagx) = dl;
@@ -1801,7 +1801,7 @@ notnewdirect:
 	ah = 'E';
 	cl = 'T';
 	ch = 'A';
-	isryanholding();
+	isRyanHolding();
 	bx = pop();
 	if (flags.z())
 		goto noshoe1;
@@ -1812,7 +1812,7 @@ noshoe1:
 	ah = 'E';
 	cl = 'T';
 	ch = 'B';
-	isryanholding();
+	isRyanHolding();
 	bx = pop();
 	if (flags.z())
 		goto noshoe2;
@@ -1831,7 +1831,7 @@ notravmessage:
 	dx = 10;
 	bl = 68;
 	bh = 64;
-	setuptimeduse();
+	setupTimedUse();
 	al = data.byte(kFacing);
 	_add(al, 4);
 	_and(al, 7);
@@ -1848,28 +1848,28 @@ notleave:
 	_test(al, 4);
 	if (flags.z())
 		goto notaleft;
-	adjustleft();
+	adjustLeft();
 	return;
 notaleft:
 	_test(al, 2);
 	if (flags.z())
 		goto notaright;
-	adjustright();
+	adjustRight();
 	return;
 notaright:
 	_test(al, 8);
 	if (flags.z())
 		goto notadown;
-	adjustdown();
+	adjustDown();
 	return;
 notadown:
 	_test(al, 16);
 	if (flags.z())
 		return /* (notanup) */;
-	adjustup();
+	adjustUp();
 }
 
-void DreamGenContext::adjustdown() {
+void DreamGenContext::adjustDown() {
 	STACK_CHECK;
 	push(es);
 	push(bx);
@@ -1883,7 +1883,7 @@ void DreamGenContext::adjustdown() {
 	es = pop();
 }
 
-void DreamGenContext::adjustup() {
+void DreamGenContext::adjustUp() {
 	STACK_CHECK;
 	push(es);
 	push(bx);
@@ -1897,7 +1897,7 @@ void DreamGenContext::adjustup() {
 	es = pop();
 }
 
-void DreamGenContext::adjustleft() {
+void DreamGenContext::adjustLeft() {
 	STACK_CHECK;
 	push(es);
 	push(bx);
@@ -1912,7 +1912,7 @@ void DreamGenContext::adjustleft() {
 	es = pop();
 }
 
-void DreamGenContext::adjustright() {
+void DreamGenContext::adjustRight() {
 	STACK_CHECK;
 	push(es);
 	push(bx);
@@ -1942,14 +1942,14 @@ void DreamGenContext::reminders() {
 	ah = 'K';
 	cl = 'E';
 	ch = 'Y';
-	isryanholding();
+	isRyanHolding();
 	if (flags.z())
 		goto forgotone;
 	al = 'C';
 	ah = 'S';
 	cl = 'H';
 	ch = 'R';
-	findexobject();
+	findExObject();
 	_cmp(al, (114));
 	if (flags.z())
 		goto forgotone;
@@ -1977,10 +1977,10 @@ forgotone:
 	bh = 70;
 	cx = 48;
 	dx = 8;
-	setuptimeduse();
+	setupTimedUse();
 }
 
-void DreamGenContext::liftnoise() {
+void DreamGenContext::liftNoise() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 5);
 	if (flags.z())
@@ -1988,14 +1988,14 @@ void DreamGenContext::liftnoise() {
 	_cmp(data.byte(kReallocation), 21);
 	if (flags.z())
 		goto hissnoise;
-	playchannel1();
+	playChannel1();
 	return;
 hissnoise:
 	al = 13;
-	playchannel1();
+	playChannel1();
 }
 
-void DreamGenContext::soundonreels() {
+void DreamGenContext::soundOnReels() {
 	STACK_CHECK;
 	bl = data.byte(kReallocation);
 	_add(bl, bl);
@@ -2018,17 +2018,17 @@ reelsoundloop:
 	al = cs.byte(si);
 	_cmp(al, 64);
 	if (flags.c())
-		{ playchannel1(); return; };
+		{ playChannel1(); return; };
 	_cmp(al, 128);
 	if (flags.c())
 		goto channel0once;
 	_and(al, 63);
 	ah = 255;
-	{ playchannel0(); return; };
+	{ playChannel0(); return; };
 channel0once:
 	_and(al, 63);
 	ah = 0;
-	{ playchannel0(); return; };
+	{ playChannel0(); return; };
 skipreelsound:
 	_add(si, 3);
 	goto reelsoundloop;
@@ -2040,7 +2040,7 @@ endreelsound:
 	data.word(kLastsoundreel) = -1;
 }
 
-void DreamGenContext::deleverything() {
+void DreamGenContext::delEverything() {
 	STACK_CHECK;
 	al = data.byte(kMapysize);
 	ah = 0;
@@ -2048,15 +2048,15 @@ void DreamGenContext::deleverything() {
 	_cmp(ax, 182);
 	if (!flags.c())
 		goto bigroom;
-	maptopanel();
+	mapToPanel();
 	return;
 bigroom:
 	_sub(data.byte(kMapysize), 8);
-	maptopanel();
+	mapToPanel();
 	_add(data.byte(kMapysize), 8);
 }
 
-void DreamGenContext::transfermap() {
+void DreamGenContext::transferMap() {
 	STACK_CHECK;
 	di = data.word(kExframepos);
 	push(di);
@@ -2103,7 +2103,7 @@ void DreamGenContext::transfermap() {
 	_add(data.word(kExframepos), cx);
 }
 
-void DreamGenContext::dofade() {
+void DreamGenContext::doFade() {
 	STACK_CHECK;
 	_cmp(data.byte(kFadedirection), 0);
 	if (flags.z())
@@ -2117,34 +2117,34 @@ void DreamGenContext::dofade() {
 	_add(si, ax);
 	_add(si, ax);
 	_add(si, ax);
-	showgroup();
+	showGroup();
 	al = data.byte(kNumtofade);
 	_add(al, data.byte(kColourpos));
 	data.byte(kColourpos) = al;
 	_cmp(al, 0);
 	if (!flags.z())
 		return /* (finishfade) */;
-	fadecalculation();
+	fadeCalculation();
 }
 
-void DreamGenContext::clearpalette() {
+void DreamGenContext::clearPalette() {
 	STACK_CHECK;
 	data.byte(kFadedirection) = 0;
-	clearstartpal();
-	dumpcurrent();
+	clearStartPal();
+	dumpCurrent();
 }
 
-void DreamGenContext::fadescreenup() {
+void DreamGenContext::fadeScreenUp() {
 	STACK_CHECK;
-	clearstartpal();
-	paltoendpal();
+	clearStartPal();
+	palToEndPal();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 }
 
-void DreamGenContext::fadetowhite() {
+void DreamGenContext::fadeToWhite() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768);
@@ -2154,14 +2154,14 @@ void DreamGenContext::fadetowhite() {
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768);
 	al = 0;
 	_stosb(3);
-	paltostartpal();
+	palToStartPal();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 }
 
-void DreamGenContext::fadefromwhite() {
+void DreamGenContext::fadeFromWhite() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3));
@@ -2171,27 +2171,27 @@ void DreamGenContext::fadefromwhite() {
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3));
 	al = 0;
 	_stosb(3);
-	paltoendpal();
+	palToEndPal();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 }
 
-void DreamGenContext::fadescreenups() {
+void DreamGenContext::fadeScreenUps() {
 	STACK_CHECK;
-	clearstartpal();
-	paltoendpal();
+	clearStartPal();
+	palToEndPal();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 64;
 }
 
-void DreamGenContext::fadescreendownhalf() {
+void DreamGenContext::fadeScreenDownHalf() {
 	STACK_CHECK;
-	paltostartpal();
-	paltoendpal();
+	palToStartPal();
+	palToEndPal();
 	cx = 768;
 	es = data.word(kBuffers);
 	bx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768);
@@ -2218,96 +2218,96 @@ halfend:
 	data.byte(kNumtofade) = 32;
 }
 
-void DreamGenContext::fadescreenuphalf() {
+void DreamGenContext::fadeScreenUpHalf() {
 	STACK_CHECK;
-	endpaltostart();
-	paltoendpal();
+	endPalToStart();
+	palToEndPal();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 31;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 32;
 }
 
-void DreamGenContext::fadescreendown() {
+void DreamGenContext::fadeScreenDown() {
 	STACK_CHECK;
-	paltostartpal();
-	clearendpal();
+	palToStartPal();
+	clearEndPal();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 }
 
-void DreamGenContext::fadescreendowns() {
+void DreamGenContext::fadeScreenDowns() {
 	STACK_CHECK;
-	paltostartpal();
-	clearendpal();
+	palToStartPal();
+	clearEndPal();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 64;
 }
 
-void DreamGenContext::showgun() {
+void DreamGenContext::showGun() {
 	STACK_CHECK;
 	data.byte(kAddtored) = 0;
 	data.byte(kAddtogreen) = 0;
 	data.byte(kAddtoblue) = 0;
-	paltostartpal();
-	paltoendpal();
-	greyscalesum();
+	palToStartPal();
+	palToEndPal();
+	greyscaleSum();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 	cx = 130;
-	hangon();
-	endpaltostart();
-	clearendpal();
+	hangOn();
+	endPalToStart();
+	clearEndPal();
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 	cx = 200;
-	hangon();
+	hangOn();
 	data.byte(kRoomssample) = 34;
-	loadroomssample();
+	loadRoomsSample();
 	data.byte(kVolume) = 0;
 	dx = 2351;
-	loadintotemp();
-	createpanel2();
+	loadIntoTemp();
+	createPanel2();
 	ds = data.word(kTempgraphics);
 	al = 0;
 	ah = 0;
 	di = 100;
 	bx = 4;
-	showframe();
+	showFrame();
 	ds = data.word(kTempgraphics);
 	al = 1;
 	ah = 0;
 	di = 158;
 	bx = 106;
-	showframe();
-	worktoscreen();
-	getridoftemp();
-	fadescreenup();
+	showFrame();
+	workToScreen();
+	getRidOfTemp();
+	fadeScreenUp();
 	cx = 160;
-	hangon();
+	hangOn();
 	al = 12;
 	ah = 0;
-	playchannel0();
+	playChannel0();
 	dx = 2260;
-	loadtemptext();
-	rollendcredits2();
-	getridoftemptext();
+	loadTempText();
+	rollEndCredits2();
+	getRidOfTempText();
 }
 
-void DreamGenContext::rollendcredits2() {
+void DreamGenContext::rollEndCredits2() {
 	STACK_CHECK;
-	rollem();
+	rollEm();
 }
 
-void DreamGenContext::rollem() {
+void DreamGenContext::rollEm() {
 	STACK_CHECK;
 	cl = 160;
 	ch = 160;
@@ -2315,7 +2315,7 @@ void DreamGenContext::rollem() {
 	bx = 20;
 	ds = data.word(kMapstore);
 	si = 0;
-	multiget();
+	multiGet();
 	es = data.word(kTextfile1);
 	si = 49*2;
 	ax = es.word(si);
@@ -2332,15 +2332,15 @@ endcredits22:
 	push(di);
 	push(es);
 	push(bx);
-	vsync();
+	vSync();
 	cl = 160;
 	ch = 160;
 	di = 25;
 	bx = 20;
 	ds = data.word(kMapstore);
 	si = 0;
-	multiput();
-	vsync();
+	multiPut();
+	vSync();
 	bx = pop();
 	es = pop();
 	di = pop();
@@ -2355,17 +2355,17 @@ onelot2:
 	di = 25;
 	dx = 161;
 	ax = 0;
-	printdirect();
+	printDirect();
 	_add(bx, data.word(kLinespacing));
 	cx = pop();
 	if (--cx)
 		goto onelot2;
-	vsync();
+	vSync();
 	cl = 160;
 	ch = 160;
 	di = 25;
 	bx = 20;
-	multidump();
+	multiDump();
 	bx = pop();
 	es = pop();
 	di = pop();
@@ -2395,13 +2395,13 @@ gotnext2:
 	if (--cx)
 		goto endcredits21;
 	cx = 120;
-	hangone();
+	hangOne();
 	return;
 endearly2:
 	cx = pop();
 }
 
-void DreamGenContext::greyscalesum() {
+void DreamGenContext::greyscaleSum() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768);
@@ -2459,7 +2459,7 @@ noaddb:
 		goto greysumloop1;
 }
 
-void DreamGenContext::allpalette() {
+void DreamGenContext::allPalette() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
 	ds = data.word(kBuffers);
@@ -2467,27 +2467,27 @@ void DreamGenContext::allpalette() {
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768);
 	cx = 768/2;
 	_movsw(cx, true);
-	dumpcurrent();
+	dumpCurrent();
 }
 
-void DreamGenContext::dumpcurrent() {
+void DreamGenContext::dumpCurrent() {
 	STACK_CHECK;
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3));
 	ds = data.word(kBuffers);
-	vsync();
+	vSync();
 	al = 0;
 	cx = 128;
-	showgroup();
-	vsync();
+	showGroup();
+	vSync();
 	al = 128;
 	cx = 128;
-	showgroup();
+	showGroup();
 }
 
-void DreamGenContext::fadedownmon() {
+void DreamGenContext::fadeDownMon() {
 	STACK_CHECK;
-	paltostartpal();
-	paltoendpal();
+	palToStartPal();
+	palToEndPal();
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3)+768)+(231*3);
 	cx = 3*8;
@@ -2501,13 +2501,13 @@ void DreamGenContext::fadedownmon() {
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 	cx = 64;
-	hangon();
+	hangOn();
 }
 
-void DreamGenContext::fadeupmon() {
+void DreamGenContext::fadeUpMon() {
 	STACK_CHECK;
-	paltostartpal();
-	paltoendpal();
+	palToStartPal();
+	palToEndPal();
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3))+(231*3);
 	cx = 3*8;
@@ -2521,12 +2521,12 @@ void DreamGenContext::fadeupmon() {
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
 	cx = 128;
-	hangon();
+	hangOn();
 }
 
-void DreamGenContext::initialmoncols() {
+void DreamGenContext::initialMonCols() {
 	STACK_CHECK;
-	paltostartpal();
+	palToStartPal();
 	es = data.word(kBuffers);
 	di = (0+(228*13)+32+60+(32*32)+(11*10*3))+(230*3);
 	cx = 3*9;
@@ -2539,50 +2539,50 @@ void DreamGenContext::initialmoncols() {
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3))+(230*3);
 	al = 230;
 	cx = 18;
-	showgroup();
+	showGroup();
 }
 
 void DreamGenContext::titles() {
 	STACK_CHECK;
-	clearpalette();
-	biblequote();
+	clearPalette();
+	bibleQuote();
 	_cmp(data.byte(kQuitrequested),  0);
 	if (!flags.z())
 		return /* (titlesearly) */;
 	intro();
 }
 
-void DreamGenContext::endgame() {
+void DreamGenContext::endGame() {
 	STACK_CHECK;
 	dx = 2260;
-	loadtemptext();
-	monkspeaking();
-	gettingshot();
-	getridoftemptext();
+	loadTempText();
+	monkSpeaking();
+	gettingShot();
+	getRidOfTempText();
 	data.byte(kVolumeto) = 7;
 	data.byte(kVolumedirection) = 1;
 	cx = 200;
-	hangon();
+	hangOn();
 }
 
-void DreamGenContext::monkspeaking() {
+void DreamGenContext::monkSpeaking() {
 	STACK_CHECK;
 	data.byte(kRoomssample) = 35;
-	loadroomssample();
+	loadRoomsSample();
 	dx = 2364;
-	loadintotemp();
-	clearwork();
-	showmonk();
-	worktoscreen();
+	loadIntoTemp();
+	clearWork();
+	showMonk();
+	workToScreen();
 	data.byte(kVolume) = 7;
 	data.byte(kVolumedirection) = -1;
 	data.byte(kVolumeto) = 5;
 	al = 12;
 	ah = 255;
-	playchannel0();
-	fadescreenups();
+	playChannel0();
+	fadeScreenUps();
 	cx = 300;
-	hangon();
+	hangOn();
 	al = 40;
 loadspeech2:
 	push(ax);
@@ -2590,11 +2590,11 @@ loadspeech2:
 	dh = 83;
 	cl = 'T';
 	ah = 0;
-	loadspeech();
+	loadSpeech();
 	al = 50+12;
-	playchannel1();
+	playChannel1();
 notloadspeech2:
-	vsync();
+	vSync();
 	_cmp(data.byte(kCh1playing), 255);
 	if (!flags.z())
 		goto notloadspeech2;
@@ -2605,72 +2605,72 @@ notloadspeech2:
 		goto loadspeech2;
 	data.byte(kVolumedirection) = 1;
 	data.byte(kVolumeto) = 7;
-	fadescreendowns();
+	fadeScreenDowns();
 	cx = 300;
-	hangon();
-	getridoftemp();
+	hangOn();
+	getRidOfTemp();
 }
 
-void DreamGenContext::showmonk() {
+void DreamGenContext::showMonk() {
 	STACK_CHECK;
 	al = 0;
 	ah = 128;
 	di = 160;
 	bx = 72;
 	ds = data.word(kTempgraphics);
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::gettingshot() {
+void DreamGenContext::gettingShot() {
 	STACK_CHECK;
 	data.byte(kNewlocation) = 55;
-	clearpalette();
-	loadintroroom();
-	fadescreenups();
+	clearPalette();
+	loadIntroRoom();
+	fadeScreenUps();
 	data.byte(kVolumeto) = 0;
 	data.byte(kVolumedirection) = -1;
-	runendseq();
-	clearbeforeload();
+	runEndSeq();
+	clearBeforeLoad();
 }
 
 void DreamGenContext::credits() {
 	STACK_CHECK;
-	clearpalette();
-	realcredits();
+	clearPalette();
+	realCredits();
 }
 
-void DreamGenContext::biblequote() {
+void DreamGenContext::bibleQuote() {
 	STACK_CHECK;
 	mode640x480();
 	dx = 2377;
-	showpcx();
-	fadescreenups();
+	showPCX();
+	fadeScreenUps();
 	cx = 80;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto biblequotearly;
 	cx = 560;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto biblequotearly;
-	fadescreendowns();
+	fadeScreenDowns();
 	cx = 200;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto biblequotearly;
-	cancelch0();
+	cancelCh0();
 biblequotearly:
 	data.byte(kLasthardkey) = 0;
 }
 
-void DreamGenContext::hangone() {
+void DreamGenContext::hangOne() {
 	STACK_CHECK;
 hangonloope:
 	push(cx);
-	vsync();
+	vSync();
 	cx = pop();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
@@ -2682,76 +2682,76 @@ hangonloope:
 void DreamGenContext::intro() {
 	STACK_CHECK;
 	dx = 2247;
-	loadtemptext();
-	loadpalfromiff();
-	setmode();
+	loadTempText();
+	loadPalFromIFF();
+	setMode();
 	data.byte(kNewlocation) = 50;
-	clearpalette();
-	loadintroroom();
+	clearPalette();
+	loadIntroRoom();
 	data.byte(kVolume) = 7;
 	data.byte(kVolumedirection) = -1;
 	data.byte(kVolumeto) = 4;
 	al = 12;
 	ah = 255;
-	playchannel0();
-	fadescreenups();
-	runintroseq();
+	playChannel0();
+	fadeScreenUps();
+	runIntroSeq();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto introearly;
-	clearbeforeload();
+	clearBeforeLoad();
 	data.byte(kNewlocation) = 52;
-	loadintroroom();
-	runintroseq();
+	loadIntroRoom();
+	runIntroSeq();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto introearly;
-	clearbeforeload();
+	clearBeforeLoad();
 	data.byte(kNewlocation) = 53;
-	loadintroroom();
-	runintroseq();
+	loadIntroRoom();
+	runIntroSeq();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto introearly;
-	clearbeforeload();
-	allpalette();
+	clearBeforeLoad();
+	allPalette();
 	data.byte(kNewlocation) = 54;
-	loadintroroom();
-	runintroseq();
+	loadIntroRoom();
+	runIntroSeq();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto introearly;
-	getridoftemptext();
-	clearbeforeload();
+	getRidOfTempText();
+	clearBeforeLoad();
 introearly:
 	data.byte(kLasthardkey) =  0;
 }
 
-void DreamGenContext::runintroseq() {
+void DreamGenContext::runIntroSeq() {
 	STACK_CHECK;
 	data.byte(kGetback) = 0;
 moreintroseq:
-	vsync();
+	vSync();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto earlyendrun;
-	spriteupdate();
-	vsync();
+	spriteUpdate();
+	vSync();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto earlyendrun;
-	deleverything();
-	printsprites();
-	reelsonscreen();
-	afterintroroom();
-	usetimedtext();
-	vsync();
+	delEverything();
+	printSprites();
+	reelsOnScreen();
+	afterIntroRoom();
+	useTimedText();
+	vSync();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto earlyendrun;
-	dumpmap();
-	dumptimedtext();
-	vsync();
+	dumpMap();
+	dumpTimedText();
+	vSync();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto earlyendrun;
@@ -2760,197 +2760,197 @@ moreintroseq:
 		goto moreintroseq;
 	return;
 earlyendrun:
-	getridoftemptext();
-	clearbeforeload();
+	getRidOfTempText();
+	clearBeforeLoad();
 }
 
-void DreamGenContext::runendseq() {
+void DreamGenContext::runEndSeq() {
 	STACK_CHECK;
 	atmospheres();
 	data.byte(kGetback) = 0;
 moreendseq:
-	vsync();
-	spriteupdate();
-	vsync();
-	deleverything();
-	printsprites();
-	reelsonscreen();
-	afterintroroom();
-	usetimedtext();
-	vsync();
-	dumpmap();
-	dumptimedtext();
-	vsync();
+	vSync();
+	spriteUpdate();
+	vSync();
+	delEverything();
+	printSprites();
+	reelsOnScreen();
+	afterIntroRoom();
+	useTimedText();
+	vSync();
+	dumpMap();
+	dumpTimedText();
+	vSync();
 	_cmp(data.byte(kGetback), 1);
 	if (!flags.z())
 		goto moreendseq;
 }
 
-void DreamGenContext::loadintroroom() {
+void DreamGenContext::loadIntroRoom() {
 	STACK_CHECK;
 	data.byte(kIntrocount) = 0;
 	data.byte(kLocation) = 255;
-	loadroom();
+	loadRoom();
 	data.word(kMapoffsetx) = 72;
 	data.word(kMapoffsety) = 16;
-	clearsprites();
+	clearSprites();
 	data.byte(kThroughdoor) = 0;
 	data.byte(kCurrentkey) = '0';
 	data.byte(kMainmode) = 0;
-	clearwork();
+	clearWork();
 	data.byte(kNewobs) = 1;
-	drawfloor();
-	reelsonscreen();
-	spriteupdate();
-	printsprites();
-	worktoscreen();
+	drawFloor();
+	reelsOnScreen();
+	spriteUpdate();
+	printSprites();
+	workToScreen();
 }
 
-void DreamGenContext::realcredits() {
+void DreamGenContext::realCredits() {
 	STACK_CHECK;
 	data.byte(kRoomssample) = 33;
-	loadroomssample();
+	loadRoomsSample();
 	data.byte(kVolume) = 0;
 	mode640x480();
 	cx = 35;
-	hangon();
+	hangOn();
 	dx = 2390;
-	showpcx();
+	showPCX();
 	al = 12;
 	ah = 0;
-	playchannel0();
+	playChannel0();
 	cx = 2;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	allpalette();
+	allPalette();
 	cx = 80;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	fadescreendowns();
+	fadeScreenDowns();
 	cx = 256;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
 	dx = 2403;
-	showpcx();
+	showPCX();
 	al = 12;
 	ah = 0;
-	playchannel0();
+	playChannel0();
 	cx = 2;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	allpalette();
+	allPalette();
 	cx = 80;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	fadescreendowns();
+	fadeScreenDowns();
 	cx = 256;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
 	dx = 2416;
-	showpcx();
+	showPCX();
 	al = 12;
 	ah = 0;
-	playchannel0();
+	playChannel0();
 	cx = 2;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	allpalette();
+	allPalette();
 	cx = 80;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	fadescreendowns();
+	fadeScreenDowns();
 	cx = 256;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
 	dx = 2429;
-	showpcx();
+	showPCX();
 	al = 12;
 	ah = 0;
-	playchannel0();
+	playChannel0();
 	cx = 2;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	allpalette();
+	allPalette();
 	cx = 80;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	fadescreendowns();
+	fadeScreenDowns();
 	cx = 256;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
 	dx = 2442;
-	showpcx();
+	showPCX();
 	al = 12;
 	ah = 0;
-	playchannel0();
+	playChannel0();
 	cx = 2;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	allpalette();
+	allPalette();
 	cx = 80;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	fadescreendowns();
+	fadeScreenDowns();
 	cx = 256;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
 	dx = 2455;
-	showpcx();
-	fadescreenups();
+	showPCX();
+	fadeScreenUps();
 	cx = 60;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
 	al = 13;
 	ah = 0;
-	playchannel0();
+	playChannel0();
 	cx = 350;
-	hangone();
+	hangOne();
 	_cmp(data.byte(kLasthardkey), 1);
 	if (flags.z())
 		goto realcreditsearly;
-	fadescreendowns();
+	fadeScreenDowns();
 	cx = 256;
-	hangone();
+	hangOne();
 realcreditsearly:
 	data.byte(kLasthardkey) =  0;
 }
 
-void DreamGenContext::fillopen() {
+void DreamGenContext::fillOpen() {
 	STACK_CHECK;
-	deltextline();
-	getopenedsize();
+	delTextLine();
+	getOpenedSize();
 	_cmp(ah, 4);
 	if (flags.c())
 		goto lessthanapage;
@@ -2960,7 +2960,7 @@ lessthanapage:
 	push(ax);
 	es = data.word(kBuffers);
 	di = (0+(228*13));
-	findallopen();
+	findAllOpen();
 	si = (0+(228*13));
 	di = (80);
 	bx = (58)+96;
@@ -2976,7 +2976,7 @@ openloop1:
 	_cmp(ch, cl);
 	if (flags.c())
 		goto nextopenslot;
-	obtoinv();
+	obToInv();
 nextopenslot:
 	es = pop();
 	si = pop();
@@ -2988,10 +2988,10 @@ nextopenslot:
 	_cmp(cl, 5);
 	if (!flags.z())
 		goto openloop1;
-	undertextline();
+	underTextLine();
 }
 
-void DreamGenContext::findallopen() {
+void DreamGenContext::findAllOpen() {
 	STACK_CHECK;
 	push(di);
 	cx = 16;
@@ -3064,32 +3064,32 @@ findopen2a:
 		goto findopen1a;
 }
 
-void DreamGenContext::makemainscreen() {
+void DreamGenContext::makeMainScreen() {
 	STACK_CHECK;
-	createpanel();
+	createPanel();
 	data.byte(kNewobs) = 1;
-	drawfloor();
-	spriteupdate();
-	printsprites();
-	reelsonscreen();
-	showicon();
-	getunderzoom();
-	undertextline();
+	drawFloor();
+	spriteUpdate();
+	printSprites();
+	reelsOnScreen();
+	showIcon();
+	getUnderZoom();
+	underTextLine();
 	data.byte(kCommandtype) = 255;
-	animpointer();
-	worktoscreenm();
+	animPointer();
+	workToScreenM();
 	data.byte(kCommandtype) = 200;
 	data.byte(kManisoffscreen) = 0;
 }
 
-void DreamGenContext::incryanpage() {
+void DreamGenContext::incRyanPage() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 222);
 	if (flags.z())
 		goto alreadyincryan;
 	data.byte(kCommandtype) = 222;
 	al = 31;
-	commandonly();
+	commandOnly();
 alreadyincryan:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -3108,37 +3108,37 @@ findnewpage:
 	_sub(ax, 18);
 	if (!flags.c())
 		goto findnewpage;
-	delpointer();
-	fillryan();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	delPointer();
+	fillRyan();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::openinv() {
+void DreamGenContext::openInv() {
 	STACK_CHECK;
 	data.byte(kInvopen) = 1;
 	al = 61;
 	di = (80);
 	bx = (58)-10;
 	dl = 240;
-	printmessage();
-	fillryan();
+	printMessage();
+	fillRyan();
 	data.byte(kCommandtype) = 255;
 }
 
-void DreamGenContext::openob() {
+void DreamGenContext::openOb() {
 	STACK_CHECK;
 	al = data.byte(kOpenedob);
 	ah = data.byte(kOpenedtype);
 	di = offset_commandline;
-	copyname();
+	copyName();
 	di = (80);
 	bx = (58)+86;
 	al = 62;
 	dl = 240;
-	printmessage();
+	printMessage();
 	di = data.word(kLastxpos);
 	_add(di, 5);
 	bx = (58)+86;
@@ -3147,9 +3147,9 @@ void DreamGenContext::openob() {
 	dl = 220;
 	al = 0;
 	ah = 0;
-	printdirect();
-	fillopen();
-	getopenedsize();
+	printDirect();
+	fillOpen();
+	getOpenedSize();
 	al = ah;
 	ah = 0;
 	cx = (44);
@@ -3159,19 +3159,19 @@ void DreamGenContext::openob() {
 	cs.word(bx) = ax;
 }
 
-void DreamGenContext::examicon() {
+void DreamGenContext::examIcon() {
 	STACK_CHECK;
 	ds = data.word(kIcons2);
 	di = 254;
 	bx = 5;
 	al = 3;
 	ah = 0;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::describeob() {
+void DreamGenContext::describeOb() {
 	STACK_CHECK;
-	getobtextstart();
+	getObTextStart();
 	di = 33;
 	bx = 92;
 	_cmp(data.byte(kForeignrelease),  0);
@@ -3185,7 +3185,7 @@ notsetd:
 	dl = 241;
 	ah = 16;
 	data.word(kCharshift) = 91+91;
-	printdirect();
+	printDirect();
 	data.word(kCharshift) = 0;
 	di = 36;
 	bx = 104;
@@ -3199,14 +3199,14 @@ notsetd:
 notsetd2:
 	dl = 241;
 	ah = 0;
-	printdirect();
+	printDirect();
 	push(bx);
-	obsthatdothings();
+	obsThatDoThings();
 	bx = pop();
-	additionaltext();
+	additionalText();
 }
 
-void DreamGenContext::additionaltext() {
+void DreamGenContext::additionalText() {
 	STACK_CHECK;
 	_add(bx, 10);
 	push(bx);
@@ -3232,24 +3232,24 @@ void DreamGenContext::additionaltext() {
 	return;
 emptycup:
 	al = 40;
-	findpuztext();
+	findPuzText();
 	bx = pop();
 	di = 36;
 	dl = 241;
 	ah = 0;
-	printdirect();
+	printDirect();
 	return;
 fullcup:
 	al = 39;
-	findpuztext();
+	findPuzText();
 	bx = pop();
 	di = 36;
 	dl = 241;
 	ah = 0;
-	printdirect();
+	printDirect();
 }
 
-void DreamGenContext::obsthatdothings() {
+void DreamGenContext::obsThatDoThings() {
 	STACK_CHECK;
 	al = data.byte(kCommand);
 	ah = data.byte(kObjecttype);
@@ -3261,16 +3261,16 @@ void DreamGenContext::obsthatdothings() {
 	if (!flags.z())
 		return /* (notlouiscard) */;
 	al = 4;
-	getlocation();
+	getLocation();
 	_cmp(al, 1);
 	if (flags.z())
 		return /* (seencard) */;
 	al = 4;
-	setlocation();
-	lookatcard();
+	setLocation();
+	lookAtCard();
 }
 
-void DreamGenContext::getobtextstart() {
+void DreamGenContext::getObTextStart() {
 	STACK_CHECK;
 	es = data.word(kFreedesc);
 	si = (0);
@@ -3298,7 +3298,7 @@ describe:
 	bx = ax;
 tryagain:
 	push(si);
-	findnextcolon();
+	findNextColon();
 	al = es.byte(si);
 	cx = si;
 	si = pop();
@@ -3313,11 +3313,11 @@ tryagain:
 		goto findsometext;
 	return;
 findsometext:
-	searchforsame();
+	searchForSame();
 	goto tryagain;
 }
 
-void DreamGenContext::searchforsame() {
+void DreamGenContext::searchForSame() {
 	STACK_CHECK;
 	si = cx;
 searchagain:
@@ -3360,7 +3360,7 @@ foundmatch:
 	bx = pop();
 }
 
-void DreamGenContext::setpickup() {
+void DreamGenContext::setPickup() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 1);
 	if (flags.z())
@@ -3368,7 +3368,7 @@ void DreamGenContext::setpickup() {
 	_cmp(data.byte(kObjecttype), 3);
 	if (flags.z())
 		goto cantpick;
-	getanyad();
+	getAnyAd();
 	al = es.byte(bx+2);
 	_cmp(al, 4);
 	if (!flags.z())
@@ -3384,7 +3384,7 @@ canpick:
 	bl = data.byte(kCommand);
 	bh = data.byte(kObjecttype);
 	al = 33;
-	commandwithob();
+	commandWithOb();
 alreadysp:
 	ax = data.word(kMousebutton);
 	_cmp(ax, 1);
@@ -3395,11 +3395,11 @@ alreadysp:
 		goto dosetpick;
 	return;
 dosetpick:
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	examicon();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	examIcon();
 	data.byte(kPickup) = 1;
 	data.byte(kInvopen) = 2;
 	_cmp(data.byte(kObjecttype), 4);
@@ -3408,31 +3408,31 @@ dosetpick:
 	al = data.byte(kCommand);
 	data.byte(kItemframe) = al;
 	data.byte(kOpenedob) = 255;
-	transfertoex();
+	transferToEx();
 	data.byte(kItemframe) = al;
 	data.byte(kObjecttype) = 4;
-	geteitherad();
+	getEitherAd();
 	es.byte(bx+2) = 20;
 	es.byte(bx+3) = 255;
-	openinv();
-	worktoscreenm();
+	openInv();
+	workToScreenM();
 	return;
 pickupexob:
 	al = data.byte(kCommand);
 	data.byte(kItemframe) = al;
 	data.byte(kOpenedob) = 255;
-	openinv();
-	worktoscreenm();
+	openInv();
+	workToScreenM();
 }
 
-void DreamGenContext::examinventory() {
+void DreamGenContext::examineInventory() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 249);
 	if (flags.z())
 		goto alreadyexinv;
 	data.byte(kCommandtype) = 249;
 	al = 32;
-	commandonly();
+	commandOnly();
 alreadyexinv:
 	ax = data.word(kMousebutton);
 	_and(ax, 1);
@@ -3440,20 +3440,20 @@ alreadyexinv:
 		goto doexinv;
 	return;
 doexinv:
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	examicon();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	examIcon();
 	data.byte(kPickup) = 0;
 	data.byte(kInvopen) = 2;
-	openinv();
-	worktoscreenm();
+	openInv();
+	workToScreenM();
 }
 
-void DreamGenContext::reexfrominv() {
+void DreamGenContext::reExFromInv() {
 	STACK_CHECK;
-	findinvpos();
+	findInvPos();
 	ax = es.word(bx);
 	data.byte(kCommandtype) = ah;
 	data.byte(kCommand) = al;
@@ -3461,10 +3461,10 @@ void DreamGenContext::reexfrominv() {
 	data.byte(kPointermode) = 0;
 }
 
-void DreamGenContext::reexfromopen() {
+void DreamGenContext::reExFromOpen() {
 	STACK_CHECK;
 	return;
-	findopenpos();
+	findOpenPos();
 	ax = es.word(bx);
 	data.byte(kCommandtype) = ah;
 	data.byte(kCommand) = al;
@@ -3472,7 +3472,7 @@ void DreamGenContext::reexfromopen() {
 	data.byte(kPointermode) = 0;
 }
 
-void DreamGenContext::swapwithinv() {
+void DreamGenContext::swapWithInv() {
 	STACK_CHECK;
 	al = data.byte(kItemframe);
 	ah = data.byte(kObjecttype);
@@ -3487,7 +3487,7 @@ difsub7:
 	data.word(kOldsubject) = ax;
 	bx = ax;
 	al = 34;
-	commandwithob();
+	commandWithOb();
 alreadyswap1:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -3501,11 +3501,11 @@ doswap1:
 	ah = data.byte(kObjecttype);
 	al = data.byte(kItemframe);
 	push(ax);
-	findinvpos();
+	findInvPos();
 	ax = es.word(bx);
 	data.byte(kItemframe) = al;
 	data.byte(kObjecttype) = ah;
-	geteitherad();
+	getEitherAd();
 	es.byte(bx+2) = 20;
 	es.byte(bx+3) = 255;
 	bl = data.byte(kItemframe);
@@ -3514,10 +3514,10 @@ doswap1:
 	data.byte(kObjecttype) = ah;
 	data.byte(kItemframe) = al;
 	push(bx);
-	findinvpos();
-	delpointer();
+	findInvPos();
+	delPointer();
 	al = data.byte(kItemframe);
-	geteitherad();
+	getEitherAd();
 	es.byte(bx+2) = 4;
 	es.byte(bx+3) = 255;
 	al = data.byte(kLastinvpos);
@@ -3525,14 +3525,14 @@ doswap1:
 	ax = pop();
 	data.byte(kObjecttype) = ah;
 	data.byte(kItemframe) = al;
-	fillryan();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	fillRyan();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::swapwithopen() {
+void DreamGenContext::swapWithOpen() {
 	STACK_CHECK;
 	al = data.byte(kItemframe);
 	ah = data.byte(kObjecttype);
@@ -3547,7 +3547,7 @@ difsub8:
 	data.word(kOldsubject) = ax;
 	bx = ax;
 	al = 34;
-	commandwithob();
+	commandWithOb();
 alreadyswap2:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -3558,14 +3558,14 @@ alreadyswap2:
 		goto doswap2;
 	return;
 doswap2:
-	geteitherad();
-	isitworn();
+	getEitherAd();
+	isItWorn();
 	if (!flags.z())
 		goto notwornswap;
-	wornerror();
+	wornError();
 	return;
 notwornswap:
-	delpointer();
+	delPointer();
 	al = data.byte(kItemframe);
 	_cmp(al, data.byte(kOpenedob));
 	if (!flags.z())
@@ -3574,10 +3574,10 @@ notwornswap:
 	_cmp(al, data.byte(kOpenedtype));
 	if (!flags.z())
 		goto isntsame2;
-	errormessage1();
+	errorMessage1();
 	return;
 isntsame2:
-	checkobjectsize();
+	checkObjectSize();
 	_cmp(al, 0);
 	if (flags.z())
 		goto sizeok2;
@@ -3586,22 +3586,22 @@ sizeok2:
 	ah = data.byte(kObjecttype);
 	al = data.byte(kItemframe);
 	push(ax);
-	findopenpos();
+	findOpenPos();
 	ax = es.word(bx);
 	data.byte(kItemframe) = al;
 	data.byte(kObjecttype) = ah;
 	_cmp(ah, 4);
 	if (!flags.z())
 		goto makeswapex;
-	geteitherad();
+	getEitherAd();
 	es.byte(bx+2) = 20;
 	es.byte(bx+3) = 255;
 	goto actuallyswap;
 makeswapex:
-	transfertoex();
+	transferToEx();
 	data.byte(kItemframe) = al;
 	data.byte(kObjecttype) = 4;
-	geteitherad();
+	getEitherAd();
 	es.byte(bx+2) = 20;
 	es.byte(bx+3) = 255;
 actuallyswap:
@@ -3611,8 +3611,8 @@ actuallyswap:
 	data.byte(kObjecttype) = ah;
 	data.byte(kItemframe) = al;
 	push(bx);
-	findopenpos();
-	geteitherad();
+	findOpenPos();
+	getEitherAd();
 	al = data.byte(kOpenedtype);
 	es.byte(bx+2) = al;
 	al = data.byte(kOpenedob);
@@ -3624,30 +3624,30 @@ actuallyswap:
 	ax = pop();
 	data.byte(kObjecttype) = ah;
 	data.byte(kItemframe) = al;
-	fillopen();
-	fillryan();
-	undertextline();
-	readmouse();
-	useopened();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	fillOpen();
+	fillRyan();
+	underTextLine();
+	readMouse();
+	useOpened();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::intoinv() {
+void DreamGenContext::inToInv() {
 	STACK_CHECK;
 	_cmp(data.byte(kPickup), 0);
 	if (!flags.z())
 		goto notout;
-	outofinv();
+	outOfInv();
 	return;
 notout:
-	findinvpos();
+	findInvPos();
 	ax = es.word(bx);
 	_cmp(al, 255);
 	if (flags.z())
 		goto canplace1;
-	swapwithinv();
+	swapWithInv();
 	return;
 canplace1:
 	al = data.byte(kItemframe);
@@ -3663,7 +3663,7 @@ difsub1:
 	data.word(kOldsubject) = ax;
 	bx = ax;
 	al = 35;
-	commandwithob();
+	commandWithOb();
 alreadyplce:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -3674,25 +3674,25 @@ alreadyplce:
 		goto doplace;
 	return;
 doplace:
-	delpointer();
+	delPointer();
 	al = data.byte(kItemframe);
-	getexad();
+	getExAd();
 	es.byte(bx+2) = 4;
 	es.byte(bx+3) = 255;
 	al = data.byte(kLastinvpos);
 	es.byte(bx+4) = al;
 	data.byte(kPickup) = 0;
-	fillryan();
-	readmouse();
-	showpointer();
-	outofinv();
-	worktoscreen();
-	delpointer();
+	fillRyan();
+	readMouse();
+	showPointer();
+	outOfInv();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::outofinv() {
+void DreamGenContext::outOfInv() {
 	STACK_CHECK;
-	findinvpos();
+	findInvPos();
 	ax = es.word(bx);
 	_cmp(al, 255);
 	if (!flags.z())
@@ -3704,7 +3704,7 @@ canpick2:
 	_cmp(bx, 2);
 	if (!flags.z())
 		goto canpick2a;
-	reexfrominv();
+	reExFromInv();
 	return;
 canpick2a:
 	_cmp(ax, data.word(kOldsubject));
@@ -3718,7 +3718,7 @@ difsub3:
 	data.word(kOldsubject) = ax;
 	bx = ax;
 	al = 36;
-	commandwithob();
+	commandWithOb();
 alreadygrab:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -3729,24 +3729,24 @@ alreadygrab:
 		goto dograb;
 	return;
 dograb:
-	delpointer();
+	delPointer();
 	data.byte(kPickup) = 1;
-	findinvpos();
+	findInvPos();
 	ax = es.word(bx);
 	data.byte(kItemframe) = al;
 	data.byte(kObjecttype) = ah;
-	getexad();
+	getExAd();
 	es.byte(bx+2) = 20;
 	es.byte(bx+3) = 255;
-	fillryan();
-	readmouse();
-	showpointer();
-	intoinv();
-	worktoscreen();
-	delpointer();
+	fillRyan();
+	readMouse();
+	showPointer();
+	inToInv();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::getfreead() {
+void DreamGenContext::getFreeAd() {
 	STACK_CHECK;
 	ah = 0;
 	cl = 4;
@@ -3755,7 +3755,7 @@ void DreamGenContext::getfreead() {
 	es = data.word(kFreedat);
 }
 
-void DreamGenContext::getexad() {
+void DreamGenContext::getExAd() {
 	STACK_CHECK;
 	ah = 0;
 	bx = 16;
@@ -3765,20 +3765,20 @@ void DreamGenContext::getexad() {
 	_add(bx, (0+2080+30000));
 }
 
-void DreamGenContext::geteitherad() {
+void DreamGenContext::getEitherAd() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 4);
 	if (flags.z())
 		goto isinexlist;
 	al = data.byte(kItemframe);
-	getfreead();
+	getFreeAd();
 	return;
 isinexlist:
 	al = data.byte(kItemframe);
-	getexad();
+	getExAd();
 }
 
-void DreamGenContext::getanyad() {
+void DreamGenContext::getAnyAd() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 4);
 	if (flags.z())
@@ -3787,21 +3787,21 @@ void DreamGenContext::getanyad() {
 	if (flags.z())
 		goto isfree;
 	al = data.byte(kCommand);
-	getsetad();
+	getSetAd();
 	ax = es.word(bx+4);
 	return;
 isfree:
 	al = data.byte(kCommand);
-	getfreead();
+	getFreeAd();
 	ax = es.word(bx+7);
 	return;
 isex:
 	al = data.byte(kCommand);
-	getexad();
+	getExAd();
 	ax = es.word(bx+7);
 }
 
-void DreamGenContext::getanyaddir() {
+void DreamGenContext::getAnyAdDir() {
 	STACK_CHECK;
 	_cmp(ah, 4);
 	if (flags.z())
@@ -3809,16 +3809,16 @@ void DreamGenContext::getanyaddir() {
 	_cmp(ah, 2);
 	if (flags.z())
 		goto isfree3;
-	getsetad();
+	getSetAd();
 	return;
 isfree3:
-	getfreead();
+	getFreeAd();
 	return;
 isex3:
-	getexad();
+	getExAd();
 }
 
-void DreamGenContext::getopenedsize() {
+void DreamGenContext::getOpenedSize() {
 	STACK_CHECK;
 	_cmp(data.byte(kOpenedtype), 4);
 	if (flags.z())
@@ -3827,21 +3827,21 @@ void DreamGenContext::getopenedsize() {
 	if (flags.z())
 		goto isfree2;
 	al = data.byte(kOpenedob);
-	getsetad();
+	getSetAd();
 	ax = es.word(bx+3);
 	return;
 isfree2:
 	al = data.byte(kOpenedob);
-	getfreead();
+	getFreeAd();
 	ax = es.word(bx+7);
 	return;
 isex2:
 	al = data.byte(kOpenedob);
-	getexad();
+	getExAd();
 	ax = es.word(bx+7);
 }
 
-void DreamGenContext::getsetad() {
+void DreamGenContext::getSetAd() {
 	STACK_CHECK;
 	ah = 0;
 	bx = 64;
@@ -3850,7 +3850,7 @@ void DreamGenContext::getsetad() {
 	es = data.word(kSetdat);
 }
 
-void DreamGenContext::findinvpos() {
+void DreamGenContext::findInvPos() {
 	STACK_CHECK;
 	cx = data.word(kMousex);
 	_sub(cx, (80));
@@ -3880,7 +3880,7 @@ findinv2:
 	_add(bx, (0+(228*13)+32));
 }
 
-void DreamGenContext::findopenpos() {
+void DreamGenContext::findOpenPos() {
 	STACK_CHECK;
 	cx = data.word(kMousex);
 	_sub(cx, (80));
@@ -3897,7 +3897,7 @@ findopenp1:
 	_add(bx, (0+(228*13)));
 }
 
-void DreamGenContext::dropobject() {
+void DreamGenContext::dropObject() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 223);
 	if (flags.z())
@@ -3909,7 +3909,7 @@ void DreamGenContext::dropobject() {
 	bl = data.byte(kItemframe);
 	bh = data.byte(kObjecttype);
 	al = 37;
-	commandwithob();
+	commandWithOb();
 alreadydrop:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -3920,11 +3920,11 @@ alreadydrop:
 		goto dodrop;
 	return;
 dodrop:
-	geteitherad();
-	isitworn();
+	getEitherAd();
+	isItWorn();
 	if (!flags.z())
 		goto nowornerror;
-	wornerror();
+	wornError();
 	return;
 nowornerror:
 	_cmp(data.byte(kReallocation), 47);
@@ -3934,12 +3934,12 @@ nowornerror:
 	_add(cl, 12);
 	ch = data.byte(kRyany);
 	_add(ch, 12);
-	checkone();
+	checkOne();
 	_cmp(cl, 2);
 	if (flags.c())
 		goto nodroperror;
 nodrop2:
-	droperror();
+	dropError();
 	return;
 nodroperror:
 	_cmp(data.byte(kMapxsize), 64);
@@ -3948,7 +3948,7 @@ nodroperror:
 	_cmp(data.byte(kMapysize), 64);
 	if (!flags.z())
 		goto notinlift;
-	droperror();
+	dropError();
 	return;
 notinlift:
 	al = data.byte(kItemframe);
@@ -3959,7 +3959,7 @@ notinlift:
 	dh = 'A';
 	compare();
 	if (flags.z())
-		{ cantdrop(); return; };
+		{ cantDrop(); return; };
 	al = data.byte(kItemframe);
 	ah = 4;
 	cl = 'S';
@@ -3968,10 +3968,10 @@ notinlift:
 	dh = 'D';
 	compare();
 	if (flags.z())
-		{ cantdrop(); return; };
+		{ cantDrop(); return; };
 	data.byte(kObjecttype) = 4;
 	al = data.byte(kItemframe);
-	getexad();
+	getExAd();
 	es.byte(bx+2) = 0;
 	al = data.byte(kRyanx);
 	_add(al, 4);
@@ -3998,60 +3998,60 @@ notinlift:
 	es.byte(bx) = al;
 }
 
-void DreamGenContext::droperror() {
+void DreamGenContext::dropError() {
 	STACK_CHECK;
 	data.byte(kCommandtype) = 255;
-	delpointer();
+	delPointer();
 	di = 76;
 	bx = 21;
 	al = 56;
 	dl = 240;
-	printmessage();
-	worktoscreenm();
+	printMessage();
+	workToScreenM();
 	cx = 50;
-	hangonp();
-	showpanel();
-	showman();
-	examicon();
+	hangOnP();
+	showPanel();
+	showMan();
+	examIcon();
 	data.byte(kCommandtype) = 255;
-	worktoscreenm();
+	workToScreenM();
 }
 
-void DreamGenContext::cantdrop() {
+void DreamGenContext::cantDrop() {
 	STACK_CHECK;
 	data.byte(kCommandtype) = 255;
-	delpointer();
+	delPointer();
 	di = 76;
 	bx = 21;
 	al = 24;
 	dl = 240;
-	printmessage();
-	worktoscreenm();
+	printMessage();
+	workToScreenM();
 	cx = 50;
-	hangonp();
-	showpanel();
-	showman();
-	examicon();
+	hangOnP();
+	showPanel();
+	showMan();
+	examIcon();
 	data.byte(kCommandtype) = 255;
-	worktoscreenm();
+	workToScreenM();
 }
 
-void DreamGenContext::removeobfrominv() {
+void DreamGenContext::removeObFromInv() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommand), 100);
 	if (flags.z())
 		return /* (obnotexist) */;
-	getanyad();
+	getAnyAd();
 	di = bx;
 	cl = data.byte(kCommand);
 	ch = 0;
-	deleteexobject();
+	deleteExObject();
 }
 
-void DreamGenContext::selectopenob() {
+void DreamGenContext::selectOpenOb() {
 	STACK_CHECK;
 	al = data.byte(kCommand);
-	getanyad();
+	getAnyAd();
 	_cmp(al, 255);
 	if (!flags.z())
 		goto canopenit1;
@@ -4065,7 +4065,7 @@ canopenit1:
 	bl = data.byte(kCommand);
 	bh = data.byte(kObjecttype);
 	al = 38;
-	commandwithob();
+	commandWithOb();
 alreadyopob:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -4080,21 +4080,21 @@ doopenob:
 	data.byte(kOpenedob) = al;
 	al = data.byte(kObjecttype);
 	data.byte(kOpenedtype) = al;
-	createpanel();
-	showpanel();
-	showman();
-	examicon();
-	showexit();
-	openinv();
-	openob();
-	undertextline();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
-}
-
-void DreamGenContext::useopened() {
+	createPanel();
+	showPanel();
+	showMan();
+	examIcon();
+	showExit();
+	openInv();
+	openOb();
+	underTextLine();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
+}
+
+void DreamGenContext::useOpened() {
 	STACK_CHECK;
 	_cmp(data.byte(kOpenedob), 255);
 	if (flags.z())
@@ -4102,15 +4102,15 @@ void DreamGenContext::useopened() {
 	_cmp(data.byte(kPickup), 0);
 	if (!flags.z())
 		goto notout2;
-	outofopen();
+	outOfOpen();
 	return;
 notout2:
-	findopenpos();
+	findOpenPos();
 	ax = es.word(bx);
 	_cmp(al, 255);
 	if (flags.z())
 		goto canplace3;
-	swapwithopen();
+	swapWithOpen();
 	return;
 canplace3:
 	_cmp(data.byte(kPickup), 1);
@@ -4132,7 +4132,7 @@ difsub2:
 	data.word(kOldsubject) = ax;
 	bx = ax;
 	al = 35;
-	commandwithob();
+	commandWithOb();
 alreadyplc2:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -4143,14 +4143,14 @@ alreadyplc2:
 		goto doplace2;
 	return;
 doplace2:
-	geteitherad();
-	isitworn();
+	getEitherAd();
+	isItWorn();
 	if (!flags.z())
 		goto notworntoopen;
-	wornerror();
+	wornError();
 	return;
 notworntoopen:
-	delpointer();
+	delPointer();
 	al = data.byte(kItemframe);
 	_cmp(al, data.byte(kOpenedob));
 	if (!flags.z())
@@ -4159,10 +4159,10 @@ notworntoopen:
 	_cmp(al, data.byte(kOpenedtype));
 	if (!flags.z())
 		goto isntsame;
-	errormessage1();
+	errorMessage1();
 	return;
 isntsame:
-	checkobjectsize();
+	checkObjectSize();
 	_cmp(al, 0);
 	if (flags.z())
 		goto sizeok1;
@@ -4170,7 +4170,7 @@ isntsame:
 sizeok1:
 	data.byte(kPickup) = 0;
 	al = data.byte(kItemframe);
-	geteitherad();
+	getEitherAd();
 	al = data.byte(kOpenedtype);
 	es.byte(bx+2) = al;
 	al = data.byte(kOpenedob);
@@ -4179,91 +4179,91 @@ sizeok1:
 	es.byte(bx+4) = al;
 	al = data.byte(kReallocation);
 	es.byte(bx+5) = al;
-	fillopen();
-	undertextline();
-	readmouse();
-	useopened();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	fillOpen();
+	underTextLine();
+	readMouse();
+	useOpened();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::errormessage1() {
+void DreamGenContext::errorMessage1() {
 	STACK_CHECK;
-	delpointer();
+	delPointer();
 	di = 76;
 	bx = 21;
 	al = 58;
 	dl = 240;
-	printmessage();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	printMessage();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 	cx = 50;
-	hangonp();
-	showpanel();
-	showman();
-	examicon();
-	readmouse();
-	useopened();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	hangOnP();
+	showPanel();
+	showMan();
+	examIcon();
+	readMouse();
+	useOpened();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::errormessage2() {
+void DreamGenContext::errorMessage2() {
 	STACK_CHECK;
 	data.byte(kCommandtype) = 255;
-	delpointer();
+	delPointer();
 	di = 76;
 	bx = 21;
 	al = 59;
 	dl = 240;
-	printmessage();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	printMessage();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 	cx = 50;
-	hangonp();
-	showpanel();
-	showman();
-	examicon();
-	readmouse();
-	useopened();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	hangOnP();
+	showPanel();
+	showMan();
+	examIcon();
+	readMouse();
+	useOpened();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::errormessage3() {
+void DreamGenContext::errorMessage3() {
 	STACK_CHECK;
-	delpointer();
+	delPointer();
 	di = 76;
 	bx = 21;
 	al = 60;
 	dl = 240;
-	printmessage();
-	worktoscreenm();
+	printMessage();
+	workToScreenM();
 	cx = 50;
-	hangonp();
-	showpanel();
-	showman();
-	examicon();
-	readmouse();
-	useopened();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	hangOnP();
+	showPanel();
+	showMan();
+	examIcon();
+	readMouse();
+	useOpened();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::checkobjectsize() {
+void DreamGenContext::checkObjectSize() {
 	STACK_CHECK;
-	getopenedsize();
+	getOpenedSize();
 	push(ax);
 	al = data.byte(kItemframe);
-	geteitherad();
+	getEitherAd();
 	al = es.byte(bx+9);
 	cx = pop();
 	_cmp(al, 255);
@@ -4277,7 +4277,7 @@ notunsized:
 	_cmp(cl, 100);
 	if (flags.c())
 		goto isntspecial;
-	errormessage3();
+	errorMessage3();
 	goto sizewrong;
 isntspecial:
 	_cmp(cl, al);
@@ -4291,14 +4291,14 @@ specialcase:
 	_cmp(cl, al);
 	if (!flags.c())
 		goto sizeok;
-	errormessage2();
+	errorMessage2();
 	goto sizewrong;
 bothspecial:
 	_sub(cl, 100);
 	_cmp(al, cl);
 	if (flags.z())
 		goto sizeok;
-	errormessage3();
+	errorMessage3();
 sizewrong:
 	al = 1;
 	return;
@@ -4306,12 +4306,12 @@ sizeok:
 	al = 0;
 }
 
-void DreamGenContext::outofopen() {
+void DreamGenContext::outOfOpen() {
 	STACK_CHECK;
 	_cmp(data.byte(kOpenedob), 255);
 	if (flags.z())
 		goto cantuseopen;
-	findopenpos();
+	findOpenPos();
 	ax = es.word(bx);
 	_cmp(al, 255);
 	if (!flags.z())
@@ -4331,7 +4331,7 @@ difsub4:
 	data.word(kOldsubject) = ax;
 	bx = ax;
 	al = 36;
-	commandwithob();
+	commandWithOb();
 alreadygrb:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -4343,43 +4343,43 @@ alreadygrb:
 	_cmp(ax, 2);
 	if (!flags.z())
 		return /* (notletgo4) */;
-	reexfromopen();
+	reExFromOpen();
 	return;
 dogrb:
-	delpointer();
+	delPointer();
 	data.byte(kPickup) = 1;
-	findopenpos();
+	findOpenPos();
 	ax = es.word(bx);
 	data.byte(kItemframe) = al;
 	data.byte(kObjecttype) = ah;
 	_cmp(ah, 4);
 	if (!flags.z())
 		goto makeintoex;
-	geteitherad();
+	getEitherAd();
 	es.byte(bx+2) = 20;
 	es.byte(bx+3) = 255;
 	goto actuallyout;
 makeintoex:
-	transfertoex();
+	transferToEx();
 	data.byte(kItemframe) = al;
 	data.byte(kObjecttype) = 4;
-	geteitherad();
+	getEitherAd();
 	es.byte(bx+2) = 20;
 	es.byte(bx+3) = 255;
 actuallyout:
-	fillopen();
-	undertextline();
-	readmouse();
-	useopened();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	fillOpen();
+	underTextLine();
+	readMouse();
+	useOpened();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::transfertoex() {
+void DreamGenContext::transferToEx() {
 	STACK_CHECK;
-	emergencypurge();
-	getexpos();
+	emergencyPurge();
+	getExPos();
 	al = data.byte(kExpos);
 	push(ax);
 	push(di);
@@ -4403,9 +4403,9 @@ void DreamGenContext::transfertoex() {
 	es.byte(di+4) = al;
 	al = data.byte(kItemframe);
 	data.byte(kItemtotran) = al;
-	transfermap();
-	transferinv();
-	transfertext();
+	transferMap();
+	transferInv();
+	transferText();
 	al = data.byte(kItemframe);
 	ah = 0;
 	bx = 16;
@@ -4413,11 +4413,11 @@ void DreamGenContext::transfertoex() {
 	ds = data.word(kFreedat);
 	si = ax;
 	ds.byte(si+2) = 254;
-	pickupconts();
+	pickupConts();
 	ax = pop();
 }
 
-void DreamGenContext::pickupconts() {
+void DreamGenContext::pickupConts() {
 	STACK_CHECK;
 	al = ds.byte(si+7);
 	_cmp(al, 255);
@@ -4442,7 +4442,7 @@ pickupcontloop:
 	if (!flags.z())
 		goto notinsidethis;
 	data.byte(kItemtotran) = cl;
-	transfercontoex();
+	transferConToEx();
 notinsidethis:
 	ax = pop();
 	dx = pop();
@@ -4456,14 +4456,14 @@ notinsidethis:
 		goto pickupcontloop;
 }
 
-void DreamGenContext::transfercontoex() {
+void DreamGenContext::transferConToEx() {
 	STACK_CHECK;
 	push(es);
 	push(bx);
 	push(dx);
 	push(es);
 	push(bx);
-	getexpos();
+	getExPos();
 	si = pop();
 	ds = pop();
 	push(di);
@@ -4478,15 +4478,15 @@ void DreamGenContext::transfercontoex() {
 	es.byte(di+1) = al;
 	es.byte(di+3) = dl;
 	es.byte(di+2) = 4;
-	transfermap();
-	transferinv();
-	transfertext();
+	transferMap();
+	transferInv();
+	transferText();
 	si = pop();
 	ds = pop();
 	ds.byte(si+2) = 255;
 }
 
-void DreamGenContext::purgealocation() {
+void DreamGenContext::purgeALocation() {
 	STACK_CHECK;
 	push(ax);
 	es = data.word(kExtras);
@@ -4504,7 +4504,7 @@ purgeloc:
 	push(es);
 	push(bx);
 	push(cx);
-	deleteexobject();
+	deleteExObject();
 	cx = pop();
 	bx = pop();
 	es = pop();
@@ -4517,7 +4517,7 @@ dontpurge:
 		goto purgeloc;
 }
 
-void DreamGenContext::emergencypurge() {
+void DreamGenContext::emergencyPurge() {
 	STACK_CHECK;
 checkpurgeagain:
 	ax = data.word(kExframepos);
@@ -4525,7 +4525,7 @@ checkpurgeagain:
 	_cmp(ax, (30000));
 	if (flags.c())
 		goto notnearframeend;
-	purgeanitem();
+	purgeAnItem();
 	goto checkpurgeagain;
 notnearframeend:
 	ax = data.word(kExtextpos);
@@ -4533,11 +4533,11 @@ notnearframeend:
 	_cmp(ax, (18000));
 	if (flags.c())
 		return /* (notneartextend) */;
-	purgeanitem();
+	purgeAnItem();
 	goto checkpurgeagain;
 }
 
-void DreamGenContext::purgeanitem() {
+void DreamGenContext::purgeAnItem() {
 	STACK_CHECK;
 	es = data.word(kExtras);
 	di = (0+2080+30000);
@@ -4558,7 +4558,7 @@ iscup:
 	_cmp(es.byte(di+11), bl);
 	if (flags.z())
 		goto cantpurge;
-	deleteexobject();
+	deleteExObject();
 	return;
 cantpurge:
 	_add(di, 16);
@@ -4577,7 +4577,7 @@ lookforpurge2:
 	_cmp(es.byte(di+12), 255);
 	if (!flags.z())
 		goto cantpurge2;
-	deleteexobject();
+	deleteExObject();
 	return;
 cantpurge2:
 	_add(di, 16);
@@ -4587,7 +4587,7 @@ cantpurge2:
 		goto lookforpurge2;
 }
 
-void DreamGenContext::deleteexobject() {
+void DreamGenContext::deleteExObject() {
 	STACK_CHECK;
 	push(cx);
 	push(cx);
@@ -4600,15 +4600,15 @@ void DreamGenContext::deleteexobject() {
 	cl = al;
 	_add(al, al);
 	_add(al, cl);
-	deleteexframe();
+	deleteExFrame();
 	ax = pop();
 	cl = al;
 	_add(al, al);
 	_add(al, cl);
 	_inc(al);
-	deleteexframe();
+	deleteExFrame();
 	ax = pop();
-	deleteextext();
+	deleteExText();
 	bx = pop();
 	bh = bl;
 	bl = 4;
@@ -4621,7 +4621,7 @@ deleteconts:
 	push(bx);
 	push(cx);
 	push(di);
-	deleteexobject();
+	deleteExObject();
 	di = pop();
 	cx = pop();
 	bx = pop();
@@ -4633,7 +4633,7 @@ notinsideex:
 		goto deleteconts;
 }
 
-void DreamGenContext::deleteexframe() {
+void DreamGenContext::deleteExFrame() {
 	STACK_CHECK;
 	di = (0);
 	ah = 0;
@@ -4674,7 +4674,7 @@ beforethisone:
 		goto shuffleadsdown;
 }
 
-void DreamGenContext::deleteextext() {
+void DreamGenContext::deleteExText() {
 	STACK_CHECK;
 	di = (0+2080+30000+(16*114));
 	ah = 0;
@@ -4718,22 +4718,22 @@ beforethistext:
 		goto shuffletextads;
 }
 
-void DreamGenContext::redrawmainscrn() {
+void DreamGenContext::redrawMainScrn() {
 	STACK_CHECK;
 	data.word(kTimecount) = 0;
-	createpanel();
+	createPanel();
 	data.byte(kNewobs) = 0;
-	drawfloor();
-	printsprites();
-	reelsonscreen();
-	showicon();
-	getunderzoom();
-	undertextline();
-	readmouse();
+	drawFloor();
+	printSprites();
+	reelsOnScreen();
+	showIcon();
+	getUnderZoom();
+	underTextLine();
+	readMouse();
 	data.byte(kCommandtype) = 255;
 }
 
-void DreamGenContext::getback1() {
+void DreamGenContext::getBack1() {
 	STACK_CHECK;
 	_cmp(data.byte(kPickup), 0);
 	if (flags.z())
@@ -4746,7 +4746,7 @@ notgotobject:
 		goto alreadyget;
 	data.byte(kCommandtype) = 202;
 	al = 26;
-	commandonly();
+	commandOnly();
 alreadyget:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -4767,28 +4767,28 @@ void DreamGenContext::talk() {
 	data.byte(kInmaparea) = 0;
 	al = data.byte(kCommand);
 	data.byte(kCharacter) = al;
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	undertextline();
-	convicons();
-	starttalk();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	underTextLine();
+	convIcons();
+	startTalk();
 	data.byte(kCommandtype) = 255;
-	readmouse();
-	showpointer();
-	worktoscreen();
+	readMouse();
+	showPointer();
+	workToScreen();
 waittalk:
-	delpointer();
-	readmouse();
-	animpointer();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumptextline();
+	delPointer();
+	readMouse();
+	animPointer();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpTextLine();
 	data.byte(kGetback) = 0;
 	bx = offset_talklist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kQuitrequested),  0);
 	if (!flags.z())
 		goto finishtalk;
@@ -4805,36 +4805,36 @@ finishtalk:
 	_or(al, 128);
 	es.byte(bx+7) = al;
 notnexttalk:
-	redrawmainscrn();
-	worktoscreenm();
+	redrawMainScrn();
+	workToScreenM();
 	_cmp(data.byte(kSpeechloaded), 1);
 	if (!flags.z())
 		return /* (nospeech) */;
-	cancelch1();
+	cancelCh1();
 	data.byte(kVolumedirection) = -1;
 	data.byte(kVolumeto) = 0;
 }
 
-void DreamGenContext::starttalk() {
+void DreamGenContext::startTalk() {
 	STACK_CHECK;
 	data.byte(kTalkmode) = 0;
 	al = data.byte(kCharacter);
 	_and(al, 127);
-	getpersontext();
+	getPersonText();
 	data.word(kCharshift) = 91+91;
 	di = 66;
 	bx = 64;
 	dl = 241;
 	al = 0;
 	ah = 79;
-	printdirect();
+	printDirect();
 	data.word(kCharshift) = 0;
 	di = 66;
 	bx = 80;
 	dl = 241;
 	al = 0;
 	ah = 0;
-	printdirect();
+	printDirect();
 	data.byte(kSpeechloaded) = 0;
 	al = data.byte(kCharacter);
 	_and(al, 127);
@@ -4844,17 +4844,17 @@ void DreamGenContext::starttalk() {
 	cl = 'C';
 	dl = 'R';
 	dh = data.byte(kReallocation);
-	loadspeech();
+	loadSpeech();
 	_cmp(data.byte(kSpeechloaded), 1);
 	if (!flags.z())
 		return /* (nospeech1) */;
 	data.byte(kVolumedirection) = 1;
 	data.byte(kVolumeto) = 6;
 	al = 50+12;
-	playchannel1();
+	playChannel1();
 }
 
-void DreamGenContext::getpersontext() {
+void DreamGenContext::getPersonText() {
 	STACK_CHECK;
 	ah = 0;
 	cx = 64*2;
@@ -4868,7 +4868,7 @@ void DreamGenContext::getpersontext() {
 	si = ax;
 }
 
-void DreamGenContext::moretalk() {
+void DreamGenContext::moreTalk() {
 	STACK_CHECK;
 	_cmp(data.byte(kTalkmode), 0);
 	if (flags.z())
@@ -4881,7 +4881,7 @@ canmore:
 		goto alreadymore;
 	data.byte(kCommandtype) = 215;
 	al = 49;
-	commandonly();
+	commandOnly();
 alreadymore:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -4899,10 +4899,10 @@ domoretalk:
 		goto notsecondpart;
 	data.byte(kTalkpos) = 48;
 notsecondpart:
-	dosometalk();
+	doSomeTalk();
 }
 
-void DreamGenContext::dosometalk() {
+void DreamGenContext::doSomeTalk() {
 	STACK_CHECK;
 dospeech:
 	al = data.byte(kTalkpos);
@@ -4928,11 +4928,11 @@ dospeech:
 		goto endheartalk;
 	push(es);
 	push(si);
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	convicons();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	convIcons();
 	si = pop();
 	es = pop();
 	di = 164;
@@ -4940,7 +4940,7 @@ dospeech:
 	dl = 144;
 	al = 0;
 	ah = 0;
-	printdirect();
+	printDirect();
 	al = data.byte(kCharacter);
 	_and(al, 127);
 	ah = 0;
@@ -4952,17 +4952,17 @@ dospeech:
 	cl = 'C';
 	dl = 'R';
 	dh = data.byte(kReallocation);
-	loadspeech();
+	loadSpeech();
 	_cmp(data.byte(kSpeechloaded), 0);
 	if (flags.z())
 		goto noplay1;
 	al = 62;
-	playchannel1();
+	playChannel1();
 noplay1:
 	data.byte(kPointermode) = 3;
-	worktoscreenm();
+	workToScreenM();
 	cx = 180;
-	hangonpq();
+	hangOnPQ();
 	if (!flags.c())
 		goto _tmp1;
 	return;
@@ -4997,11 +4997,11 @@ _tmp1:
 		goto skiptalk2;
 	push(es);
 	push(si);
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	convicons();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	convIcons();
 	si = pop();
 	es = pop();
 	di = 48;
@@ -5009,7 +5009,7 @@ _tmp1:
 	dl = 144;
 	al = 0;
 	ah = 0;
-	printdirect();
+	printDirect();
 	al = data.byte(kCharacter);
 	_and(al, 127);
 	ah = 0;
@@ -5021,17 +5021,17 @@ _tmp1:
 	cl = 'C';
 	dl = 'R';
 	dh = data.byte(kReallocation);
-	loadspeech();
+	loadSpeech();
 	_cmp(data.byte(kSpeechloaded), 0);
 	if (flags.z())
 		goto noplay2;
 	al = 62;
-	playchannel1();
+	playChannel1();
 noplay2:
 	data.byte(kPointermode) = 3;
-	worktoscreenm();
+	workToScreenM();
 	cx = 180;
-	hangonpq();
+	hangOnPQ();
 	if (!flags.c())
 		goto skiptalk2;
 	return;
@@ -5042,22 +5042,22 @@ endheartalk:
 	data.byte(kPointermode) = 0;
 }
 
-void DreamGenContext::hangonpq() {
+void DreamGenContext::hangOnPQ() {
 	STACK_CHECK;
 	data.byte(kGetback) = 0;
 	bx = 0;
 hangloopq:
 	push(cx);
 	push(bx);
-	delpointer();
-	readmouse();
-	animpointer();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumptextline();
+	delPointer();
+	readMouse();
+	animPointer();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpTextLine();
 	bx = offset_quitlist;
-	checkcoords();
+	checkCoords();
 	bx = pop();
 	cx = pop();
 	_cmp(data.byte(kGetback), 1);
@@ -5084,14 +5084,14 @@ notspeaking:
 	if (!flags.z())
 		goto hangloopq;
 finishconv:
-	delpointer();
+	delPointer();
 	data.byte(kPointermode) = 0;
 	flags._c = false;
  	return;
 quitconv:
-	delpointer();
+	delPointer();
 	data.byte(kPointermode) = 0;
-	cancelch1();
+	cancelCh1();
 	flags._c = true;
  }
 
@@ -5112,7 +5112,7 @@ canredes:
 		goto alreadyreds;
 	data.byte(kCommandtype) = 217;
 	al = 50;
-	commandonly();
+	commandOnly();
 alreadyreds:
 	ax = data.word(kMousebutton);
 	_and(ax, 1);
@@ -5120,20 +5120,20 @@ alreadyreds:
 		goto doredes;
 	return;
 doredes:
-	delpointer();
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	convicons();
-	starttalk();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	delPointer();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	convIcons();
+	startTalk();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::newplace() {
+void DreamGenContext::newPlace() {
 	STACK_CHECK;
 	_cmp(data.byte(kNeedtotravel), 1);
 	if (flags.z())
@@ -5149,50 +5149,50 @@ isautoloc:
 	return;
 istravel:
 	data.byte(kNeedtotravel) = 0;
-	selectlocation();
+	selectLocation();
 }
 
-void DreamGenContext::selectlocation() {
+void DreamGenContext::selectLocation() {
 	STACK_CHECK;
 	data.byte(kInmaparea) = 0;
-	clearbeforeload();
+	clearBeforeLoad();
 	data.byte(kGetback) = 0;
 	data.byte(kPointerframe) = 22;
-	readcitypic();
-	showcity();
-	getridoftemp();
-	readdesticon();
-	loadtraveltext();
-	showpanel();
-	showman();
-	showarrows();
-	showexit();
-	locationpic();
-	undertextline();
+	readCityPic();
+	showCity();
+	getRidOfTemp();
+	readDestIcon();
+	loadTravelText();
+	showPanel();
+	showMan();
+	showArrows();
+	showExit();
+	locationPic();
+	underTextLine();
 	data.byte(kCommandtype) = 255;
-	readmouse();
+	readMouse();
 	data.byte(kPointerframe) = 0;
-	showpointer();
-	worktoscreen();
+	showPointer();
+	workToScreen();
 	al = 9;
 	ah = 255;
-	playchannel0();
+	playChannel0();
 	data.byte(kNewlocation) = 255;
 select:
 	_cmp(data.byte(kQuitrequested),  0);
 	if (!flags.z())
 		goto quittravel;
-	delpointer();
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumptextline();
+	delPointer();
+	readMouse();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpTextLine();
 	_cmp(data.byte(kGetback), 1);
 	if (flags.z())
 		goto quittravel;
 	bx = offset_destlist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kNewlocation), 255);
 	if (flags.z())
 		goto select;
@@ -5200,31 +5200,31 @@ select:
 	_cmp(al, data.byte(kLocation));
 	if (flags.z())
 		goto quittravel;
-	getridoftemp();
-	getridoftemp2();
-	getridoftemp3();
+	getRidOfTemp();
+	getRidOfTemp2();
+	getRidOfTemp3();
 	es = data.word(kTraveltext);
-	deallocatemem();
+	deallocateMem();
 	return;
 quittravel:
 	al = data.byte(kReallocation);
 	data.byte(kNewlocation) = al;
 	data.byte(kGetback) = 0;
-	getridoftemp();
-	getridoftemp2();
-	getridoftemp3();
+	getRidOfTemp();
+	getRidOfTemp2();
+	getRidOfTemp3();
 	es = data.word(kTraveltext);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::lookatplace() {
+void DreamGenContext::lookAtPlace() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 224);
 	if (flags.z())
 		goto alreadyinfo;
 	data.byte(kCommandtype) = 224;
 	al = 27;
-	commandonly();
+	commandOnly();
 alreadyinfo:
 	ax = data.word(kMousebutton);
 	_and(ax, 1);
@@ -5238,20 +5238,20 @@ alreadyinfo:
 	if (!flags.c())
 		return /* (noinfo) */;
 	push(bx);
-	delpointer();
-	deltextline();
-	getundercentre();
+	delPointer();
+	delTextLine();
+	getUnderCentre();
 	ds = data.word(kTempgraphics3);
 	al = 0;
 	ah = 0;
 	di = 60;
 	bx = 72;
-	showframe();
+	showFrame();
 	al = 4;
 	ah = 0;
 	di = 60;
 	bx = 72+55;
-	showframe();
+	showFrame();
 	_cmp(data.byte(kForeignrelease),  0);
 	if (flags.z())
 		goto _tmp1;
@@ -5259,7 +5259,7 @@ alreadyinfo:
 	ah = 0;
 	di = 60;
 	bx = 72+55+21;
-	showframe();
+	showFrame();
 _tmp1:
 	bx = pop();
 	bh = 0;
@@ -5267,7 +5267,7 @@ _tmp1:
 	es = data.word(kTraveltext);
 	si = es.word(bx);
 	_add(si, (66*2));
-	findnextcolon();
+	findNextColon();
 	di = 63;
 	bx = 84;
 	_cmp(data.byte(kForeignrelease),  0);
@@ -5278,17 +5278,17 @@ _tmp2:
 	dl = 191;
 	al = 0;
 	ah = 0;
-	printdirect();
-	worktoscreenm();
+	printDirect();
+	workToScreenM();
 	cx = 500;
-	hangonp();
+	hangOnP();
 	data.byte(kPointermode) = 0;
 	data.byte(kPointerframe) = 0;
-	putundercentre();
-	worktoscreenm();
+	putUnderCentre();
+	workToScreenM();
 }
 
-void DreamGenContext::getundercentre() {
+void DreamGenContext::getUnderCentre() {
 	STACK_CHECK;
 	di = 58;
 	bx = 72;
@@ -5296,10 +5296,10 @@ void DreamGenContext::getundercentre() {
 	si = 0;
 	cl = 254;
 	ch = 110;
-	multiget();
+	multiGet();
 }
 
-void DreamGenContext::putundercentre() {
+void DreamGenContext::putUnderCentre() {
 	STACK_CHECK;
 	di = 58;
 	bx = 72;
@@ -5307,12 +5307,12 @@ void DreamGenContext::putundercentre() {
 	si = 0;
 	cl = 254;
 	ch = 110;
-	multiput();
+	multiPut();
 }
 
-void DreamGenContext::locationpic() {
+void DreamGenContext::locationPic() {
 	STACK_CHECK;
-	getdestinfo();
+	getDestInfo();
 	al = es.byte(si);
 	push(es);
 	push(si);
@@ -5330,7 +5330,7 @@ gotgraphic:
 	_add(di, 104);
 	bx = 138+14;
 	ah = 0;
-	showframe();
+	showFrame();
 	si = pop();
 	es = pop();
 	al = data.byte(kDestpos);
@@ -5342,7 +5342,7 @@ gotgraphic:
 	bx = 140+14;
 	ds = data.word(kTempgraphics);
 	ah = 0;
-	showframe();
+	showFrame();
 notinthisone:
 	bl = data.byte(kDestpos);
 	bh = 0;
@@ -5355,10 +5355,10 @@ notinthisone:
 	dl = 241;
 	al = 0;
 	ah = 0;
-	printdirect();
+	printDirect();
 }
 
-void DreamGenContext::getdestinfo() {
+void DreamGenContext::getDestInfo() {
 	STACK_CHECK;
 	al = data.byte(kDestpos);
 	ah = 0;
@@ -5377,36 +5377,36 @@ void DreamGenContext::getdestinfo() {
 	ax = pop();
 }
 
-void DreamGenContext::showarrows() {
+void DreamGenContext::showArrows() {
 	STACK_CHECK;
 	di = 116-12;
 	bx = 16;
 	ds = data.word(kTempgraphics);
 	al = 0;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = 226+12;
 	bx = 16;
 	ds = data.word(kTempgraphics);
 	al = 1;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = 280;
 	bx = 14;
 	ds = data.word(kTempgraphics);
 	al = 2;
 	ah = 0;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::nextdest() {
+void DreamGenContext::nextDest() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 218);
 	if (flags.z())
 		goto alreadydu;
 	data.byte(kCommandtype) = 218;
 	al = 28;
-	commandonly();
+	commandOnly();
 alreadydu:
 	ax = data.word(kMousebutton);
 	_and(ax, 1);
@@ -5422,32 +5422,32 @@ searchdestup:
 		goto notlastdest;
 	data.byte(kDestpos) = 0;
 notlastdest:
-	getdestinfo();
+	getDestInfo();
 	_cmp(al, 0);
 	if (flags.z())
 		goto searchdestup;
 	data.byte(kNewtextline) = 1;
-	deltextline();
-	delpointer();
-	showpanel();
-	showman();
-	showarrows();
-	locationpic();
-	undertextline();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	delTextLine();
+	delPointer();
+	showPanel();
+	showMan();
+	showArrows();
+	locationPic();
+	underTextLine();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::lastdest() {
+void DreamGenContext::lastDest() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 219);
 	if (flags.z())
 		goto alreadydd;
 	data.byte(kCommandtype) = 219;
 	al = 29;
-	commandonly();
+	commandOnly();
 alreadydd:
 	ax = data.word(kMousebutton);
 	_and(ax, 1);
@@ -5463,32 +5463,32 @@ searchdestdown:
 		goto notfirstdest;
 	data.byte(kDestpos) = 15;
 notfirstdest:
-	getdestinfo();
+	getDestInfo();
 	_cmp(al, 0);
 	if (flags.z())
 		goto searchdestdown;
 	data.byte(kNewtextline) = 1;
-	deltextline();
-	delpointer();
-	showpanel();
-	showman();
-	showarrows();
-	locationpic();
-	undertextline();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	delTextLine();
+	delPointer();
+	showPanel();
+	showMan();
+	showArrows();
+	locationPic();
+	underTextLine();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::destselect() {
+void DreamGenContext::destSelect() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 222);
 	if (flags.z())
 		goto alreadytrav;
 	data.byte(kCommandtype) = 222;
 	al = 30;
-	commandonly();
+	commandOnly();
 alreadytrav:
 	ax = data.word(kMousebutton);
 	_and(ax, 1);
@@ -5497,50 +5497,50 @@ alreadytrav:
 	_cmp(ax, data.word(kOldbutton));
 	if (flags.z())
 		return /* (notrav) */;
-	getdestinfo();
+	getDestInfo();
 	al = data.byte(kDestpos);
 	data.byte(kNewlocation) = al;
 }
 
-void DreamGenContext::resetlocation() {
+void DreamGenContext::resetLocation() {
 	STACK_CHECK;
 	push(ax);
 	_cmp(al, 5);
 	if (!flags.z())
 		goto notdelhotel;
-	purgealocation();
+	purgeALocation();
 	al = 21;
-	purgealocation();
+	purgeALocation();
 	al = 22;
-	purgealocation();
+	purgeALocation();
 	al = 27;
-	purgealocation();
+	purgeALocation();
 	goto clearedlocations;
 notdelhotel:
 	_cmp(al, 8);
 	if (!flags.z())
 		goto notdeltvstud;
-	purgealocation();
+	purgeALocation();
 	al = 28;
-	purgealocation();
+	purgeALocation();
 	goto clearedlocations;
 notdeltvstud:
 	_cmp(al, 6);
 	if (!flags.z())
 		goto notdelsarters;
-	purgealocation();
+	purgeALocation();
 	al = 20;
-	purgealocation();
+	purgeALocation();
 	al = 25;
-	purgealocation();
+	purgeALocation();
 	goto clearedlocations;
 notdelsarters:
 	_cmp(al, 13);
 	if (!flags.z())
 		goto notdelboathouse;
-	purgealocation();
+	purgeALocation();
 	al = 29;
-	purgealocation();
+	purgeALocation();
 	goto clearedlocations;
 notdelboathouse:
 clearedlocations:
@@ -5553,51 +5553,51 @@ clearedlocations:
 	es.byte(bx) = 0;
 }
 
-void DreamGenContext::readdesticon() {
+void DreamGenContext::readDestIcon() {
 	STACK_CHECK;
 	dx = 2013;
-	loadintotemp();
+	loadIntoTemp();
 	dx = 2026;
-	loadintotemp2();
+	loadIntoTemp2();
 	dx = 1961;
-	loadintotemp3();
+	loadIntoTemp3();
 }
 
-void DreamGenContext::readcitypic() {
+void DreamGenContext::readCityPic() {
 	STACK_CHECK;
 	dx = 2000;
-	loadintotemp();
+	loadIntoTemp();
 }
 
-void DreamGenContext::printoutermon() {
+void DreamGenContext::printOuterMon() {
 	STACK_CHECK;
 	di = 40;
 	bx = 32;
 	ds = data.word(kTempgraphics);
 	al = 1;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = 264;
 	bx = 32;
 	ds = data.word(kTempgraphics);
 	al = 2;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = 40;
 	bx = 12;
 	ds = data.word(kTempgraphics);
 	al = 3;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = 40;
 	bx = 164;
 	ds = data.word(kTempgraphics);
 	al = 4;
 	ah = 0;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::loadpersonal() {
+void DreamGenContext::loadPersonal() {
 	STACK_CHECK;
 	al = data.byte(kLocation);
 	dx = 2052;
@@ -5612,22 +5612,22 @@ void DreamGenContext::loadpersonal() {
 	if (flags.z())
 		goto foundpersonal;
 foundpersonal:
-	openfile();
-	readheader();
+	openFile();
+	readHeader();
 	bx = es.word(di);
 	push(bx);
 	cl = 4;
 	_shr(bx, cl);
-	allocatemem();
+	allocateMem();
 	data.word(kTextfile1) = ax;
 	ds = ax;
 	cx = pop();
 	dx = 0;
-	readfromfile();
-	closefile();
+	readFromFile();
+	closeFile();
 }
 
-void DreamGenContext::loadnews() {
+void DreamGenContext::loadNews() {
 	STACK_CHECK;
 	al = data.byte(kNewsitem);
 	dx = 2078;
@@ -5644,24 +5644,24 @@ void DreamGenContext::loadnews() {
 		goto foundnews;
 	dx = 2117;
 foundnews:
-	openfile();
-	readheader();
+	openFile();
+	readHeader();
 	bx = es.word(di);
 	push(bx);
 	cl = 4;
 	_shr(bx, cl);
-	allocatemem();
+	allocateMem();
 	data.word(kTextfile2) = ax;
 	ds = ax;
 	cx = pop();
 	dx = 0;
-	readfromfile();
-	closefile();
+	readFromFile();
+	closeFile();
 }
 
-void DreamGenContext::loadcart() {
+void DreamGenContext::loadCart() {
 	STACK_CHECK;
-	lookininterface();
+	lookInInterface();
 	dx = 2130;
 	_cmp(al, 0);
 	if (flags.z())
@@ -5680,30 +5680,30 @@ void DreamGenContext::loadcart() {
 		goto gotcart;
 	dx = 2182;
 gotcart:
-	openfile();
-	readheader();
+	openFile();
+	readHeader();
 	bx = es.word(di);
 	push(bx);
 	cl = 4;
 	_shr(bx, cl);
-	allocatemem();
+	allocateMem();
 	data.word(kTextfile3) = ax;
 	ds = ax;
 	cx = pop();
 	dx = 0;
-	readfromfile();
-	closefile();
+	readFromFile();
+	closeFile();
 }
 
-void DreamGenContext::lookininterface() {
+void DreamGenContext::lookInInterface() {
 	STACK_CHECK;
 	al = 'I';
 	ah = 'N';
 	cl = 'T';
 	ch = 'F';
-	findsetobject();
+	findSetObject();
 	ah = 1;
-	checkinside();
+	checkInside();
 	_cmp(cl, (114));
 	if (flags.z())
 		goto emptyinterface;
@@ -5714,7 +5714,7 @@ emptyinterface:
 	al = 0;
 }
 
-void DreamGenContext::locklighton() {
+void DreamGenContext::lockLightOn() {
 	STACK_CHECK;
 	di = 56;
 	bx = 182;
@@ -5723,15 +5723,15 @@ void DreamGenContext::locklighton() {
 	ah = 0;
 	push(di);
 	push(bx);
-	showframe();
+	showFrame();
 	bx = pop();
 	di = pop();
 	cl = 12;
 	ch = 8;
-	multidump();
+	multiDump();
 }
 
-void DreamGenContext::locklightoff() {
+void DreamGenContext::lockLightOff() {
 	STACK_CHECK;
 	di = 56;
 	bx = 182;
@@ -5740,15 +5740,15 @@ void DreamGenContext::locklightoff() {
 	ah = 0;
 	push(di);
 	push(bx);
-	showframe();
+	showFrame();
 	bx = pop();
 	di = pop();
 	cl = 12;
 	ch = 8;
-	multidump();
+	multiDump();
 }
 
-void DreamGenContext::makecaps() {
+void DreamGenContext::makeCaps() {
 	STACK_CHECK;
 	_cmp(al, 'a');
 	if (flags.c())
@@ -5756,7 +5756,7 @@ void DreamGenContext::makecaps() {
 	_sub(al, 32);
 }
 
-void DreamGenContext::delchar() {
+void DreamGenContext::delChar() {
 	STACK_CHECK;
 	_dec(data.word(kCurpos));
 	si = data.word(kCurpos);
@@ -5776,15 +5776,15 @@ void DreamGenContext::delchar() {
 	si = ax;
 	cl = 8;
 	ch = 8;
-	multiput();
+	multiPut();
 	di = data.word(kMonadx);
 	bx = data.word(kMonady);
 	cl = al;
 	ch = 8;
-	multidump();
+	multiDump();
 }
 
-void DreamGenContext::execcommand() {
+void DreamGenContext::execCommand() {
 	STACK_CHECK;
 	es = cs;
 	bx = offset_comlist;
@@ -5794,7 +5794,7 @@ void DreamGenContext::execcommand() {
 	_cmp(al, 0);
 	if (!flags.z())
 		goto notblankinp;
-	scrollmonitor();
+	scrollMonitor();
 	return;
 notblankinp:
 	cl = 0;
@@ -5819,7 +5819,7 @@ comloop2:
 	_cmp(cl, 6);
 	if (!flags.z())
 		goto comloop;
-	neterror();
+	netError();
 	al = 0;
 	return;
 foundcom:
@@ -5842,11 +5842,11 @@ foundcom:
 		goto keyscom;
 	goto quitcom;
 directory:
-	dircom();
+	dirCom();
 	al = 0;
 	return;
 signoncom:
-	signon();
+	signOn();
 	al = 0;
 	return;
 accesscom:
@@ -5854,27 +5854,27 @@ accesscom:
 	al = 0;
 	return;
 keyscom:
-	showkeys();
+	showKeys();
 	al = 0;
 	return;
 testcom:
 	al = 6;
-	monmessage();
+	monMessage();
 	al = 0;
 	return;
 quitcom:
 	al = 1;
 }
 
-void DreamGenContext::dircom() {
+void DreamGenContext::dirCom() {
 	STACK_CHECK;
 	cx = 30;
-	randomaccess();
+	randomAccess();
 	parser();
 	_cmp(es.byte(di+1), 0);
 	if (flags.z())
 		goto dirroot;
-	dirfile();
+	dirFile();
 	return;
 dirroot:
 	data.byte(kLogonum) = 0;
@@ -5886,20 +5886,20 @@ dirroot:
 	_inc(di);
 	cx = 12;
 	_movsb(cx, true);
-	monitorlogo();
-	scrollmonitor();
+	monitorLogo();
+	scrollMonitor();
 	al = 9;
-	monmessage();
+	monMessage();
 	es = data.word(kTextfile1);
-	searchforfiles();
+	searchForFiles();
 	es = data.word(kTextfile2);
-	searchforfiles();
+	searchForFiles();
 	es = data.word(kTextfile3);
-	searchforfiles();
-	scrollmonitor();
+	searchForFiles();
+	scrollMonitor();
 }
 
-void DreamGenContext::searchforfiles() {
+void DreamGenContext::searchForFiles() {
 	STACK_CHECK;
 	bx = (66*2);
 directloop1:
@@ -5911,11 +5911,11 @@ directloop1:
 	_cmp(al, 34);
 	if (!flags.z())
 		goto directloop1;
-	monprint();
+	monPrint();
 	goto directloop1;
 }
 
-void DreamGenContext::signon() {
+void DreamGenContext::signOn() {
 	STACK_CHECK;
 	parser();
 	_inc(di);
@@ -5933,7 +5933,7 @@ signonloop2:
 	_cmp(al, 32);
 	if (flags.z())
 		goto foundsign;
-	makecaps();
+	makeCaps();
 	ah = es.byte(di);
 	_inc(di);
 	_cmp(al, ah);
@@ -5949,7 +5949,7 @@ nomatch:
 	if (--cx)
 		goto signonloop;
 	al = 13;
-	monmessage();
+	monMessage();
 	return;
 foundsign:
 	di = pop();
@@ -5961,14 +5961,14 @@ foundsign:
 	if (flags.z())
 		goto notyetassigned;
 	al = 17;
-	monmessage();
+	monMessage();
 	return;
 notyetassigned:
 	push(es);
 	push(bx);
-	scrollmonitor();
+	scrollMonitor();
 	al = 15;
-	monmessage();
+	monMessage();
 	di = data.word(kMonadx);
 	bx = data.word(kMonady);
 	push(di);
@@ -5997,32 +5997,32 @@ checkpass:
 		goto checkpass;
 	bx = pop();
 	es = pop();
-	scrollmonitor();
+	scrollMonitor();
 	al = 16;
-	monmessage();
+	monMessage();
 	return;
 passpassed:
 	al = 14;
-	monmessage();
+	monMessage();
 	bx = pop();
 	es = pop();
 	push(es);
 	push(bx);
 	_add(bx, 14);
-	monprint();
-	scrollmonitor();
+	monPrint();
+	scrollMonitor();
 	bx = pop();
 	es = pop();
 	es.byte(bx) = 1;
 }
 
-void DreamGenContext::showkeys() {
+void DreamGenContext::showKeys() {
 	STACK_CHECK;
 	cx = 10;
-	randomaccess();
-	scrollmonitor();
+	randomAccess();
+	scrollMonitor();
 	al = 18;
-	monmessage();
+	monMessage();
 	es = cs;
 	bx = offset_keys;
 	cx = 4;
@@ -6033,25 +6033,25 @@ keysloop:
 	if (flags.z())
 		goto notheld;
 	_add(bx, 14);
-	monprint();
+	monPrint();
 notheld:
 	bx = pop();
 	cx = pop();
 	_add(bx, 26);
 	if (--cx)
 		goto keysloop;
-	scrollmonitor();
+	scrollMonitor();
 }
 
 void DreamGenContext::read() {
 	STACK_CHECK;
 	cx = 40;
-	randomaccess();
+	randomAccess();
 	parser();
 	_cmp(es.byte(di+1), 0);
 	if (!flags.z())
 		goto okcom;
-	neterror();
+	netError();
 	return;
 okcom:
 	es = cs;
@@ -6060,7 +6060,7 @@ okcom:
 	data.word(kMonsource) = ax;
 	ds = ax;
 	si = (66*2);
-	searchforstring();
+	searchForString();
 	_cmp(al, 0);
 	if (flags.z())
 		goto foundfile2;
@@ -6068,7 +6068,7 @@ okcom:
 	data.word(kMonsource) = ax;
 	ds = ax;
 	si = (66*2);
-	searchforstring();
+	searchForString();
 	_cmp(al, 0);
 	if (flags.z())
 		goto foundfile2;
@@ -6076,15 +6076,15 @@ okcom:
 	data.word(kMonsource) = ax;
 	ds = ax;
 	si = (66*2);
-	searchforstring();
+	searchForString();
 	_cmp(al, 0);
 	if (flags.z())
 		goto foundfile2;
 	al = 7;
-	monmessage();
+	monMessage();
 	return;
 foundfile2:
-	getkeyandlogo();
+	getKeyAndLogo();
 	_cmp(al, 0);
 	if (flags.z())
 		goto keyok1;
@@ -6093,25 +6093,25 @@ keyok1:
 	es = cs;
 	di = offset_operand1;
 	ds = data.word(kMonsource);
-	searchforstring();
+	searchForString();
 	_cmp(al, 0);
 	if (flags.z())
 		goto findtopictext;
 	al = data.byte(kOldlogonum);
 	data.byte(kLogonum) = al;
 	al = 11;
-	monmessage();
+	monMessage();
 	return;
 findtopictext:
 	_inc(bx);
 	push(es);
 	push(bx);
-	monitorlogo();
-	scrollmonitor();
+	monitorLogo();
+	scrollMonitor();
 	bx = pop();
 	es = pop();
 moretopic:
-	monprint();
+	monPrint();
 	al = es.byte(bx);
 	_cmp(al, 34);
 	if (flags.z())
@@ -6124,17 +6124,17 @@ moretopic:
 		goto endoftopic;
 	push(es);
 	push(bx);
-	processtrigger();
+	processTrigger();
 	cx = 24;
-	randomaccess();
+	randomAccess();
 	bx = pop();
 	es = pop();
 	goto moretopic;
 endoftopic:
-	scrollmonitor();
+	scrollMonitor();
 }
 
-void DreamGenContext::dirfile() {
+void DreamGenContext::dirFile() {
 	STACK_CHECK;
 	al = 34;
 	es.byte(di) = al;
@@ -6142,7 +6142,7 @@ void DreamGenContext::dirfile() {
 	push(di);
 	ds = data.word(kTextfile1);
 	si = (66*2);
-	searchforstring();
+	searchForString();
 	_cmp(al, 0);
 	if (flags.z())
 		goto foundfile;
@@ -6152,7 +6152,7 @@ void DreamGenContext::dirfile() {
 	push(di);
 	ds = data.word(kTextfile2);
 	si = (66*2);
-	searchforstring();
+	searchForString();
 	_cmp(al, 0);
 	if (flags.z())
 		goto foundfile;
@@ -6162,19 +6162,19 @@ void DreamGenContext::dirfile() {
 	push(di);
 	ds = data.word(kTextfile3);
 	si = (66*2);
-	searchforstring();
+	searchForString();
 	_cmp(al, 0);
 	if (flags.z())
 		goto foundfile;
 	di = pop();
 	es = pop();
 	al = 7;
-	monmessage();
+	monMessage();
 	return;
 foundfile:
 	ax = pop();
 	ax = pop();
-	getkeyandlogo();
+	getKeyAndLogo();
 	_cmp(al, 0);
 	if (flags.z())
 		goto keyok2;
@@ -6188,10 +6188,10 @@ keyok2:
 	di = 2970+1;
 	cx = 12;
 	_movsb(cx, true);
-	monitorlogo();
-	scrollmonitor();
+	monitorLogo();
+	scrollMonitor();
 	al = 10;
-	monmessage();
+	monMessage();
 	bx = pop();
 	es = pop();
 directloop2:
@@ -6206,13 +6206,13 @@ directloop2:
 	_cmp(al, '=');
 	if (!flags.z())
 		goto directloop2;
-	monprint();
+	monPrint();
 	goto directloop2;
 endofdir2:
-	scrollmonitor();
+	scrollMonitor();
 }
 
-void DreamGenContext::getkeyandlogo() {
+void DreamGenContext::getKeyAndLogo() {
 	STACK_CHECK;
 	_inc(bx);
 	al = es.byte(bx);
@@ -6239,12 +6239,12 @@ void DreamGenContext::getkeyandlogo() {
 	push(bx);
 	push(es);
 	al = 12;
-	monmessage();
+	monMessage();
 	es = pop();
 	bx = pop();
 	_add(bx, 14);
-	monprint();
-	scrollmonitor();
+	monPrint();
+	scrollMonitor();
 	bx = pop();
 	es = pop();
 	al = 1;
@@ -6257,7 +6257,7 @@ keyok:
 	al = 0;
 }
 
-void DreamGenContext::searchforstring() {
+void DreamGenContext::searchForString() {
 	STACK_CHECK;
 	dl = es.byte(di);
 	cx = di;
@@ -6267,7 +6267,7 @@ restartlook:
 	dh = 0;
 keeplooking:
 	_lodsb();
-	makecaps();
+	makeCaps();
 	_cmp(al, '*');
 	if (flags.z())
 		goto notfound;
@@ -6340,57 +6340,57 @@ finishpars:
 	di = offset_operand1;
 }
 
-void DreamGenContext::monitorlogo() {
+void DreamGenContext::monitorLogo() {
 	STACK_CHECK;
 	al = data.byte(kLogonum);
 	_cmp(al, data.byte(kOldlogonum));
 	if (flags.z())
 		goto notnewlogo;
 	data.byte(kOldlogonum) = al;
-	printlogo();
-	printundermon();
-	worktoscreen();
-	printlogo();
-	printlogo();
+	printLogo();
+	printUnderMon();
+	workToScreen();
+	printLogo();
+	printLogo();
 	al = 26;
-	playchannel1();
+	playChannel1();
 	cx = 20;
-	randomaccess();
+	randomAccess();
 	return;
 notnewlogo:
-	printlogo();
+	printLogo();
 }
 
-void DreamGenContext::processtrigger() {
+void DreamGenContext::processTrigger() {
 	STACK_CHECK;
 	_cmp(data.byte(kLasttrigger), '1');
 	if (!flags.z())
 		goto notfirsttrigger;
 	al = 8;
-	setlocation();
+	setLocation();
 	al = 45;
-	triggermessage();
+	triggerMessage();
 	return;
 notfirsttrigger:
 	_cmp(data.byte(kLasttrigger), '2');
 	if (!flags.z())
 		goto notsecondtrigger;
 	al = 9;
-	setlocation();
+	setLocation();
 	al = 55;
-	triggermessage();
+	triggerMessage();
 	return;
 notsecondtrigger:
 	_cmp(data.byte(kLasttrigger), '3');
 	if (!flags.z())
 		return /* (notthirdtrigger) */;
 	al = 2;
-	setlocation();
+	setLocation();
 	al = 59;
-	triggermessage();
+	triggerMessage();
 }
 
-void DreamGenContext::triggermessage() {
+void DreamGenContext::triggerMessage() {
 	STACK_CHECK;
 	push(ax);
 	di = 174;
@@ -6399,31 +6399,31 @@ void DreamGenContext::triggermessage() {
 	ch = 63;
 	ds = data.word(kMapstore);
 	si = 0;
-	multiget();
+	multiGet();
 	ax = pop();
-	findpuztext();
+	findPuzText();
 	di = 174;
 	bx = 156;
 	dl = 141;
 	ah = 16;
-	printdirect();
+	printDirect();
 	cx = 140;
-	hangon();
-	worktoscreen();
+	hangOn();
+	workToScreen();
 	cx = 340;
-	hangon();
+	hangOn();
 	di = 174;
 	bx = 153;
 	cl = 200;
 	ch = 63;
 	ds = data.word(kMapstore);
 	si = 0;
-	multiput();
-	worktoscreen();
+	multiPut();
+	workToScreen();
 	data.byte(kLasttrigger) = 0;
 }
 
-void DreamGenContext::useobject() {
+void DreamGenContext::useObject() {
 	STACK_CHECK;
 	data.byte(kWithobject) = 255;
 	_cmp(data.byte(kCommandtype), 229);
@@ -6433,7 +6433,7 @@ void DreamGenContext::useobject() {
 	bl = data.byte(kCommand);
 	bh = data.byte(kObjecttype);
 	al = 51;
-	commandwithob();
+	commandWithOb();
 alreadyuse:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -6444,23 +6444,23 @@ alreadyuse:
 		goto douse;
 	return;
 douse:
-	useroutine();
+	useRoutine();
 }
 
-void DreamGenContext::wheelsound() {
+void DreamGenContext::wheelSound() {
 	STACK_CHECK;
 	al = 17;
-	playchannel1();
-	showfirstuse();
-	putbackobstuff();
+	playChannel1();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::runtap() {
+void DreamGenContext::runTap() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto tapwith;
-	withwhat();
+	withWhat();
 	return;
 tapwith:
 	al = data.byte(kWithobject);
@@ -6483,36 +6483,36 @@ tapwith:
 		goto cupfromtapfull;
 	cx = 300;
 	al = 56;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 fillcupfromtap:
 	al = data.byte(kWithobject);
-	getexad();
+	getExAd();
 	es.byte(bx+15) = 'F'-'A';
 	al = 8;
-	playchannel1();
+	playChannel1();
 	cx = 300;
 	al = 57;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 cupfromtapfull:
 	cx = 300;
 	al = 58;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 }
 
-void DreamGenContext::playguitar() {
+void DreamGenContext::playGuitar() {
 	STACK_CHECK;
 	al = 14;
-	playchannel1();
-	showfirstuse();
-	putbackobstuff();
+	playChannel1();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::hotelcontrol() {
+void DreamGenContext::hotelControl() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 21);
 	if (!flags.z())
@@ -6520,26 +6520,26 @@ void DreamGenContext::hotelcontrol() {
 	_cmp(data.byte(kMapx), 33);
 	if (!flags.z())
 		goto notrightcont;
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 	return;
 notrightcont:
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::hotelbell() {
+void DreamGenContext::hotelBell() {
 	STACK_CHECK;
 	al = 12;
-	playchannel1();
-	showfirstuse();
-	putbackobstuff();
+	playChannel1();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::opentomb() {
+void DreamGenContext::openTomb() {
 	STACK_CHECK;
 	_inc(data.byte(kProgresspoints));
-	showfirstuse();
+	showFirstUse();
 	data.word(kWatchingtime) = 35*2;
 	data.word(kReeltowatch) = 1;
 	data.word(kEndwatchreel) = 33;
@@ -6548,46 +6548,46 @@ void DreamGenContext::opentomb() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usetrainer() {
+void DreamGenContext::useTrainer() {
 	STACK_CHECK;
-	getanyad();
+	getAnyAd();
 	_cmp(es.byte(bx+2), 4);
 	if (!flags.z())
 		goto notheldtrainer;
 	_inc(data.byte(kProgresspoints));
-	makeworn();
-	showseconduse();
-	putbackobstuff();
+	makeWorn();
+	showSecondUse();
+	putBackObStuff();
 	return;
 notheldtrainer:
-	nothelderror();
+	notHeldError();
 }
 
-void DreamGenContext::nothelderror() {
+void DreamGenContext::notHeldError() {
 	STACK_CHECK;
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	obicons();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	obIcons();
 	di = 64;
 	bx = 100;
 	al = 63;
 	ah = 1;
 	dl = 201;
 	printmessage2();
-	worktoscreenm();
+	workToScreenM();
 	cx = 50;
-	hangonp();
-	putbackobstuff();
+	hangOnP();
+	putBackObStuff();
 }
 
-void DreamGenContext::usepipe() {
+void DreamGenContext::usePipe() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto pipewith;
-	withwhat();
+	withWhat();
 	return;
 pipewith:
 	al = data.byte(kWithobject);
@@ -6610,39 +6610,39 @@ pipewith:
 		goto alreadyfull;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 fillcup:
 	cx = 300;
 	al = 36;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	al = data.byte(kWithobject);
-	getexad();
+	getExAd();
 	es.byte(bx+15) = 'F'-'A';
 	return;
 alreadyfull:
 	cx = 300;
 	al = 35;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 }
 
-void DreamGenContext::usefullcart() {
+void DreamGenContext::useFullCart() {
 	STACK_CHECK;
 	_inc(data.byte(kProgresspoints));
 	al = 2;
 	ah = data.byte(kRoomnum);
 	_add(ah, 6);
-	turnanypathon();
+	turnAnyPathOn();
 	data.byte(kManspath) = 4;
 	data.byte(kFacing) = 4;
 	data.byte(kTurntoface) = 4;
 	data.byte(kFinaldest) = 4;
-	findxyfrompath();
+	findXYFromPath();
 	data.byte(kResetmanxy) = 1;
-	showfirstuse();
+	showFirstUse();
 	data.word(kWatchingtime) = 72*2;
 	data.word(kReeltowatch) = 58;
 	data.word(kEndwatchreel) = 142;
@@ -6651,12 +6651,12 @@ void DreamGenContext::usefullcart() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useplinth() {
+void DreamGenContext::usePlinth() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto plinthwith;
-	withwhat();
+	withWhat();
 	return;
 plinthwith:
 	al = data.byte(kWithobject);
@@ -6668,12 +6668,12 @@ plinthwith:
 	compare();
 	if (flags.z())
 		goto isrightkey;
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 	return;
 isrightkey:
 	_inc(data.byte(kProgresspoints));
-	showseconduse();
+	showSecondUse();
 	data.word(kWatchingtime) = 220;
 	data.word(kReeltowatch) = 0;
 	data.word(kEndwatchreel) = 104;
@@ -6686,45 +6686,45 @@ isrightkey:
 
 void DreamGenContext::chewy() {
 	STACK_CHECK;
-	showfirstuse();
-	getanyad();
+	showFirstUse();
+	getAnyAd();
 	es.byte(bx+2) = 255;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useladder() {
+void DreamGenContext::useLadder() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	_sub(data.byte(kMapx), 11);
-	findroominloc();
+	findRoomInLoc();
 	data.byte(kFacing) = 6;
 	data.byte(kTurntoface) = 6;
 	data.byte(kManspath) = 0;
 	data.byte(kDestination) = 0;
 	data.byte(kFinaldest) = 0;
-	findxyfrompath();
+	findXYFromPath();
 	data.byte(kResetmanxy) = 1;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useladderb() {
+void DreamGenContext::useLadderB() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	_add(data.byte(kMapx), 11);
-	findroominloc();
+	findRoomInLoc();
 	data.byte(kFacing) = 2;
 	data.byte(kTurntoface) = 2;
 	data.byte(kManspath) = 1;
 	data.byte(kDestination) = 1;
 	data.byte(kFinaldest) = 1;
-	findxyfrompath();
+	findXYFromPath();
 	data.byte(kResetmanxy) = 1;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::slabdoora() {
+void DreamGenContext::sLabDoorA() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
@@ -6744,7 +6744,7 @@ slabawrong:
 	data.byte(kSpeedcount) = 1;
 }
 
-void DreamGenContext::slabdoorb() {
+void DreamGenContext::sLabDoorB() {
 	STACK_CHECK;
 	_cmp(data.byte(kDreamnumber), 1);
 	if (!flags.z())
@@ -6753,16 +6753,16 @@ void DreamGenContext::slabdoorb() {
 	ah = 'H';
 	cl = 'L';
 	ch = 'D';
-	isryanholding();
+	isRyanHolding();
 	if (!flags.z())
 		goto gotcrystal;
 	al = 44;
 	cx = 200;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 gotcrystal:
-	showfirstuse();
+	showFirstUse();
 	_inc(data.byte(kProgresspoints));
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
@@ -6773,7 +6773,7 @@ gotcrystal:
 	data.byte(kNewlocation) = 47;
 	return;
 slabbwrong:
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
@@ -6784,9 +6784,9 @@ slabbwrong:
 	data.byte(kSpeedcount) = 1;
 }
 
-void DreamGenContext::slabdoord() {
+void DreamGenContext::sLabDoorD() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
@@ -6806,9 +6806,9 @@ slabcwrong:
 	data.byte(kSpeedcount) = 1;
 }
 
-void DreamGenContext::slabdoorc() {
+void DreamGenContext::sLabDoorC() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
@@ -6828,9 +6828,9 @@ slabdwrong:
 	data.byte(kSpeedcount) = 1;
 }
 
-void DreamGenContext::slabdoore() {
+void DreamGenContext::sLabDoorE() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
@@ -6850,9 +6850,9 @@ slabewrong:
 	data.byte(kSpeedcount) = 1;
 }
 
-void DreamGenContext::slabdoorf() {
+void DreamGenContext::sLabDoorF() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
@@ -6872,12 +6872,12 @@ slabfwrong:
 	data.byte(kSpeedcount) = 1;
 }
 
-void DreamGenContext::useslab() {
+void DreamGenContext::useSLab() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto slabwith;
-	withwhat();
+	withWhat();
 	return;
 slabwith:
 	al = data.byte(kWithobject);
@@ -6891,26 +6891,26 @@ slabwith:
 		goto nextslab;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 nextslab:
 	al = data.byte(kWithobject);
-	getexad();
+	getExAd();
 	es.byte(bx+2) = 0;
 	al = data.byte(kCommand);
 	push(ax);
-	removesetobject();
+	removeSetObject();
 	ax = pop();
 	_inc(al);
 	push(ax);
-	placesetobject();
+	placeSetObject();
 	ax = pop();
 	_cmp(al, 54);
 	if (!flags.z())
 		goto notlastslab;
 	al = 0;
-	turnpathon();
+	turnPathOn();
 	data.word(kWatchingtime) = 22;
 	data.word(kReeltowatch) = 35;
 	data.word(kEndwatchreel) = 48;
@@ -6918,16 +6918,16 @@ nextslab:
 	data.byte(kSpeedcount) = 1;
 notlastslab:
 	_inc(data.byte(kProgresspoints));
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usecart() {
+void DreamGenContext::useCart() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto cartwith;
-	withwhat();
+	withWhat();
 	return;
 cartwith:
 	al = data.byte(kWithobject);
@@ -6941,32 +6941,32 @@ cartwith:
 		goto nextcart;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 nextcart:
 	al = data.byte(kWithobject);
-	getexad();
+	getExAd();
 	es.byte(bx+2) = 0;
 	al = data.byte(kCommand);
 	push(ax);
-	removesetobject();
+	removeSetObject();
 	ax = pop();
 	_inc(al);
-	placesetobject();
+	placeSetObject();
 	_inc(data.byte(kProgresspoints));
 	al = 17;
-	playchannel1();
-	showfirstuse();
+	playChannel1();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useclearbox() {
+void DreamGenContext::useClearBox() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto clearboxwith;
-	withwhat();
+	withWhat();
 	return;
 clearboxwith:
 	al = data.byte(kWithobject);
@@ -6980,12 +6980,12 @@ clearboxwith:
 		goto openbox;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 openbox:
 	_inc(data.byte(kProgresspoints));
-	showfirstuse();
+	showFirstUse();
 	data.word(kWatchingtime) = 80;
 	data.word(kReeltowatch) = 67;
 	data.word(kEndwatchreel) = 105;
@@ -6994,10 +6994,10 @@ openbox:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usecoveredbox() {
+void DreamGenContext::useCoveredBox() {
 	STACK_CHECK;
 	_inc(data.byte(kProgresspoints));
-	showfirstuse();
+	showFirstUse();
 	data.word(kWatchingtime) = 50;
 	data.word(kReeltowatch) = 41;
 	data.word(kEndwatchreel) = 66;
@@ -7006,9 +7006,9 @@ void DreamGenContext::usecoveredbox() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::userailing() {
+void DreamGenContext::useRailing() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.word(kWatchingtime) = 80;
 	data.word(kReeltowatch) = 0;
 	data.word(kEndwatchreel) = 30;
@@ -7018,12 +7018,12 @@ void DreamGenContext::userailing() {
 	data.byte(kMandead) = 4;
 }
 
-void DreamGenContext::useopenbox() {
+void DreamGenContext::useOpenBox() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto openboxwith;
-	withwhat();
+	withWhat();
 	return;
 openboxwith:
 	al = data.byte(kWithobject);
@@ -7044,15 +7044,15 @@ openboxwith:
 	compare();
 	if (flags.z())
 		goto openboxwrong;
-	showfirstuse();
+	showFirstUse();
 	return;
 destoryopenbox:
 	_inc(data.byte(kProgresspoints));
 	cx = 300;
 	al = 37;
-	showpuztext();
+	showPuzText();
 	al = data.byte(kWithobject);
-	getexad();
+	getExAd();
 	es.byte(bx+15) = 'E'-'A';
 	data.word(kWatchingtime) = 140;
 	data.word(kReeltowatch) = 105;
@@ -7060,54 +7060,54 @@ destoryopenbox:
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
 	al = 4;
-	turnpathon();
+	turnPathOn();
 	data.byte(kGetback) = 1;
 	return;
 openboxwrong:
 	cx = 300;
 	al = 38;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 }
 
-void DreamGenContext::wearwatch() {
+void DreamGenContext::wearWatch() {
 	STACK_CHECK;
 	_cmp(data.byte(kWatchon), 1);
 	if (flags.z())
 		goto wearingwatch;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kWatchon) = 1;
 	data.byte(kGetback) = 1;
-	getanyad();
-	makeworn();
+	getAnyAd();
+	makeWorn();
 	return;
 wearingwatch:
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::wearshades() {
+void DreamGenContext::wearShades() {
 	STACK_CHECK;
 	_cmp(data.byte(kShadeson), 1);
 	if (flags.z())
 		goto wearingshades;
 	data.byte(kShadeson) = 1;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
-	getanyad();
-	makeworn();
+	getAnyAd();
+	makeWorn();
 	return;
 wearingshades:
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::sitdowninbar() {
+void DreamGenContext::sitDownInBar() {
 	STACK_CHECK;
 	_cmp(data.byte(kWatchmode), -1);
 	if (!flags.z())
 		goto satdown;
-	showfirstuse();
+	showFirstUse();
 	data.word(kWatchingtime) = 50;
 	data.word(kReeltowatch) = 55;
 	data.word(kEndwatchreel) = 71;
@@ -7118,13 +7118,13 @@ void DreamGenContext::sitdowninbar() {
 	data.byte(kGetback) = 1;
 	return;
 satdown:
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::usechurchhole() {
+void DreamGenContext::useChurchHole() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 	data.word(kWatchingtime) = 28;
 	data.word(kReeltowatch) = 13;
@@ -7133,12 +7133,12 @@ void DreamGenContext::usechurchhole() {
 	data.byte(kSpeedcount) = 1;
 }
 
-void DreamGenContext::usehole() {
+void DreamGenContext::useHole() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto holewith;
-	withwhat();
+	withWhat();
 	return;
 holewith:
 	al = data.byte(kWithobject);
@@ -7152,27 +7152,27 @@ holewith:
 		goto righthand;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 righthand:
-	showfirstuse();
+	showFirstUse();
 	al = 86;
-	removesetobject();
+	removeSetObject();
 	al = data.byte(kWithobject);
-	getexad();
+	getExAd();
 	es.byte(bx+2) = 255;
 	data.byte(kCanmovealtar) = 1;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usealtar() {
+void DreamGenContext::useAltar() {
 	STACK_CHECK;
 	al = 'C';
 	ah = 'N';
 	cl = 'D';
 	ch = 'A';
-	findexobject();
+	findExObject();
 	_cmp(al, (114));
 	if (flags.z())
 		goto thingsonaltar;
@@ -7180,7 +7180,7 @@ void DreamGenContext::usealtar() {
 	ah = 'N';
 	cl = 'D';
 	ch = 'B';
-	findexobject();
+	findExObject();
 	_cmp(al, (114));
 	if (flags.z())
 		goto thingsonaltar;
@@ -7189,12 +7189,12 @@ void DreamGenContext::usealtar() {
 		goto movealtar;
 	cx = 300;
 	al = 23;
-	showpuztext();
+	showPuzText();
 	data.byte(kGetback) = 1;
 	return;
 movealtar:
 	_inc(data.byte(kProgresspoints));
-	showseconduse();
+	showSecondUse();
 	data.word(kWatchingtime) = 160;
 	data.word(kReeltowatch) = 81;
 	data.word(kEndwatchreel) = 174;
@@ -7205,20 +7205,20 @@ movealtar:
 	bh = 76;
 	cx = 32;
 	dx = 98;
-	setuptimeduse();
+	setupTimedUse();
 	data.byte(kGetback) = 1;
 	return;
 thingsonaltar:
-	showfirstuse();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::opentvdoor() {
+void DreamGenContext::openTVDoor() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto tvdoorwith;
-	withwhat();
+	withWhat();
 	return;
 tvdoorwith:
 	al = data.byte(kWithobject);
@@ -7232,34 +7232,34 @@ tvdoorwith:
 		goto keyontv;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 keyontv:
-	showfirstuse();
+	showFirstUse();
 	data.byte(kLockstatus) = 0;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usedryer() {
+void DreamGenContext::useDryer() {
 	STACK_CHECK;
 	al = 12;
-	playchannel1();
-	showfirstuse();
+	playChannel1();
+	showFirstUse();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openlouis() {
+void DreamGenContext::openLouis() {
 	STACK_CHECK;
 	al = 5;
 	ah = 2;
 	cl = 3;
 	ch = 8;
-	entercode();
+	enterCode();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::nextcolon() {
+void DreamGenContext::nextColon() {
 	STACK_CHECK;
 lookcolon:
 	al = es.byte(si);
@@ -7269,54 +7269,54 @@ lookcolon:
 		goto lookcolon;
 }
 
-void DreamGenContext::openyourneighbour() {
+void DreamGenContext::openYourNeighbour() {
 	STACK_CHECK;
 	al = 255;
 	ah = 255;
 	cl = 255;
 	ch = 255;
-	entercode();
+	enterCode();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usewindow() {
+void DreamGenContext::useWindow() {
 	STACK_CHECK;
 	_cmp(data.byte(kManspath), 6);
 	if (!flags.z())
 		goto notonbalc;
 	_inc(data.byte(kProgresspoints));
-	showfirstuse();
+	showFirstUse();
 	data.byte(kNewlocation) = 29;
 	data.byte(kGetback) = 1;
 	return;
 notonbalc:
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::usebalcony() {
+void DreamGenContext::useBalcony() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	al = 6;
-	turnpathon();
+	turnPathOn();
 	al = 0;
-	turnpathoff();
+	turnPathOff();
 	al = 1;
-	turnpathoff();
+	turnPathOff();
 	al = 2;
-	turnpathoff();
+	turnPathOff();
 	al = 3;
-	turnpathoff();
+	turnPathOff();
 	al = 4;
-	turnpathoff();
+	turnPathOff();
 	al = 5;
-	turnpathoff();
+	turnPathOff();
 	_inc(data.byte(kProgresspoints));
 	data.byte(kManspath) = 6;
 	data.byte(kDestination) = 6;
 	data.byte(kFinaldest) = 6;
-	findxyfrompath();
-	switchryanoff();
+	findXYFromPath();
+	switchRyanOff();
 	data.byte(kResetmanxy) = 1;
 	data.word(kWatchingtime) = 30*2;
 	data.word(kReeltowatch) = 183;
@@ -7326,47 +7326,47 @@ void DreamGenContext::usebalcony() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openryan() {
+void DreamGenContext::openRyan() {
 	STACK_CHECK;
 	al = 5;
 	ah = 1;
 	cl = 0;
 	ch = 6;
-	entercode();
+	enterCode();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openpoolboss() {
+void DreamGenContext::openPoolBoss() {
 	STACK_CHECK;
 	al = 5;
 	ah = 2;
 	cl = 2;
 	ch = 2;
-	entercode();
+	enterCode();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openeden() {
+void DreamGenContext::openEden() {
 	STACK_CHECK;
 	al = 2;
 	ah = 8;
 	cl = 6;
 	ch = 5;
-	entercode();
+	enterCode();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::opensarters() {
+void DreamGenContext::openSarters() {
 	STACK_CHECK;
 	al = 7;
 	ah = 8;
 	cl = 3;
 	ch = 3;
-	entercode();
+	enterCode();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::isitright() {
+void DreamGenContext::isItRight() {
 	STACK_CHECK;
 	bx = data;
 	es = bx;
@@ -7383,20 +7383,20 @@ void DreamGenContext::isitright() {
 	_cmp(es.byte(bx+3), ch);
 }
 
-void DreamGenContext::drawitall() {
+void DreamGenContext::drawItAll() {
 	STACK_CHECK;
-	createpanel();
-	drawfloor();
-	printsprites();
-	showicon();
+	createPanel();
+	drawFloor();
+	printSprites();
+	showIcon();
 }
 
-void DreamGenContext::openhoteldoor() {
+void DreamGenContext::openHotelDoor() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto hoteldoorwith;
-	withwhat();
+	withWhat();
 	return;
 hoteldoorwith:
 	al = data.byte(kWithobject);
@@ -7410,23 +7410,23 @@ hoteldoorwith:
 		goto keyonhotel1;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 keyonhotel1:
 	al = 16;
-	playchannel1();
-	showfirstuse();
+	playChannel1();
+	showFirstUse();
 	data.byte(kLockstatus) = 0;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::openhoteldoor2() {
+void DreamGenContext::openHotelDoor2() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto hoteldoorwith2;
-	withwhat();
+	withWhat();
 	return;
 hoteldoorwith2:
 	al = data.byte(kWithobject);
@@ -7440,22 +7440,22 @@ hoteldoorwith2:
 		goto keyonhotel2;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 keyonhotel2:
 	al = 16;
-	playchannel1();
-	showfirstuse();
-	putbackobstuff();
+	playChannel1();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::grafittidoor() {
+void DreamGenContext::grafittiDoor() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto grafwith;
-	withwhat();
+	withWhat();
 	return;
 grafwith:
 	al = data.byte(kWithobject);
@@ -7469,19 +7469,19 @@ grafwith:
 		goto dograf;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 dograf:
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::trapdoor() {
+void DreamGenContext::trapDoor() {
 	STACK_CHECK;
 	_inc(data.byte(kProgresspoints));
-	showfirstuse();
-	switchryanoff();
+	showFirstUse();
+	switchRyanOff();
 	data.word(kWatchingtime) = 20*2;
 	data.word(kReeltowatch) = 181;
 	data.word(kEndwatchreel) = 197;
@@ -7491,51 +7491,51 @@ void DreamGenContext::trapdoor() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::callhotellift() {
+void DreamGenContext::callHotelLift() {
 	STACK_CHECK;
 	al = 12;
-	playchannel1();
-	showfirstuse();
+	playChannel1();
+	showFirstUse();
 	data.byte(kCounttoopen) = 8;
 	data.byte(kGetback) = 1;
 	data.byte(kDestination) = 5;
 	data.byte(kFinaldest) = 5;
-	autosetwalk();
+	autoSetWalk();
 	al = 4;
-	turnpathon();
+	turnPathOn();
 }
 
-void DreamGenContext::calledenslift() {
+void DreamGenContext::callEdensLift() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kCounttoopen) = 8;
 	data.byte(kGetback) = 1;
 	al = 2;
-	turnpathon();
+	turnPathOn();
 }
 
-void DreamGenContext::calledensdlift() {
+void DreamGenContext::callEdensDLift() {
 	STACK_CHECK;
 	_cmp(data.byte(kLiftflag), 1);
 	if (flags.z())
 		goto edensdhere;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kCounttoopen) = 8;
 	data.byte(kGetback) = 1;
 	al = 2;
-	turnpathon();
+	turnPathOn();
 	return;
 edensdhere:
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::usepoolreader() {
+void DreamGenContext::usePoolReader() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto poolwith;
-	withwhat();
+	withWhat();
 	return;
 poolwith:
 	al = data.byte(kWithobject);
@@ -7549,30 +7549,30 @@ poolwith:
 		goto openpool;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 openpool:
 	_cmp(data.byte(kTalkedtoattendant), 1);
 	if (flags.z())
 		goto canopenpool;
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 	return;
 canopenpool:
 	al = 17;
-	playchannel1();
-	showfirstuse();
+	playChannel1();
+	showFirstUse();
 	data.byte(kCounttoopen) = 6;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::uselighter() {
+void DreamGenContext::useLighter() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto gotlighterwith;
-	withwhat();
+	withWhat();
 	return;
 gotlighterwith:
 	al = data.byte(kWithobject);
@@ -7584,25 +7584,25 @@ gotlighterwith:
 	compare();
 	if (flags.z())
 		goto cigarette;
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 	return;
 cigarette:
 	cx = 300;
 	al = 9;
-	showpuztext();
+	showPuzText();
 	al = data.byte(kWithobject);
-	getexad();
+	getExAd();
 	es.byte(bx+2) = 255;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usecardreader1() {
+void DreamGenContext::useCardReader1() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto gotreader1with;
-	withwhat();
+	withWhat();
 	return;
 gotreader1with:
 	al = data.byte(kWithobject);
@@ -7616,8 +7616,8 @@ gotreader1with:
 		goto correctcard;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 correctcard:
 	_cmp(data.byte(kTalkedtosparky), 0);
@@ -7628,30 +7628,30 @@ correctcard:
 		goto getscash;
 	cx = 300;
 	al = 17;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 getscash:
 	al = 16;
-	playchannel1();
+	playChannel1();
 	cx = 300;
 	al = 18;
-	showpuztext();
+	showPuzText();
 	_inc(data.byte(kProgresspoints));
 	data.word(kCard1money) = 12432;
 	data.byte(kGetback) = 1;
 	return;
 notyet:
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::usecardreader2() {
+void DreamGenContext::useCardReader2() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto gotreader2with;
-	withwhat();
+	withWhat();
 	return;
 gotreader2with:
 	al = data.byte(kWithobject);
@@ -7665,8 +7665,8 @@ gotreader2with:
 		goto correctcard2;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 correctcard2:
 	_cmp(data.byte(kTalkedtoboss), 0);
@@ -7679,12 +7679,12 @@ correctcard2:
 	if (flags.z())
 		goto alreadygotnew;
 	al = 18;
-	playchannel1();
+	playChannel1();
 	cx = 300;
 	al = 19;
-	showpuztext();
+	showPuzText();
 	al = 94;
-	placesetobject();
+	placeSetObject();
 	data.byte(kGunpassflag) = 1;
 	_sub(data.word(kCard1money), 2000);
 	_inc(data.byte(kProgresspoints));
@@ -7693,26 +7693,26 @@ correctcard2:
 nocash:
 	cx = 300;
 	al = 20;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 alreadygotnew:
 	cx = 300;
 	al = 22;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 notyetboss:
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::usecardreader3() {
+void DreamGenContext::useCardReader3() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto gotreader3with;
-	withwhat();
+	withWhat();
 	return;
 gotreader3with:
 	al = data.byte(kWithobject);
@@ -7726,8 +7726,8 @@ gotreader3with:
 		goto rightcard;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 rightcard:
 	_cmp(data.byte(kTalkedtorecep), 0);
@@ -7737,10 +7737,10 @@ rightcard:
 	if (!flags.z())
 		goto alreadyusedit;
 	al = 16;
-	playchannel1();
+	playChannel1();
 	cx = 300;
 	al = 25;
-	showpuztext();
+	showPuzText();
 	_inc(data.byte(kProgresspoints));
 	_sub(data.word(kCard1money), 8300);
 	data.byte(kCardpassflag) = 1;
@@ -7749,22 +7749,22 @@ rightcard:
 alreadyusedit:
 	cx = 300;
 	al = 26;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 notyetrecep:
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::usecashcard() {
+void DreamGenContext::useCashCard() {
 	STACK_CHECK;
-	getridofreels();
-	loadkeypad();
-	createpanel();
-	showpanel();
-	showexit();
-	showman();
+	getRidOfReels();
+	loadKeypad();
+	createPanel();
+	showPanel();
+	showExit();
+	showMan();
 	di = 114;
 	bx = 120;
 	_cmp(data.byte(kForeignrelease),  0);
@@ -7775,18 +7775,18 @@ _tmp1:
 	ds = data.word(kTempgraphics);
 	al = 39;
 	ah = 0;
-	showframe();
+	showFrame();
 	ax = data.word(kCard1money);
-	moneypoke();
-	getobtextstart();
-	nextcolon();
-	nextcolon();
+	moneyPoke();
+	getObTextStart();
+	nextColon();
+	nextColon();
 	di = 36;
 	bx = 98;
 	dl = 241;
 	al = 0;
 	ah = 0;
-	printdirect();
+	printDirect();
 	di = 160;
 	bx = 155;
 	es = cs;
@@ -7795,7 +7795,7 @@ _tmp1:
 	al = 0;
 	ah = 0;
 	dl = 240;
-	printdirect();
+	printDirect();
 	di = 187;
 	bx = 155;
 	es = cs;
@@ -7804,50 +7804,50 @@ _tmp1:
 	al = 0;
 	ah = 0;
 	dl = 240;
-	printdirect();
+	printDirect();
 	data.word(kCharshift) = 0;
-	worktoscreenm();
+	workToScreenM();
 	cx = 400;
-	hangonp();
-	getridoftemp();
-	restorereels();
-	putbackobstuff();
+	hangOnP();
+	getRidOfTemp();
+	restoreReels();
+	putBackObStuff();
 }
 
-void DreamGenContext::lookatcard() {
+void DreamGenContext::lookAtCard() {
 	STACK_CHECK;
 	data.byte(kManisoffscreen) = 1;
-	getridofreels();
-	loadkeypad();
-	createpanel2();
+	getRidOfReels();
+	loadKeypad();
+	createPanel2();
 	di = 160;
 	bx = 80;
 	ds = data.word(kTempgraphics);
 	al = 42;
 	ah = 128;
-	showframe();
-	getobtextstart();
-	findnextcolon();
-	findnextcolon();
-	findnextcolon();
+	showFrame();
+	getObTextStart();
+	findNextColon();
+	findNextColon();
+	findNextColon();
 	di = 36;
 	bx = 124;
 	dl = 241;
 	al = 0;
 	ah = 0;
-	printdirect();
+	printDirect();
 	push(es);
 	push(si);
-	worktoscreenm();
+	workToScreenM();
 	cx = 280;
-	hangonw();
-	createpanel2();
+	hangOnW();
+	createPanel2();
 	di = 160;
 	bx = 80;
 	ds = data.word(kTempgraphics);
 	al = 42;
 	ah = 128;
-	showframe();
+	showFrame();
 	si = pop();
 	es = pop();
 	di = 36;
@@ -7855,17 +7855,17 @@ void DreamGenContext::lookatcard() {
 	dl = 241;
 	al = 0;
 	ah = 0;
-	printdirect();
-	worktoscreenm();
+	printDirect();
+	workToScreenM();
 	cx = 200;
-	hangonw();
+	hangOnW();
 	data.byte(kManisoffscreen) = 0;
-	getridoftemp();
-	restorereels();
-	putbackobstuff();
+	getRidOfTemp();
+	restoreReels();
+	putBackObStuff();
 }
 
-void DreamGenContext::moneypoke() {
+void DreamGenContext::moneyPoke() {
 	STACK_CHECK;
 	bx = offset_money1poke;
 	cl = 48-1;
@@ -7908,12 +7908,12 @@ numberpoke3:
 	cs.byte(bx) = al;
 }
 
-void DreamGenContext::usecontrol() {
+void DreamGenContext::useControl() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto gotcontrolwith;
-	withwhat();
+	withWhat();
 	return;
 gotcontrolwith:
 	al = data.byte(kWithobject);
@@ -7947,18 +7947,18 @@ gotcontrolwith:
 	if (flags.z())
 		goto axeoncontrols;
 balls:
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 	return;
 rightkey:
 	al = 16;
-	playchannel1();
+	playChannel1();
 	_cmp(data.byte(kLocation), 21);
 	if (flags.z())
 		goto goingdown;
 	cx = 300;
 	al = 0;
-	showpuztext();
+	showPuzText();
 	data.byte(kNewlocation) = 21;
 	data.byte(kCounttoclose) = 8;
 	data.byte(kCounttoopen) = 0;
@@ -7968,7 +7968,7 @@ rightkey:
 goingdown:
 	cx = 300;
 	al = 3;
-	showpuztext();
+	showPuzText();
 	data.byte(kNewlocation) = 30;
 	data.byte(kCounttoclose) = 8;
 	data.byte(kCounttoopen) = 0;
@@ -7977,46 +7977,46 @@ goingdown:
 	return;
 jimmycontrols:
 	al = 50;
-	placesetobject();
+	placeSetObject();
 	al = 51;
-	placesetobject();
+	placeSetObject();
 	al = 26;
-	placesetobject();
+	placeSetObject();
 	al = 30;
-	placesetobject();
+	placeSetObject();
 	al = 16;
-	removesetobject();
+	removeSetObject();
 	al = 17;
-	removesetobject();
+	removeSetObject();
 	al = 14;
-	playchannel1();
+	playChannel1();
 	cx = 300;
 	al = 10;
-	showpuztext();
+	showPuzText();
 	_inc(data.byte(kProgresspoints));
 	data.byte(kGetback) = 1;
 	return;
 axeoncontrols:
 	cx = 300;
 	al = 16;
-	showpuztext();
+	showPuzText();
 	_inc(data.byte(kProgresspoints));
-	putbackobstuff();
+	putBackObStuff();
 }
 
-void DreamGenContext::usehatch() {
+void DreamGenContext::useHatch() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kNewlocation) = 40;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usewire() {
+void DreamGenContext::useWire() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto gotwirewith;
-	withwhat();
+	withWhat();
 	return;
 gotwirewith:
 	al = data.byte(kWithobject);
@@ -8039,61 +8039,61 @@ gotwirewith:
 		goto wireaxe;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 wireaxe:
 	cx = 300;
 	al = 16;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 wireknife:
 	al = 51;
-	removesetobject();
+	removeSetObject();
 	al = 52;
-	placesetobject();
+	placeSetObject();
 	cx = 300;
 	al = 11;
-	showpuztext();
+	showPuzText();
 	_inc(data.byte(kProgresspoints));
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usehandle() {
+void DreamGenContext::useHandle() {
 	STACK_CHECK;
 	al = 'C';
 	ah = 'U';
 	cl = 'T';
 	ch = 'W';
-	findsetobject();
+	findSetObject();
 	al = es.byte(bx+58);
 	_cmp(al, 255);
 	if (!flags.z())
 		goto havecutwire;
 	cx = 300;
 	al = 12;
-	showpuztext();
+	showPuzText();
 	data.byte(kGetback) = 1;
 	return;
 havecutwire:
 	cx = 300;
 	al = 13;
-	showpuztext();
+	showPuzText();
 	data.byte(kNewlocation) = 22;
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useelevator1() {
+void DreamGenContext::useElevator1() {
 	STACK_CHECK;
-	showfirstuse();
-	selectlocation();
+	showFirstUse();
+	selectLocation();
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useelevator3() {
+void DreamGenContext::useElevator3() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kCounttoclose) = 20;
 	data.byte(kNewlocation) = 34;
 	data.word(kReeltowatch) = 46;
@@ -8104,9 +8104,9 @@ void DreamGenContext::useelevator3() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useelevator4() {
+void DreamGenContext::useElevator4() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.word(kReeltowatch) = 0;
 	data.word(kEndwatchreel) = 11;
 	data.byte(kWatchspeed) = 1;
@@ -8117,12 +8117,12 @@ void DreamGenContext::useelevator4() {
 	data.byte(kNewlocation) = 24;
 }
 
-void DreamGenContext::useelevator2() {
+void DreamGenContext::useElevator2() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 23);
 	if (flags.z())
 		goto inpoolhall;
-	showfirstuse();
+	showFirstUse();
 	data.byte(kNewlocation) = 23;
 	data.byte(kCounttoclose) = 20;
 	data.byte(kCounttoopen) = 0;
@@ -8130,7 +8130,7 @@ void DreamGenContext::useelevator2() {
 	data.byte(kGetback) = 1;
 	return;
 inpoolhall:
-	showfirstuse();
+	showFirstUse();
 	data.byte(kNewlocation) = 31;
 	data.byte(kCounttoclose) = 20;
 	data.byte(kCounttoopen) = 0;
@@ -8138,12 +8138,12 @@ inpoolhall:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useelevator5() {
+void DreamGenContext::useElevator5() {
 	STACK_CHECK;
 	al = 4;
-	placesetobject();
+	placeSetObject();
 	al = 0;
-	removesetobject();
+	removeSetObject();
 	data.byte(kNewlocation) = 20;
 	data.word(kWatchingtime) = 80;
 	data.byte(kLiftflag) = 1;
@@ -8151,7 +8151,7 @@ void DreamGenContext::useelevator5() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usekey() {
+void DreamGenContext::useKey() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 5);
 	if (flags.z())
@@ -8164,8 +8164,8 @@ void DreamGenContext::usekey() {
 		goto usekey2;
 	cx = 200;
 	al = 1;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 usekey1:
 	_cmp(data.byte(kMapx), 22);
@@ -8176,7 +8176,7 @@ usekey1:
 		goto wrongroom1;
 	cx = 300;
 	al = 0;
-	showpuztext();
+	showPuzText();
 	data.byte(kCounttoclose) = 100;
 	data.byte(kGetback) = 1;
 	return;
@@ -8189,29 +8189,29 @@ usekey2:
 		goto wrongroom1;
 	cx = 300;
 	al = 3;
-	showpuztext();
+	showPuzText();
 	data.byte(kNewlocation) = 30;
 	al = 2;
-	fadescreendown();
-	showfirstuse();
-	putbackobstuff();
+	fadeScreenDown();
+	showFirstUse();
+	putBackObStuff();
 	return;
 wrongroom1:
 	cx = 200;
 	al = 2;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 }
 
-void DreamGenContext::usestereo() {
+void DreamGenContext::useStereo() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 0);
 	if (flags.z())
 		goto stereook;
 	cx = 400;
 	al = 4;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 stereook:
 	_cmp(data.byte(kMapx), 11);
@@ -8223,30 +8223,30 @@ stereook:
 stereonotok:
 	cx = 400;
 	al = 5;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 stereook2:
 	al = 'C';
 	ah = 'D';
 	cl = 'P';
 	ch = 'L';
-	findsetobject();
+	findSetObject();
 	ah = 1;
-	checkinside();
+	checkInside();
 	_cmp(cl, (114));
 	if (!flags.z())
 		goto cdinside;
 	al = 6;
 	cx = 400;
-	showpuztext();
-	putbackobstuff();
-	getanyad();
+	showPuzText();
+	putBackObStuff();
+	getAnyAd();
 	al = 255;
 	es.byte(bx+10) = al;
 	return;
 cdinside:
-	getanyad();
+	getAnyAd();
 	al = es.byte(bx+10);
 	_xor(al, 1);
 	es.byte(bx+10) = al;
@@ -8255,33 +8255,33 @@ cdinside:
 		goto stereoon;
 	al = 7;
 	cx = 400;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 stereoon:
 	al = 8;
 	cx = 400;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 }
 
-void DreamGenContext::usecooker() {
+void DreamGenContext::useCooker() {
 	STACK_CHECK;
 	al = data.byte(kCommand);
 	ah = data.byte(kObjecttype);
-	checkinside();
+	checkInside();
 	_cmp(cl, (114));
 	if (!flags.z())
 		goto foodinside;
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 	return;
 foodinside:
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::useaxe() {
+void DreamGenContext::useAxe() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 22);
 	if (!flags.z())
@@ -8289,20 +8289,20 @@ void DreamGenContext::useaxe() {
 	_cmp(data.byte(kMapy), 10);
 	if (flags.z())
 		goto axeondoor;
-	showseconduse();
+	showSecondUse();
 	_inc(data.byte(kProgresspoints));
 	data.byte(kLastweapon) = 2;
 	data.byte(kGetback) = 1;
-	removeobfrominv();
+	removeObFromInv();
 	return;
 notinpool:
-	showfirstuse();
+	showFirstUse();
 	return;
 /*continuing to unbounded code: axeondoor from useelvdoor:19-30*/
 axeondoor:
 	al = 15;
 	cx = 300;
-	showpuztext();
+	showPuzText();
 	_inc(data.byte(kProgresspoints));
 	data.word(kWatchingtime) = 46*2;
 	data.word(kReeltowatch) = 31;
@@ -8312,12 +8312,12 @@ axeondoor:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::useelvdoor() {
+void DreamGenContext::useElvDoor() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto gotdoorwith;
-	withwhat();
+	withWhat();
 	return;
 gotdoorwith:
 	al = data.byte(kWithobject);
@@ -8331,13 +8331,13 @@ gotdoorwith:
 		goto axeondoor;
 	al = 14;
 	cx = 300;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 axeondoor:
 	al = 15;
 	cx = 300;
-	showpuztext();
+	showPuzText();
 	_inc(data.byte(kProgresspoints));
 	data.word(kWatchingtime) = 46*2;
 	data.word(kReeltowatch) = 31;
@@ -8347,17 +8347,17 @@ axeondoor:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::withwhat() {
+void DreamGenContext::withWhat() {
 	STACK_CHECK;
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
 	al = data.byte(kCommand);
 	ah = data.byte(kObjecttype);
 	es = cs;
 	di = offset_commandline;
-	copyname();
+	copyName();
 	di = 100;
 	bx = 21;
 	dl = 200;
@@ -8372,7 +8372,7 @@ void DreamGenContext::withwhat() {
 	dl = 220;
 	al = 0;
 	ah = 0;
-	printdirect();
+	printDirect();
 	di = data.word(kLastxpos);
 	_add(di, 5);
 	bx = 21;
@@ -8380,18 +8380,18 @@ void DreamGenContext::withwhat() {
 	al = 63;
 	ah = 3;
 	printmessage2();
-	fillryan();
+	fillRyan();
 	data.byte(kCommandtype) = 255;
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 	data.byte(kInvopen) = 2;
 }
 
-void DreamGenContext::selectob() {
+void DreamGenContext::selectOb() {
 	STACK_CHECK;
-	findinvpos();
+	findInvPos();
 	ax = es.word(bx);
 	_cmp(al, 255);
 	if (!flags.z())
@@ -8412,7 +8412,7 @@ diffsub3:
 	data.word(kOldsubject) = ax;
 	bx = ax;
 	al = 0;
-	commandwithob();
+	commandWithOb();
 alreadyselob:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -8423,12 +8423,12 @@ alreadyselob:
 		goto doselob;
 	return;
 doselob:
-	delpointer();
+	delPointer();
 	data.byte(kInvopen) = 0;
-	useroutine();
+	useRoutine();
 }
 
-void DreamGenContext::findsetobject() {
+void DreamGenContext::findSetObject() {
 	STACK_CHECK;
 	_sub(al, 'A');
 	_sub(ah, 'A');
@@ -8461,7 +8461,7 @@ nofind:
 	al = dl;
 }
 
-void DreamGenContext::findexobject() {
+void DreamGenContext::findExObject() {
 	STACK_CHECK;
 	_sub(al, 'A');
 	_sub(ah, 'A');
@@ -8494,7 +8494,7 @@ nofindex:
 	al = dl;
 }
 
-void DreamGenContext::isryanholding() {
+void DreamGenContext::isRyanHolding() {
 	STACK_CHECK;
 	_sub(al, 'A');
 	_sub(ah, 'A');
@@ -8532,7 +8532,7 @@ nofindininv:
 	_cmp(al, (114));
 }
 
-void DreamGenContext::checkinside() {
+void DreamGenContext::checkInside() {
 	STACK_CHECK;
 	es = data.word(kExtras);
 	bx = (0+2080+30000);
@@ -8553,47 +8553,47 @@ notfoundinside:
 		goto insideloop;
 }
 
-void DreamGenContext::putbackobstuff() {
+void DreamGenContext::putBackObStuff() {
 	STACK_CHECK;
-	createpanel();
-	showpanel();
-	showman();
-	obicons();
-	showexit();
-	obpicture();
-	describeob();
-	undertextline();
+	createPanel();
+	showPanel();
+	showMan();
+	obIcons();
+	showExit();
+	obPicture();
+	describeOb();
+	underTextLine();
 	data.byte(kCommandtype) = 255;
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::showpuztext() {
+void DreamGenContext::showPuzText() {
 	STACK_CHECK;
 	push(cx);
-	findpuztext();
+	findPuzText();
 	push(es);
 	push(si);
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	obicons();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	obIcons();
 	si = pop();
 	es = pop();
 	di = 36;
 	bx = 104;
 	dl = 241;
 	ah = 0;
-	printdirect();
-	worktoscreenm();
+	printDirect();
+	workToScreenM();
 	cx = pop();
-	hangonp();
+	hangOnP();
 }
 
-void DreamGenContext::findpuztext() {
+void DreamGenContext::findPuzText() {
 	STACK_CHECK;
 	ah = 0;
 	si = ax;
@@ -8604,49 +8604,49 @@ void DreamGenContext::findpuztext() {
 	si = ax;
 }
 
-void DreamGenContext::issetobonmap() {
+void DreamGenContext::isSetObOnMap() {
 	STACK_CHECK;
 	push(es);
 	push(bx);
-	getsetad();
+	getSetAd();
 	al = es.byte(bx+58);
 	bx = pop();
 	es = pop();
 	_cmp(al, 0);
 }
 
-void DreamGenContext::placefreeobject() {
+void DreamGenContext::placeFreeObject() {
 	STACK_CHECK;
 	push(es);
 	push(bx);
 	cl = 0;
 	ch = 1;
-	findormake();
-	getfreead();
+	findOrMake();
+	getFreeAd();
 	es.byte(bx+2) = 0;
 	bx = pop();
 	es = pop();
 }
 
-void DreamGenContext::removefreeobject() {
+void DreamGenContext::removeFreeObject() {
 	STACK_CHECK;
 	push(es);
 	push(bx);
-	getfreead();
+	getFreeAd();
 	es.byte(bx+2) = 255;
 	bx = pop();
 	es = pop();
 }
 
-void DreamGenContext::autoappear() {
+void DreamGenContext::autoAppear() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 32);
 	if (!flags.z())
 		goto notinalley;
 	al = 5;
-	resetlocation();
+	resetLocation();
 	al = 10;
-	setlocation();
+	setLocation();
 	data.byte(kDestpos) = 10;
 	return;
 notinalley:
@@ -8658,32 +8658,32 @@ notinalley:
 		goto edenspart2;
 	_inc(data.byte(kGeneraldead));
 	al = 44;
-	placesetobject();
+	placeSetObject();
 	al = 18;
-	placesetobject();
+	placeSetObject();
 	al = 93;
-	placesetobject();
+	placeSetObject();
 	al = 92;
-	removesetobject();
+	removeSetObject();
 	al = 55;
-	removesetobject();
+	removeSetObject();
 	al = 75;
-	removesetobject();
+	removeSetObject();
 	al = 84;
-	removesetobject();
+	removeSetObject();
 	al = 85;
-	removesetobject();
+	removeSetObject();
 	return;
 edenspart2:
 	_cmp(data.byte(kSartaindead), 1);
 	if (!flags.z())
 		return /* (notedens2) */;
 	al = 44;
-	removesetobject();
+	removeSetObject();
 	al = 93;
-	removesetobject();
+	removeSetObject();
 	al = 55;
-	placesetobject();
+	placeSetObject();
 	_inc(data.byte(kSartaindead));
 	return;
 notinedens:
@@ -8692,9 +8692,9 @@ notinedens:
 		goto notonsartroof;
 	data.byte(kNewsitem) = 3;
 	al = 6;
-	resetlocation();
+	resetLocation();
 	al = 11;
-	setlocation();
+	setLocation();
 	data.byte(kDestpos) = 11;
 	return;
 notonsartroof:
@@ -8705,10 +8705,10 @@ notonsartroof:
 	if (flags.z())
 		return /* (notinlouiss) */;
 	al = 23;
-	placesetobject();
+	placeSetObject();
 }
 
-void DreamGenContext::setuptimeduse() {
+void DreamGenContext::setupTimedUse() {
 	STACK_CHECK;
 	_cmp(data.word(kTimecount), 0);
 	if (!flags.z())
@@ -8730,9 +8730,9 @@ void DreamGenContext::setuptimeduse() {
 	data.word(kTimedoffset) = bx;
 }
 
-void DreamGenContext::edenscdplayer() {
+void DreamGenContext::edensCDPlayer() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	data.word(kWatchingtime) = 18*2;
 	data.word(kReeltowatch) = 25;
 	data.word(kEndwatchreel) = 42;
@@ -8741,9 +8741,9 @@ void DreamGenContext::edenscdplayer() {
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::usewall() {
+void DreamGenContext::useWall() {
 	STACK_CHECK;
-	showfirstuse();
+	showFirstUse();
 	_cmp(data.byte(kManspath), 3);
 	if (flags.z())
 		goto gobackover;
@@ -8754,22 +8754,22 @@ void DreamGenContext::usewall() {
 	data.byte(kSpeedcount) = 1;
 	data.byte(kGetback) = 1;
 	al = 3;
-	turnpathon();
+	turnPathOn();
 	al = 4;
-	turnpathon();
+	turnPathOn();
 	al = 0;
-	turnpathoff();
+	turnPathOff();
 	al = 1;
-	turnpathoff();
+	turnPathOff();
 	al = 2;
-	turnpathoff();
+	turnPathOff();
 	al = 5;
-	turnpathoff();
+	turnPathOff();
 	data.byte(kManspath) = 3;
 	data.byte(kFinaldest) = 3;
-	findxyfrompath();
+	findXYFromPath();
 	data.byte(kResetmanxy) = 1;
-	switchryanoff();
+	switchRyanOff();
 	return;
 gobackover:
 	data.word(kWatchingtime) = 30*2;
@@ -8779,30 +8779,30 @@ gobackover:
 	data.byte(kSpeedcount) = 1;
 	data.byte(kGetback) = 1;
 	al = 3;
-	turnpathoff();
+	turnPathOff();
 	al = 4;
-	turnpathoff();
+	turnPathOff();
 	al = 0;
-	turnpathon();
+	turnPathOn();
 	al = 1;
-	turnpathon();
+	turnPathOn();
 	al = 2;
-	turnpathon();
+	turnPathOn();
 	al = 5;
-	turnpathon();
+	turnPathOn();
 	data.byte(kManspath) = 5;
 	data.byte(kFinaldest) = 5;
-	findxyfrompath();
+	findXYFromPath();
 	data.byte(kResetmanxy) = 1;
-	switchryanoff();
+	switchRyanOff();
 }
 
-void DreamGenContext::usechurchgate() {
+void DreamGenContext::useChurchGate() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto gatewith;
-	withwhat();
+	withWhat();
 	return;
 gatewith:
 	al = data.byte(kWithobject);
@@ -8816,11 +8816,11 @@ gatewith:
 		goto cutgate;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 cutgate:
-	showfirstuse();
+	showFirstUse();
 	data.word(kWatchingtime) = 64*2;
 	data.word(kReeltowatch) = 4;
 	data.word(kEndwatchreel) = 70;
@@ -8829,21 +8829,21 @@ cutgate:
 	data.byte(kGetback) = 1;
 	_inc(data.byte(kProgresspoints));
 	al = 3;
-	turnpathon();
+	turnPathOn();
 	_cmp(data.byte(kAidedead), 0);
 	if (flags.z())
 		return /* (notopenchurch) */;
 	al = 2;
-	turnpathon();
+	turnPathOn();
 }
 
-void DreamGenContext::usegun() {
+void DreamGenContext::useGun() {
 	STACK_CHECK;
 	_cmp(data.byte(kObjecttype), 4);
 	if (flags.z())
 		goto istakengun;
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 	return;
 istakengun:
 	_cmp(data.byte(kReallocation), 22);
@@ -8851,7 +8851,7 @@ istakengun:
 		goto notinpoolroom;
 	cx = 300;
 	al = 34;
-	showpuztext();
+	showPuzText();
 	data.byte(kLastweapon) = 1;
 	data.byte(kCombatcount) = 39;
 	data.byte(kGetback) = 1;
@@ -8863,7 +8863,7 @@ notinpoolroom:
 		goto nothelicopter;
 	cx = 300;
 	al = 34;
-	showpuztext();
+	showPuzText();
 	data.byte(kLastweapon) = 1;
 	data.byte(kCombatcount) = 19;
 	data.byte(kGetback) = 1;
@@ -8878,7 +8878,7 @@ nothelicopter:
 		goto notinrockroom;
 	cx = 300;
 	al = 46;
-	showpuztext();
+	showPuzText();
 	data.byte(kPointermode) = 2;
 	data.byte(kRockstardead) = 1;
 	data.byte(kLastweapon) = 1;
@@ -8899,7 +8899,7 @@ notinrockroom:
 	if (!flags.z())
 		goto notbystudio;
 	al = 92;
-	issetobonmap();
+	isSetObOnMap();
 	if (flags.z())
 		goto notbystudio;
 	_cmp(data.byte(kManspath), 9);
@@ -8907,7 +8907,7 @@ notinrockroom:
 		goto notbystudio;
 	data.byte(kDestination) = 9;
 	data.byte(kFinaldest) = 9;
-	autosetwalk();
+	autoSetWalk();
 	data.byte(kLastweapon) = 1;
 	data.byte(kGetback) = 1;
 	_inc(data.byte(kProgresspoints));
@@ -8923,20 +8923,20 @@ notbystudio:
 	if (!flags.z())
 		goto notsarters;
 	al = 5;
-	issetobonmap();
+	isSetObOnMap();
 	if (!flags.z())
 		goto notsarters;
 	data.byte(kDestination) = 1;
 	data.byte(kFinaldest) = 1;
-	autosetwalk();
+	autoSetWalk();
 	al = 5;
-	removesetobject();
+	removeSetObject();
 	al = 6;
-	placesetobject();
+	placeSetObject();
 	al = 1;
 	ah = data.byte(kRoomnum);
 	_dec(ah);
-	turnanypathon();
+	turnAnyPathOn();
 	data.byte(kLiftflag) = 1;
 	data.word(kWatchingtime) = 40*2;
 	data.word(kReeltowatch) = 4;
@@ -8952,13 +8952,13 @@ notsarters:
 		goto notaide;
 	data.byte(kGetback) = 1;
 	al = 13;
-	resetlocation();
+	resetLocation();
 	al = 12;
-	setlocation();
+	setLocation();
 	data.byte(kDestpos) = 12;
 	data.byte(kDestination) = 2;
 	data.byte(kFinaldest) = 2;
-	autosetwalk();
+	autoSetWalk();
 	data.word(kWatchingtime) = 164*2;
 	data.word(kReeltowatch) = 3;
 	data.word(kEndwatchreel) = 164;
@@ -8984,7 +8984,7 @@ notaide:
 		goto pathokboss;
 	data.byte(kDestination) = 5;
 	data.byte(kFinaldest) = 5;
-	autosetwalk();
+	autoSetWalk();
 pathokboss:
 	data.byte(kLastweapon) = 1;
 	data.byte(kGetback) = 1;
@@ -9004,17 +9004,17 @@ notwithboss:
 		goto pathoktv;
 	data.byte(kDestination) = 2;
 	data.byte(kFinaldest) = 2;
-	autosetwalk();
+	autoSetWalk();
 pathoktv:
 	data.byte(kLastweapon) = 1;
 	data.byte(kGetback) = 1;
 	return;
 nottvsoldier:
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::useshield() {
+void DreamGenContext::useShield() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 20);
 	if (!flags.z())
@@ -9023,31 +9023,31 @@ void DreamGenContext::useshield() {
 	if (flags.z())
 		goto notinsartroom;
 	data.byte(kLastweapon) = 3;
-	showseconduse();
+	showSecondUse();
 	data.byte(kGetback) = 1;
 	_inc(data.byte(kProgresspoints));
-	removeobfrominv();
+	removeObFromInv();
 	return;
 notinsartroom:
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::usebuttona() {
+void DreamGenContext::useButtonA() {
 	STACK_CHECK;
 	al = 95;
-	issetobonmap();
+	isSetObOnMap();
 	if (flags.z())
 		goto donethisbit;
-	showfirstuse();
+	showFirstUse();
 	al = 0;
 	ah = data.byte(kRoomnum);
 	_dec(ah);
-	turnanypathon();
+	turnAnyPathOn();
 	al = 9;
-	removesetobject();
+	removeSetObject();
 	al = 95;
-	placesetobject();
+	placeSetObject();
 	data.word(kWatchingtime) = 15*2;
 	data.word(kReeltowatch) = 71;
 	data.word(kEndwatchreel) = 85;
@@ -9057,16 +9057,16 @@ void DreamGenContext::usebuttona() {
 	_inc(data.byte(kProgresspoints));
 	return;
 donethisbit:
-	showseconduse();
-	putbackobstuff();
+	showSecondUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::useplate() {
+void DreamGenContext::usePlate() {
 	STACK_CHECK;
 	_cmp(data.byte(kWithobject), 255);
 	if (!flags.z())
 		goto platewith;
-	withwhat();
+	withWhat();
 	return;
 platewith:
 	al = data.byte(kWithobject);
@@ -9089,36 +9089,36 @@ platewith:
 		goto triedknife;
 	cx = 300;
 	al = 14;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 	return;
 unscrewplate:
 	al = 20;
-	playchannel1();
-	showfirstuse();
+	playChannel1();
+	showFirstUse();
 	al = 28;
-	placesetobject();
+	placeSetObject();
 	al = 24;
-	placesetobject();
+	placeSetObject();
 	al = 25;
-	removesetobject();
+	removeSetObject();
 	al = 0;
-	placefreeobject();
+	placeFreeObject();
 	_inc(data.byte(kProgresspoints));
 	data.byte(kGetback) = 1;
 	return;
 triedknife:
 	cx = 300;
 	al = 54;
-	showpuztext();
-	putbackobstuff();
+	showPuzText();
+	putBackObStuff();
 }
 
-void DreamGenContext::usewinch() {
+void DreamGenContext::useWinch() {
 	STACK_CHECK;
 	al = 40;
 	ah = 1;
-	checkinside();
+	checkInside();
 	_cmp(cl, (114));
 	if (flags.z())
 		goto nowinch;
@@ -9146,35 +9146,35 @@ void DreamGenContext::usewinch() {
 	_inc(data.byte(kProgresspoints));
 	return;
 nowinch:
-	showfirstuse();
-	putbackobstuff();
+	showFirstUse();
+	putBackObStuff();
 }
 
-void DreamGenContext::entercode() {
+void DreamGenContext::enterCode() {
 	STACK_CHECK;
 	data.word(kKeypadax) = ax;
 	data.word(kKeypadcx) = cx;
-	getridofreels();
-	loadkeypad();
-	createpanel();
-	showicon();
-	showouterpad();
-	showkeypad();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	getRidOfReels();
+	loadKeypad();
+	createPanel();
+	showIcon();
+	showOuterPad();
+	showKeypad();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 	data.word(kPresspointer) = 0;
 	data.byte(kGetback) = 0;
 keypadloop:
 	_cmp(data.byte(kQuitrequested),  0);
 	if (!flags.z())
 		goto numberright;
-	delpointer();
-	readmouse();
-	showkeypad();
-	showpointer();
-	vsync();
+	delPointer();
+	readMouse();
+	showKeypad();
+	showPointer();
+	vSync();
 	_cmp(data.byte(kPresscount), 0);
 	if (flags.z())
 		goto nopresses;
@@ -9183,13 +9183,13 @@ keypadloop:
 nopresses:
 	data.byte(kPressed) = 255;
 	data.byte(kGraphicpress) = 255;
-	vsync();
+	vSync();
 afterpress:
-	dumppointer();
-	dumpkeypad();
-	dumptextline();
+	dumpPointer();
+	dumpKeypad();
+	dumpTextLine();
 	bx = offset_keypadlist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kGetback), 1);
 	if (flags.z())
 		goto numberright;
@@ -9204,49 +9204,49 @@ notendkey:
 	_cmp(data.byte(kPresscount), 40);
 	if (!flags.z())
 		goto keypadloop;
-	addtopresslist();
+	addToPressList();
 	_cmp(data.byte(kPressed), 11);
 	if (!flags.z())
 		goto keypadloop;
 	ax = data.word(kKeypadax);
 	cx = data.word(kKeypadcx);
-	isitright();
+	isItRight();
 	if (!flags.z())
 		goto incorrect;
 	data.byte(kLockstatus) = 0;
 	al = 11;
-	playchannel1();
+	playChannel1();
 	data.byte(kLightcount) = 120;
 	data.word(kPresspointer) = 0;
 	goto keypadloop;
 incorrect:
 	al = 11;
-	playchannel1();
+	playChannel1();
 	data.byte(kLightcount) = 120;
 	data.word(kPresspointer) = 0;
 	goto keypadloop;
 numberright:
 	data.byte(kManisoffscreen) = 0;
-	getridoftemp();
-	restorereels();
-	redrawmainscrn();
-	worktoscreenm();
+	getRidOfTemp();
+	restoreReels();
+	redrawMainScrn();
+	workToScreenM();
 }
 
-void DreamGenContext::loadkeypad() {
+void DreamGenContext::loadKeypad() {
 	STACK_CHECK;
 	dx = 1948;
-	loadintotemp();
+	loadIntoTemp();
 }
 
-void DreamGenContext::quitkey() {
+void DreamGenContext::quitKey() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 222);
 	if (flags.z())
 		goto alreadyqk;
 	data.byte(kCommandtype) = 222;
 	al = 4;
-	commandonly();
+	commandOnly();
 alreadyqk:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -9260,7 +9260,7 @@ doqk:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::addtopresslist() {
+void DreamGenContext::addToPressList() {
 	STACK_CHECK;
 	_cmp(data.word(kPresspointer), 5);
 	if (flags.z())
@@ -9279,73 +9279,73 @@ not10:
 	_inc(data.word(kPresspointer));
 }
 
-void DreamGenContext::buttonone() {
+void DreamGenContext::buttonOne() {
 	STACK_CHECK;
 	cl = 1;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttontwo() {
+void DreamGenContext::buttonTwo() {
 	STACK_CHECK;
 	cl = 2;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonthree() {
+void DreamGenContext::buttonThree() {
 	STACK_CHECK;
 	cl = 3;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonfour() {
+void DreamGenContext::buttonFour() {
 	STACK_CHECK;
 	cl = 4;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonfive() {
+void DreamGenContext::buttonFive() {
 	STACK_CHECK;
 	cl = 5;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonsix() {
+void DreamGenContext::buttonSix() {
 	STACK_CHECK;
 	cl = 6;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonseven() {
+void DreamGenContext::buttonSeven() {
 	STACK_CHECK;
 	cl = 7;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttoneight() {
+void DreamGenContext::buttonEight() {
 	STACK_CHECK;
 	cl = 8;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonnine() {
+void DreamGenContext::buttonNine() {
 	STACK_CHECK;
 	cl = 9;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonnought() {
+void DreamGenContext::buttonNought() {
 	STACK_CHECK;
 	cl = 10;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonenter() {
+void DreamGenContext::buttonEnter() {
 	STACK_CHECK;
 	cl = 11;
-	buttonpress();
+	buttonPress();
 }
 
-void DreamGenContext::buttonpress() {
+void DreamGenContext::buttonPress() {
 	STACK_CHECK;
 	ch = cl;
 	_add(ch, 100);
@@ -9356,7 +9356,7 @@ void DreamGenContext::buttonpress() {
 	al = cl;
 	_add(al, 4);
 	push(cx);
-	commandonly();
+	commandOnly();
 	cx = pop();
 alreadyb:
 	ax = data.word(kMousebutton);
@@ -9376,71 +9376,71 @@ dob:
 	if (flags.z())
 		return /* (nonoise) */;
 	al = 10;
-	playchannel1();
+	playChannel1();
 }
 
-void DreamGenContext::showouterpad() {
+void DreamGenContext::showOuterPad() {
 	STACK_CHECK;
 	di = (36+112)-3;
 	bx = (72)-4;
 	ds = data.word(kTempgraphics);
 	al = 1;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = (36+112)+74;
 	bx = (72)+76;
 	ds = data.word(kTempgraphics);
 	al = 37;
 	ah = 0;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::showkeypad() {
+void DreamGenContext::showKeypad() {
 	STACK_CHECK;
 	al = 22;
 	di = (36+112)+9;
 	bx = (72)+5;
-	singlekey();
+	singleKey();
 	al = 23;
 	di = (36+112)+31;
 	bx = (72)+5;
-	singlekey();
+	singleKey();
 	al = 24;
 	di = (36+112)+53;
 	bx = (72)+5;
-	singlekey();
+	singleKey();
 	al = 25;
 	di = (36+112)+9;
 	bx = (72)+23;
-	singlekey();
+	singleKey();
 	al = 26;
 	di = (36+112)+31;
 	bx = (72)+23;
-	singlekey();
+	singleKey();
 	al = 27;
 	di = (36+112)+53;
 	bx = (72)+23;
-	singlekey();
+	singleKey();
 	al = 28;
 	di = (36+112)+9;
 	bx = (72)+41;
-	singlekey();
+	singleKey();
 	al = 29;
 	di = (36+112)+31;
 	bx = (72)+41;
-	singlekey();
+	singleKey();
 	al = 30;
 	di = (36+112)+53;
 	bx = (72)+41;
-	singlekey();
+	singleKey();
 	al = 31;
 	di = (36+112)+9;
 	bx = (72)+59;
-	singlekey();
+	singleKey();
 	al = 32;
 	di = (36+112)+31;
 	bx = (72)+59;
-	singlekey();
+	singleKey();
 	_cmp(data.byte(kLightcount), 0);
 	if (flags.z())
 		return /* (notenter) */;
@@ -9464,10 +9464,10 @@ gotlight:
 	ds = data.word(kTempgraphics);
 	ah = 0;
 	di = (36+112)+60;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::singlekey() {
+void DreamGenContext::singleKey() {
 	STACK_CHECK;
 	_cmp(data.byte(kGraphicpress), al);
 	if (!flags.z())
@@ -9481,76 +9481,76 @@ gotkey:
 	ds = data.word(kTempgraphics);
 	_sub(al, 20);
 	ah = 0;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::dumpkeypad() {
+void DreamGenContext::dumpKeypad() {
 	STACK_CHECK;
 	di = (36+112)-3;
 	bx = (72)-4;
 	cl = 120;
 	ch = 90;
-	multidump();
+	multiDump();
 }
 
-void DreamGenContext::usemenu() {
+void DreamGenContext::useMenu() {
 	STACK_CHECK;
-	getridofreels();
-	loadmenu();
-	createpanel();
-	showpanel();
-	showicon();
+	getRidOfReels();
+	loadMenu();
+	createPanel();
+	showPanel();
+	showIcon();
 	data.byte(kNewobs) = 0;
-	drawfloor();
-	printsprites();
+	drawFloor();
+	printSprites();
 	al = 4;
 	ah = 0;
 	di = (80+40)-48;
 	bx = (60)-4;
 	ds = data.word(kTempgraphics2);
-	showframe();
-	getundermenu();
+	showFrame();
+	getUnderMenu();
 	al = 5;
 	ah = 0;
 	di = (80+40)+54;
 	bx = (60)+72;
 	ds = data.word(kTempgraphics2);
-	showframe();
-	worktoscreenm();
+	showFrame();
+	workToScreenM();
 	data.byte(kGetback) = 0;
 menuloop:
-	delpointer();
-	putundermenu();
-	showmenu();
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumpmenu();
-	dumptextline();
+	delPointer();
+	putUnderMenu();
+	showMenu();
+	readMouse();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpMenu();
+	dumpTextLine();
 	bx = offset_menulist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kGetback), 1);
 	if (!flags.z())
 		goto menuloop;
 	data.byte(kManisoffscreen) = 0;
-	redrawmainscrn();
-	getridoftemp();
-	getridoftemp2();
-	restorereels();
-	worktoscreenm();
+	redrawMainScrn();
+	getRidOfTemp();
+	getRidOfTemp2();
+	restoreReels();
+	workToScreenM();
 }
 
-void DreamGenContext::dumpmenu() {
+void DreamGenContext::dumpMenu() {
 	STACK_CHECK;
 	di = (80+40);
 	bx = (60);
 	cl = 48;
 	ch = 48;
-	multidump();
+	multiDump();
 }
 
-void DreamGenContext::showmenu() {
+void DreamGenContext::showMenu() {
 	STACK_CHECK;
 	_inc(data.byte(kMenucount));
 	_cmp(data.byte(kMenucount), 37*2);
@@ -9564,45 +9564,45 @@ menuframeok:
 	di = (80+40);
 	bx = (60);
 	ds = data.word(kTempgraphics);
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::loadmenu() {
+void DreamGenContext::loadMenu() {
 	STACK_CHECK;
 	dx = 1832;
-	loadintotemp();
+	loadIntoTemp();
 	dx = 1987;
-	loadintotemp2();
+	loadIntoTemp2();
 }
 
-void DreamGenContext::entersymbol() {
+void DreamGenContext::enterSymbol() {
 	STACK_CHECK;
 	data.byte(kManisoffscreen) = 1;
-	getridofreels();
+	getRidOfReels();
 	dx = 2338;
-	loadintotemp();
+	loadIntoTemp();
 	data.byte(kSymboltopx) = 24;
 	data.byte(kSymboltopdir) = 0;
 	data.byte(kSymbolbotx) = 24;
 	data.byte(kSymbolbotdir) = 0;
-	redrawmainscrn();
-	showsymbol();
-	undertextline();
-	worktoscreenm();
+	redrawMainScrn();
+	showSymbol();
+	underTextLine();
+	workToScreenM();
 	data.byte(kGetback) = 0;
 symbolloop:
-	delpointer();
-	updatesymboltop();
-	updatesymbolbot();
-	showsymbol();
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumptextline();
-	dumpsymbol();
+	delPointer();
+	updateSymbolTop();
+	updateSymbolBot();
+	showSymbol();
+	readMouse();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpTextLine();
+	dumpSymbol();
 	bx = offset_symbollist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kGetback), 0);
 	if (flags.z())
 		goto symbolloop;
@@ -9613,38 +9613,38 @@ symbolloop:
 	if (!flags.z())
 		goto symbolwrong;
 	al = 43;
-	removesetobject();
+	removeSetObject();
 	al = 46;
-	placesetobject();
+	placeSetObject();
 	ah = data.byte(kRoomnum);
 	_add(ah, 12);
 	al = 0;
-	turnanypathon();
+	turnAnyPathOn();
 	data.byte(kManisoffscreen) = 0;
-	redrawmainscrn();
-	getridoftemp();
-	restorereels();
-	worktoscreenm();
+	redrawMainScrn();
+	getRidOfTemp();
+	restoreReels();
+	workToScreenM();
 	al = 13;
-	playchannel1();
+	playChannel1();
 	return;
 symbolwrong:
 	al = 46;
-	removesetobject();
+	removeSetObject();
 	al = 43;
-	placesetobject();
+	placeSetObject();
 	ah = data.byte(kRoomnum);
 	_add(ah, 12);
 	al = 0;
-	turnanypathoff();
+	turnAnyPathOff();
 	data.byte(kManisoffscreen) = 0;
-	redrawmainscrn();
-	getridoftemp();
-	restorereels();
-	worktoscreenm();
+	redrawMainScrn();
+	getRidOfTemp();
+	restoreReels();
+	workToScreenM();
 }
 
-void DreamGenContext::quitsymbol() {
+void DreamGenContext::quitSymbol() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymboltopx), 24);
 	if (!flags.z())
@@ -9657,7 +9657,7 @@ void DreamGenContext::quitsymbol() {
 		goto alreadyqs;
 	data.byte(kCommandtype) = 222;
 	al = 18;
-	commandonly();
+	commandOnly();
 alreadyqs:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -9671,7 +9671,7 @@ doqs:
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::settopleft() {
+void DreamGenContext::setTopLeft() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymboltopdir), 0);
 	if (!flags.z())
@@ -9681,7 +9681,7 @@ void DreamGenContext::settopleft() {
 		goto alreadytopl;
 	data.byte(kCommandtype) = 210;
 	al = 19;
-	commandonly();
+	commandOnly();
 alreadytopl:
 	_cmp(data.word(kMousebutton), 0);
 	if (flags.z())
@@ -9689,7 +9689,7 @@ alreadytopl:
 	data.byte(kSymboltopdir) = -1;
 }
 
-void DreamGenContext::settopright() {
+void DreamGenContext::setTopRight() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymboltopdir), 0);
 	if (!flags.z())
@@ -9699,7 +9699,7 @@ void DreamGenContext::settopright() {
 		goto alreadytopr;
 	data.byte(kCommandtype) = 211;
 	al = 20;
-	commandonly();
+	commandOnly();
 alreadytopr:
 	_cmp(data.word(kMousebutton), 0);
 	if (flags.z())
@@ -9707,7 +9707,7 @@ alreadytopr:
 	data.byte(kSymboltopdir) = 1;
 }
 
-void DreamGenContext::setbotleft() {
+void DreamGenContext::setBotLeft() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymbolbotdir), 0);
 	if (!flags.z())
@@ -9717,7 +9717,7 @@ void DreamGenContext::setbotleft() {
 		goto alreadybotl;
 	data.byte(kCommandtype) = 212;
 	al = 21;
-	commandonly();
+	commandOnly();
 alreadybotl:
 	_cmp(data.word(kMousebutton), 0);
 	if (flags.z())
@@ -9725,7 +9725,7 @@ alreadybotl:
 	data.byte(kSymbolbotdir) = -1;
 }
 
-void DreamGenContext::setbotright() {
+void DreamGenContext::setBotRight() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymbolbotdir), 0);
 	if (!flags.z())
@@ -9735,7 +9735,7 @@ void DreamGenContext::setbotright() {
 		goto alreadybotr;
 	data.byte(kCommandtype) = 213;
 	al = 22;
-	commandonly();
+	commandOnly();
 alreadybotr:
 	_cmp(data.word(kMousebutton), 0);
 	if (flags.z())
@@ -9743,24 +9743,24 @@ alreadybotr:
 	data.byte(kSymbolbotdir) = 1;
 }
 
-void DreamGenContext::dumpsymbol() {
+void DreamGenContext::dumpSymbol() {
 	STACK_CHECK;
 	data.byte(kNewtextline) = 0;
 	di = (64);
 	bx = (56)+20;
 	cl = 104;
 	ch = 60;
-	multidump();
+	multiDump();
 }
 
-void DreamGenContext::showsymbol() {
+void DreamGenContext::showSymbol() {
 	STACK_CHECK;
 	al = 12;
 	ah = 0;
 	di = (64);
 	bx = (56);
 	ds = data.word(kTempgraphics);
-	showframe();
+	showFrame();
 	al = data.byte(kSymboltopx);
 	ah = 0;
 	di = ax;
@@ -9773,25 +9773,25 @@ void DreamGenContext::showsymbol() {
 	push(di);
 	push(bx);
 	push(ds);
-	showframe();
+	showFrame();
 	ds = pop();
 	bx = pop();
 	di = pop();
 	ax = pop();
-	nextsymbol();
+	nextSymbol();
 	_add(di, 49);
 	push(ax);
 	push(di);
 	push(bx);
 	push(ds);
-	showframe();
+	showFrame();
 	ds = pop();
 	bx = pop();
 	di = pop();
 	ax = pop();
-	nextsymbol();
+	nextSymbol();
 	_add(di, 49);
-	showframe();
+	showFrame();
 	al = data.byte(kSymbolbotx);
 	ah = 0;
 	di = ax;
@@ -9805,28 +9805,28 @@ void DreamGenContext::showsymbol() {
 	push(di);
 	push(bx);
 	push(ds);
-	showframe();
+	showFrame();
 	ds = pop();
 	bx = pop();
 	di = pop();
 	ax = pop();
-	nextsymbol();
+	nextSymbol();
 	_add(di, 49);
 	push(ax);
 	push(di);
 	push(bx);
 	push(ds);
-	showframe();
+	showFrame();
 	ds = pop();
 	bx = pop();
 	di = pop();
 	ax = pop();
-	nextsymbol();
+	nextSymbol();
 	_add(di, 49);
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::nextsymbol() {
+void DreamGenContext::nextSymbol() {
 	STACK_CHECK;
 	_inc(al);
 	_cmp(al, 6);
@@ -9843,7 +9843,7 @@ botwrap:
 	al = 6;
 }
 
-void DreamGenContext::updatesymboltop() {
+void DreamGenContext::updateSymbolTop() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymboltopdir), 0);
 	if (flags.z())
@@ -9887,7 +9887,7 @@ notwrapback:
 	data.byte(kSymboltopdir) = 0;
 }
 
-void DreamGenContext::updatesymbolbot() {
+void DreamGenContext::updateSymbolBot() {
 	STACK_CHECK;
 	_cmp(data.byte(kSymbolbotdir), 0);
 	if (flags.z())
@@ -9931,7 +9931,7 @@ notwrapbackb:
 	data.byte(kSymbolbotdir) = 0;
 }
 
-void DreamGenContext::dumpsymbox() {
+void DreamGenContext::dumpSymBox() {
 	STACK_CHECK;
 	_cmp(data.word(kDumpx), -1);
 	if (flags.z())
@@ -9940,69 +9940,69 @@ void DreamGenContext::dumpsymbox() {
 	bx = data.word(kDumpy);
 	cl = 30;
 	ch = 77;
-	multidump();
+	multiDump();
 	data.word(kDumpx) = -1;
 }
 
-void DreamGenContext::usediary() {
+void DreamGenContext::useDiary() {
 	STACK_CHECK;
-	getridofreels();
+	getRidOfReels();
 	dx = 2039;
-	loadintotemp();
+	loadIntoTemp();
 	dx = 2208;
-	loadtemptext();
+	loadTempText();
 	dx = 1883;
-	loadtempcharset();
-	createpanel();
-	showicon();
-	showdiary();
-	undertextline();
-	showdiarypage();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	loadTempCharset();
+	createPanel();
+	showIcon();
+	showDiary();
+	underTextLine();
+	showDiaryPage();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 	data.byte(kGetback) = 0;
 diaryloop:
-	delpointer();
-	readmouse();
-	showdiarykeys();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumpdiarykeys();
-	dumptextline();
+	delPointer();
+	readMouse();
+	showDiaryKeys();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpDiaryKeys();
+	dumpTextLine();
 	bx = offset_diarylist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kGetback), 0);
 	if (flags.z())
 		goto diaryloop;
-	getridoftemp();
-	getridoftemptext();
-	getridoftempcharset();
-	restorereels();
+	getRidOfTemp();
+	getRidOfTempText();
+	getRidOfTempCharset();
+	restoreReels();
 	data.byte(kManisoffscreen) = 0;
-	redrawmainscrn();
-	worktoscreenm();
+	redrawMainScrn();
+	workToScreenM();
 }
 
-void DreamGenContext::showdiary() {
+void DreamGenContext::showDiary() {
 	STACK_CHECK;
 	al = 1;
 	ah = 0;
 	di = (68+24);
 	bx = (48+12)+37;
 	ds = data.word(kTempgraphics);
-	showframe();
+	showFrame();
 	al = 2;
 	ah = 0;
 	di = (68+24)+176;
 	bx = (48+12)+108;
 	ds = data.word(kTempgraphics);
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::showdiarykeys() {
+void DreamGenContext::showDiaryKeys() {
 	STACK_CHECK;
 	_cmp(data.byte(kPresscount), 0);
 	if (flags.z())
@@ -10024,11 +10024,11 @@ gotkeyn:
 	di = (68+24)+94;
 	bx = (48+12)+97;
 	ds = data.word(kTempgraphics);
-	showframe();
+	showFrame();
 	_cmp(data.byte(kPresscount), 1);
 	if (!flags.z())
 		return /* (notshown) */;
-	showdiarypage();
+	showDiaryPage();
 	return;
 nokeyn:
 	al = 5;
@@ -10041,14 +10041,14 @@ gotkeyp:
 	di = (68+24)+151;
 	bx = (48+12)+71;
 	ds = data.word(kTempgraphics);
-	showframe();
+	showFrame();
 	_cmp(data.byte(kPresscount), 1);
 	if (!flags.z())
 		return /* (notshowp) */;
-	showdiarypage();
+	showDiaryPage();
 }
 
-void DreamGenContext::dumpdiarykeys() {
+void DreamGenContext::dumpDiaryKeys() {
 	STACK_CHECK;
 	_cmp(data.byte(kPresscount), 1);
 	if (!flags.z())
@@ -10063,57 +10063,57 @@ void DreamGenContext::dumpdiarykeys() {
 	if (!flags.z())
 		goto notsartadd;
 	al = 6;
-	getlocation();
+	getLocation();
 	_cmp(al, 1);
 	if (flags.z())
 		goto notsartadd;
 	al = 6;
-	setlocation();
-	delpointer();
+	setLocation();
+	delPointer();
 	al = 12;
-	findtext1();
+	findText1();
 	di = 70;
 	bx = 106;
 	dl = 241;
 	ah = 16;
-	printdirect();
-	worktoscreenm();
+	printDirect();
+	workToScreenM();
 	cx = 200;
-	hangonp();
-	createpanel();
-	showicon();
-	showdiary();
-	showdiarypage();
-	worktoscreenm();
-	showpointer();
+	hangOnP();
+	createPanel();
+	showIcon();
+	showDiary();
+	showDiaryPage();
+	workToScreenM();
+	showPointer();
 	return;
 notsartadd:
 	di = (68+24)+48;
 	bx = (48+12)+15;
 	cl = 200;
 	ch = 16;
-	multidump();
+	multiDump();
 notdumpdiary:
 	di = (68+24)+94;
 	bx = (48+12)+97;
 	cl = 16;
 	ch = 16;
-	multidump();
+	multiDump();
 	di = (68+24)+151;
 	bx = (48+12)+71;
 	cl = 16;
 	ch = 16;
-	multidump();
+	multiDump();
 }
 
-void DreamGenContext::diarykeyp() {
+void DreamGenContext::diaryKeyP() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 214);
 	if (flags.z())
 		goto alreadykeyp;
 	data.byte(kCommandtype) = 214;
 	al = 23;
-	commandonly();
+	commandOnly();
 alreadykeyp:
 	_cmp(data.word(kMousebutton), 0);
 	if (flags.z())
@@ -10126,7 +10126,7 @@ alreadykeyp:
 	if (!flags.z())
 		return /* (notkeyp) */;
 	al = 16;
-	playchannel1();
+	playChannel1();
 	data.byte(kPresscount) = 12;
 	data.byte(kPressed) = 'P';
 	_dec(data.byte(kDiarypage));
@@ -10136,14 +10136,14 @@ alreadykeyp:
 	data.byte(kDiarypage) = 11;
 }
 
-void DreamGenContext::diarykeyn() {
+void DreamGenContext::diaryKeyN() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 213);
 	if (flags.z())
 		goto alreadykeyn;
 	data.byte(kCommandtype) = 213;
 	al = 23;
-	commandonly();
+	commandOnly();
 alreadykeyn:
 	_cmp(data.word(kMousebutton), 0);
 	if (flags.z())
@@ -10156,7 +10156,7 @@ alreadykeyn:
 	if (!flags.z())
 		return /* (notkeyn) */;
 	al = 16;
-	playchannel1();
+	playChannel1();
 	data.byte(kPresscount) = 12;
 	data.byte(kPressed) = 'N';
 	_inc(data.byte(kDiarypage));
@@ -10166,40 +10166,40 @@ alreadykeyn:
 	data.byte(kDiarypage) = 0;
 }
 
-void DreamGenContext::showdiarypage() {
+void DreamGenContext::showDiaryPage() {
 	STACK_CHECK;
 	al = 0;
 	ah = 0;
 	di = (68+24);
 	bx = (48+12);
 	ds = data.word(kTempgraphics);
-	showframe();
+	showFrame();
 	al = data.byte(kDiarypage);
-	findtext1();
+	findText1();
 	data.byte(kKerning) = 1;
-	usetempcharset();
+	useTempCharset();
 	di = (68+24)+48;
 	bx = (48+12)+16;
 	dl = 240;
 	ah = 16;
 	data.word(kCharshift) = 91+91;
-	printdirect();
+	printDirect();
 	di = (68+24)+129;
 	bx = (48+12)+16;
 	dl = 240;
 	ah = 16;
-	printdirect();
+	printDirect();
 	di = (68+24)+48;
 	bx = (48+12)+23;
 	dl = 240;
 	ah = 16;
-	printdirect();
+	printDirect();
 	data.byte(kKerning) = 0;
 	data.word(kCharshift) = 0;
-	usecharset1();
+	useCharset1();
 }
 
-void DreamGenContext::findtext1() {
+void DreamGenContext::findText1() {
 	STACK_CHECK;
 	ah = 0;
 	si = ax;
@@ -10210,40 +10210,40 @@ void DreamGenContext::findtext1() {
 	si = ax;
 }
 
-void DreamGenContext::dosaveload() {
+void DreamGenContext::doSaveLoad() {
 	STACK_CHECK;
 	data.byte(kPointerframe) = 0;
 	data.word(kTextaddressx) = 70;
 	data.word(kTextaddressy) = 182-8;
 	data.byte(kTextlen) = 181;
 	data.byte(kManisoffscreen) = 1;
-	clearwork();
-	createpanel2();
-	undertextline();
-	getridofall();
-	loadsavebox();
-	showopbox();
-	showmainops();
-	worktoscreen();
+	clearWork();
+	createPanel2();
+	underTextLine();
+	getRidOfAll();
+	loadSaveBox();
+	showOpBox();
+	showMainOps();
+	workToScreen();
 	goto donefirstops;
 restartops:
-	showopbox();
-	showmainops();
-	worktoscreenm();
+	showOpBox();
+	showMainOps();
+	workToScreenM();
 donefirstops:
 	data.byte(kGetback) = 0;
 waitops:
 	_cmp(data.byte(kQuitrequested),  0);
 	if (!flags.z())
 		goto justret;
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumptextline();
-	delpointer();
+	readMouse();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpTextLine();
+	delPointer();
 	bx = offset_opslist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kGetback), 0);
 	if (flags.z())
 		goto waitops;
@@ -10256,40 +10256,40 @@ waitops:
 	_cmp(data.byte(kGetback), 4);
 	if (flags.z())
 		goto justret;
-	getridoftemp();
-	restoreall();
-	redrawmainscrn();
-	worktoscreenm();
+	getRidOfTemp();
+	restoreAll();
+	redrawMainScrn();
+	workToScreenM();
 	data.byte(kCommandtype) = 200;
 justret:
 	data.byte(kManisoffscreen) = 0;
 }
 
-void DreamGenContext::getbackfromops() {
+void DreamGenContext::getBackFromOps() {
 	STACK_CHECK;
 	_cmp(data.byte(kMandead), 2);
 	if (flags.z())
 		goto opsblock1;
-	getback1();
+	getBack1();
 	return;
 opsblock1:
 	blank();
 }
 
-void DreamGenContext::loadsavebox() {
+void DreamGenContext::loadSaveBox() {
 	STACK_CHECK;
 	dx = 1961;
-	loadintotemp();
+	loadIntoTemp();
 }
 
-void DreamGenContext::getbacktoops() {
+void DreamGenContext::getBackToOps() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 201);
 	if (flags.z())
 		goto alreadygetops;
 	data.byte(kCommandtype) = 201;
 	al = 42;
-	commandonly();
+	commandOnly();
 alreadygetops:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -10300,18 +10300,18 @@ alreadygetops:
 		goto dogetbackops;
 	return;
 dogetbackops:
-	oldtonames();
+	oldToNames();
 	data.byte(kGetback) = 2;
 }
 
-void DreamGenContext::discops() {
+void DreamGenContext::discOps() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 249);
 	if (flags.z())
 		goto alreadydiscops;
 	data.byte(kCommandtype) = 249;
 	al = 43;
-	commandonly();
+	commandOnly();
 alreadydiscops:
 	ax = data.word(kMousebutton);
 	_cmp(ax, data.word(kOldbutton));
@@ -10322,46 +10322,46 @@ alreadydiscops:
 		goto dodiscops;
 	return;
 dodiscops:
-	scanfornames();
+	scanForNames();
 	data.byte(kLoadingorsave) = 2;
-	showopbox();
-	showdiscops();
+	showOpBox();
+	showDiscOps();
 	data.byte(kCurrentslot) = 0;
-	worktoscreenm();
+	workToScreenM();
 	data.byte(kGetback) = 0;
 discopsloop:
 	_cmp(data.byte(kQuitrequested),  0);
 	if (!flags.z())
 		return /* (quitdiscops) */;
-	delpointer();
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumptextline();
+	delPointer();
+	readMouse();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpTextLine();
 	bx = offset_discopslist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kGetback), 0);
 	if (flags.z())
 		goto discopsloop;
 }
 
-void DreamGenContext::selectslot2() {
+void DreamGenContext::selectSlot2() {
 	STACK_CHECK;
 	_cmp(data.word(kMousebutton), 0);
 	if (flags.z())
 		goto noselslot2;
 	data.byte(kLoadingorsave) = 2;
 noselslot2:
-	selectslot();
+	selectSlot();
 }
 
-void DreamGenContext::checkinput() {
+void DreamGenContext::checkInput() {
 	STACK_CHECK;
 	_cmp(data.byte(kLoadingorsave), 3);
 	if (flags.z())
 		return /* (nokeypress) */;
-	readkey();
+	readKey();
 	al = data.byte(kCurrentkey);
 	_cmp(al, 0);
 	if (flags.z())
@@ -10378,7 +10378,7 @@ notret:
 	_cmp(data.byte(kCursorpos), 0);
 	if (flags.z())
 		return /* (nokeypress) */;
-	getnamepos();
+	getNamePos();
 	_dec(data.byte(kCursorpos));
 	es.byte(bx) = 0;
 	es.byte(bx+1) = 1;
@@ -10387,7 +10387,7 @@ nodel2:
 	_cmp(data.byte(kCursorpos), 14);
 	if (flags.z())
 		return /* (nokeypress) */;
-	getnamepos();
+	getNamePos();
 	_inc(data.byte(kCursorpos));
 	al = data.byte(kCurrentkey);
 	es.byte(bx+1) = al;
@@ -10396,14 +10396,14 @@ nodel2:
 	goto afterkey;
 	return;
 afterkey:
-	showopbox();
-	shownames();
-	showslots();
-	showsaveops();
-	worktoscreenm();
+	showOpBox();
+	showNames();
+	showSlots();
+	showSaveOps();
+	workToScreenM();
 }
 
-void DreamGenContext::getnamepos() {
+void DreamGenContext::getNamePos() {
 	STACK_CHECK;
 	al = data.byte(kCurrentslot);
 	ah = 0;
@@ -10418,72 +10418,72 @@ void DreamGenContext::getnamepos() {
 	_add(bx, ax);
 }
 
-void DreamGenContext::showopbox() {
+void DreamGenContext::showOpBox() {
 	STACK_CHECK;
 	ds = data.word(kTempgraphics);
 	di = (60);
 	bx = (52);
 	al = 0;
 	ah = 0;
-	showframe();
+	showFrame();
 	ds = data.word(kTempgraphics);
 	di = (60);
 	bx = (52)+55;
 	al = 4;
 	ah = 0;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::showloadops() {
+void DreamGenContext::showLoadOps() {
 	STACK_CHECK;
 	ds = data.word(kTempgraphics);
 	di = (60)+128+4;
 	bx = (52)+12;
 	al = 1;
 	ah = 0;
-	showframe();
+	showFrame();
 	ds = data.word(kTempgraphics);
 	di = (60)+176+2;
 	bx = (52)+60-4;
 	al = 5;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = (60)+104;
 	bx = (52)+14;
 	al = 55;
 	dl = 101;
-	printmessage();
+	printMessage();
 }
 
-void DreamGenContext::showsaveops() {
+void DreamGenContext::showSaveOps() {
 	STACK_CHECK;
 	ds = data.word(kTempgraphics);
 	di = (60)+128+4;
 	bx = (52)+12;
 	al = 1;
 	ah = 0;
-	showframe();
+	showFrame();
 	ds = data.word(kTempgraphics);
 	di = (60)+176+2;
 	bx = (52)+60-4;
 	al = 5;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = (60)+104;
 	bx = (52)+14;
 	al = 54;
 	dl = 101;
-	printmessage();
+	printMessage();
 }
 
-void DreamGenContext::selectslot() {
+void DreamGenContext::selectSlot() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 244);
 	if (flags.z())
 		goto alreadysel;
 	data.byte(kCommandtype) = 244;
 	al = 45;
-	commandonly();
+	commandOnly();
 alreadysel:
 	ax = data.word(kMousebutton);
 	_cmp(ax, 1);
@@ -10497,7 +10497,7 @@ alreadysel:
 		goto notnocurs;
 	_dec(data.byte(kLoadingorsave));
 notnocurs:
-	oldtonames();
+	oldToNames();
 	ax = data.word(kMousey);
 	_sub(ax, (52)+4);
 	cl = -1;
@@ -10507,35 +10507,35 @@ getslotnum:
 	if (!flags.c())
 		goto getslotnum;
 	data.byte(kCurrentslot) = cl;
-	delpointer();
-	showopbox();
-	showslots();
-	shownames();
+	delPointer();
+	showOpBox();
+	showSlots();
+	showNames();
 	_cmp(data.byte(kLoadingorsave), 1);
 	if (flags.z())
 		goto isloadmode;
-	showsaveops();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	showSaveOps();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 	return;
 isloadmode:
-	showloadops();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	showLoadOps();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 }
 
-void DreamGenContext::showslots() {
+void DreamGenContext::showSlots() {
 	STACK_CHECK;
 	di = (60)+7;
 	bx = (52)+8;
 	al = 2;
 	ds = data.word(kTempgraphics);
 	ah = 0;
-	showframe();
+	showFrame();
 	di = (60)+10;
 	bx = (52)+11;
 	cl = 0;
@@ -10549,7 +10549,7 @@ slotloop:
 	al = 3;
 	ds = data.word(kTempgraphics);
 	ah = 0;
-	showframe();
+	showFrame();
 nomatchslot:
 	bx = pop();
 	di = pop();
@@ -10561,7 +10561,7 @@ nomatchslot:
 		goto slotloop;
 }
 
-void DreamGenContext::shownames() {
+void DreamGenContext::showNames() {
 	STACK_CHECK;
 	dx = data;
 	es = dx;
@@ -10600,7 +10600,7 @@ foundcharacter:
 	si = dx;
 	dl = 200;
 	ah = 0;
-	printdirect();
+	printDirect();
 	si = pop();
 	es.byte(si) = 0;
 	es.byte(si+1) = 1;
@@ -10610,13 +10610,13 @@ loadmode:
 	dl = 200;
 	ah = 0;
 	data.word(kCharshift) = 91;
-	printdirect();
+	printDirect();
 	data.word(kCharshift) = 0;
 	goto afterprintname;
 nomatchslot2:
 	dl = 200;
 	ah = 0;
-	printdirect();
+	printDirect();
 afterprintname:
 	si = pop();
 	bx = pop();
@@ -10631,7 +10631,7 @@ afterprintname:
 		goto shownameloop;
 }
 
-void DreamGenContext::scanfornames() {
+void DreamGenContext::scanForNames() {
 	STACK_CHECK;
 	dx = data;
 	es = dx;
@@ -10646,7 +10646,7 @@ scanloop:
 	push(di);
 	push(dx);
 	push(cx);
-	openfilefromc();
+	openFileFromC();
 	if (flags.c())
 		goto notexist;
 	cx = pop();
@@ -10658,15 +10658,15 @@ scanloop:
 	ds = dx;
 	dx = 6091;
 	cx = (6187-6091);
-	savefileread();
+	saveFileRead();
 	dx = data;
 	es = dx;
 	di = 6141;
 	ds = pop();
 	dx = pop();
-	loadseg();
+	loadSeg();
 	bx = data.word(kHandle);
-	closefile();
+	closeFile();
 notexist:
 	cx = pop();
 	dx = pop();
@@ -10683,9 +10683,9 @@ notexist:
 
 void DreamGenContext::decide() {
 	STACK_CHECK;
-	setmode();
-	loadpalfromiff();
-	clearpalette();
+	setMode();
+	loadPalFromIFF();
+	clearPalette();
 	data.byte(kPointermode) = 0;
 	data.word(kWatchingtime) = 0;
 	data.byte(kPointerframe) = 0;
@@ -10693,10 +10693,10 @@ void DreamGenContext::decide() {
 	data.word(kTextaddressy) = 182-8;
 	data.byte(kTextlen) = 181;
 	data.byte(kManisoffscreen) = 1;
-	loadsavebox();
-	showdecisions();
-	worktoscreen();
-	fadescreenup();
+	loadSaveBox();
+	showDecisions();
+	workToScreen();
+	fadeScreenUp();
 	data.byte(kGetback) = 0;
 waitdecide:
 	_cmp(data.byte(kQuitrequested),  0);
@@ -10704,48 +10704,48 @@ waitdecide:
 		goto _tmp1;
 	return;
 _tmp1:
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	dumptextline();
-	delpointer();
+	readMouse();
+	showPointer();
+	vSync();
+	dumpPointer();
+	dumpTextLine();
+	delPointer();
 	bx = offset_decidelist;
-	checkcoords();
+	checkCoords();
 	_cmp(data.byte(kGetback), 0);
 	if (flags.z())
 		goto waitdecide;
 	_cmp(data.byte(kGetback), 4);
 	if (flags.z())
 		goto hasloadedroom;
-	getridoftemp();
+	getRidOfTemp();
 hasloadedroom:
 	data.word(kTextaddressx) = 13;
 	data.word(kTextaddressy) = 182;
 	data.byte(kTextlen) = 240;
 }
 
-void DreamGenContext::showdecisions() {
+void DreamGenContext::showDecisions() {
 	STACK_CHECK;
-	createpanel2();
-	showopbox();
+	createPanel2();
+	showOpBox();
 	ds = data.word(kTempgraphics);
 	di = (60)+17;
 	bx = (52)+13;
 	al = 6;
 	ah = 0;
-	showframe();
-	undertextline();
+	showFrame();
+	underTextLine();
 }
 
-void DreamGenContext::newgame() {
+void DreamGenContext::newGame() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 251);
 	if (flags.z())
 		goto alreadynewgame;
 	data.byte(kCommandtype) = 251;
 	al = 47;
-	commandonly();
+	commandOnly();
 alreadynewgame:
 	ax = data.word(kMousebutton);
 	_cmp(ax, 1);
@@ -10754,33 +10754,33 @@ alreadynewgame:
 	data.byte(kGetback) = 3;
 }
 
-void DreamGenContext::loadold() {
+void DreamGenContext::loadOld() {
 	STACK_CHECK;
 	_cmp(data.byte(kCommandtype), 252);
 	if (flags.z())
 		goto alreadyloadold;
 	data.byte(kCommandtype) = 252;
 	al = 48;
-	commandonly();
+	commandOnly();
 alreadyloadold:
 	ax = data.word(kMousebutton);
 	_and(ax, 1);
 	if (flags.z())
 		return /* (noloadold) */;
 	ax = 0x0ffff;
-	doload();
+	doLoad();
 	_cmp(data.byte(kGetback), 4);
 	if (flags.z())
 		return /* (noloadold) */;
 	_cmp(data.byte(kQuitrequested),  0);
 	if (!flags.z())
 		return /* (noloadold) */;
-	showdecisions();
-	worktoscreenm();
+	showDecisions();
+	workToScreenM();
 	data.byte(kGetback) = 0;
 }
 
-void DreamGenContext::createname() {
+void DreamGenContext::createName() {
 	STACK_CHECK;
 	push(ax);
 	di = offset_speechfile;
@@ -10825,7 +10825,7 @@ tensc:
 	cs.byte(di+7) = al;
 }
 
-void DreamGenContext::volumeadjust() {
+void DreamGenContext::volumeAdjust() {
 	STACK_CHECK;
 	al = data.byte(kVolumedirection);
 	_cmp(al, 0);
@@ -10846,7 +10846,7 @@ volfinish:
 	data.byte(kVolumedirection) = 0;
 }
 
-void DreamGenContext::entrytexts() {
+void DreamGenContext::entryTexts() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 21);
 	if (!flags.z())
@@ -10856,7 +10856,7 @@ void DreamGenContext::entrytexts() {
 	dx = 11;
 	bl = 68;
 	bh = 64;
-	setuptimeduse();
+	setupTimedUse();
 	return;
 notloc15:
 	_cmp(data.byte(kLocation), 30);
@@ -10867,7 +10867,7 @@ notloc15:
 	dx = 11;
 	bl = 68;
 	bh = 64;
-	setuptimeduse();
+	setupTimedUse();
 	return;
 notloc43:
 	_cmp(data.byte(kLocation), 23);
@@ -10878,7 +10878,7 @@ notloc43:
 	dx = 11;
 	bl = 68;
 	bh = 64;
-	setuptimeduse();
+	setupTimedUse();
 	return;
 notloc23:
 	_cmp(data.byte(kLocation), 31);
@@ -10889,7 +10889,7 @@ notloc23:
 	dx = 11;
 	bl = 68;
 	bh = 64;
-	setuptimeduse();
+	setupTimedUse();
 	return;
 notloc44:
 	_cmp(data.byte(kLocation), 20);
@@ -10900,7 +10900,7 @@ notloc44:
 	dx = 11;
 	bl = 68;
 	bh = 64;
-	setuptimeduse();
+	setupTimedUse();
 	return;
 notsarters2:
 	_cmp(data.byte(kLocation), 24);
@@ -10911,7 +10911,7 @@ notsarters2:
 	dx = 3;
 	bl = 68;
 	bh = 64;
-	setuptimeduse();
+	setupTimedUse();
 	return;
 notedenlob:
 	_cmp(data.byte(kLocation), 34);
@@ -10922,17 +10922,17 @@ notedenlob:
 	dx = 3;
 	bl = 68;
 	bh = 64;
-	setuptimeduse();
+	setupTimedUse();
 }
 
-void DreamGenContext::entryanims() {
+void DreamGenContext::entryAnims() {
 	STACK_CHECK;
 	data.word(kReeltowatch) = -1;
 	data.byte(kWatchmode) = -1;
 	_cmp(data.byte(kLocation), 33);
 	if (!flags.z())
 		goto notinthebeach;
-	switchryanoff();
+	switchRyanOff();
 	data.word(kWatchingtime) = 76*2;
 	data.word(kReeltowatch) = 0;
 	data.word(kEndwatchreel) = 76;
@@ -10944,13 +10944,13 @@ notinthebeach:
 	if (!flags.z())
 		goto notsparkys;
 	al = 8;
-	resetlocation();
+	resetLocation();
 	data.word(kWatchingtime) = 50*2;
 	data.word(kReeltowatch) = 247;
 	data.word(kEndwatchreel) = 297;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	switchryanoff();
+	switchRyanOff();
 	return;
 notsparkys:
 	_cmp(data.byte(kLocation), 22);
@@ -10961,7 +10961,7 @@ notsparkys:
 	data.word(kEndwatchreel) = 30;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	switchryanoff();
+	switchRyanOff();
 	return;
 notinthelift:
 	_cmp(data.byte(kLocation), 26);
@@ -10980,7 +10980,7 @@ notunderchurch:
 	data.word(kEndwatchreel) = 198;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	switchryanoff();
+	switchRyanOff();
 	return;
 notenterdream:
 	_cmp(data.byte(kReallocation), 46);
@@ -10990,39 +10990,39 @@ notenterdream:
 	if (!flags.z())
 		goto notcrystal;
 	al = 0;
-	removefreeobject();
+	removeFreeObject();
 	return;
 notcrystal:
 	_cmp(data.byte(kLocation), 9);
 	if (!flags.z())
 		goto nottopchurch;
 	al = 2;
-	checkifpathison();
+	checkIfPathIsOn();
 	if (flags.z())
 		goto nottopchurch;
 	_cmp(data.byte(kAidedead), 0);
 	if (flags.z())
 		goto nottopchurch;
 	al = 3;
-	checkifpathison();
+	checkIfPathIsOn();
 	if (!flags.z())
 		goto makedoorsopen;
 	al = 2;
-	turnpathon();
+	turnPathOn();
 makedoorsopen:
 	al = 4;
-	removesetobject();
+	removeSetObject();
 	al = 5;
-	placesetobject();
+	placeSetObject();
 	return;
 nottopchurch:
 	_cmp(data.byte(kLocation), 47);
 	if (!flags.z())
 		goto notdreamcentre;
 	al = 4;
-	placesetobject();
+	placeSetObject();
 	al = 5;
-	placesetobject();
+	placeSetObject();
 	return;
 notdreamcentre:
 	_cmp(data.byte(kLocation), 38);
@@ -11033,7 +11033,7 @@ notdreamcentre:
 	data.word(kEndwatchreel) = 57;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	switchryanoff();
+	switchRyanOff();
 	return;
 notcarpark:
 	_cmp(data.byte(kLocation), 32);
@@ -11044,7 +11044,7 @@ notcarpark:
 	data.word(kEndwatchreel) = 66;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	switchryanoff();
+	switchRyanOff();
 	return;
 notalley:
 	_cmp(data.byte(kLocation), 24);
@@ -11053,10 +11053,10 @@ notalley:
 	al = 2;
 	ah = data.byte(kRoomnum);
 	_dec(ah);
-	turnanypathon();
+	turnAnyPathOn();
 }
 
-void DreamGenContext::initialinv() {
+void DreamGenContext::initialInv() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 24);
 	if (flags.z())
@@ -11065,52 +11065,52 @@ void DreamGenContext::initialinv() {
 isedens:
 	al = 11;
 	ah = 5;
-	pickupob();
+	pickupOb();
 	al = 12;
 	ah = 6;
-	pickupob();
+	pickupOb();
 	al = 13;
 	ah = 7;
-	pickupob();
+	pickupOb();
 	al = 14;
 	ah = 8;
-	pickupob();
+	pickupOb();
 	al = 18;
 	al = 18;
 	ah = 0;
-	pickupob();
+	pickupOb();
 	al = 19;
 	ah = 1;
-	pickupob();
+	pickupOb();
 	al = 20;
 	ah = 9;
-	pickupob();
+	pickupOb();
 	al = 16;
 	ah = 2;
-	pickupob();
+	pickupOb();
 	data.byte(kWatchmode) = 1;
 	data.word(kReeltohold) = 0;
 	data.word(kEndofholdreel) = 6;
 	data.byte(kWatchspeed) = 1;
 	data.byte(kSpeedcount) = 1;
-	switchryanoff();
+	switchRyanOff();
 }
 
-void DreamGenContext::pickupob() {
+void DreamGenContext::pickupOb() {
 	STACK_CHECK;
 	data.byte(kLastinvpos) = ah;
 	data.byte(kObjecttype) = 2;
 	data.byte(kItemframe) = al;
 	data.byte(kCommand) = al;
-	getanyad();
-	transfertoex();
+	getAnyAd();
+	transferToEx();
 }
 
-void DreamGenContext::checkforemm() {
+void DreamGenContext::checkForEMM() {
 	STACK_CHECK;
 }
 
-void DreamGenContext::clearbuffers() {
+void DreamGenContext::clearBuffers() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
 	cx = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5)+(46*40)+(5*80)+(250*4)+(256*30)+(6*64)+991-534+68-0)/2;
@@ -11134,10 +11134,10 @@ void DreamGenContext::clearbuffers() {
 	si = 0;
 	cx = (68-0);
 	_movsb(cx, true);
-	clearchanges();
+	clearChanges();
 }
 
-void DreamGenContext::clearchanges() {
+void DreamGenContext::clearChanges() {
 	STACK_CHECK;
 	es = data.word(kBuffers);
 	cx = (250)*2;
@@ -11177,27 +11177,27 @@ void DreamGenContext::clearchanges() {
 	_stosw(cx, true);
 }
 
-void DreamGenContext::clearbeforeload() {
+void DreamGenContext::clearBeforeLoad() {
 	STACK_CHECK;
 	_cmp(data.byte(kRoomloaded), 1);
 	if (!flags.z())
 		return /* (noclear) */;
-	clearreels();
-	clearrest();
+	clearReels();
+	clearRest();
 	data.byte(kRoomloaded) = 0;
 }
 
-void DreamGenContext::clearreels() {
+void DreamGenContext::clearReels() {
 	STACK_CHECK;
 	es = data.word(kReel1);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReel2);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReel3);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::clearrest() {
+void DreamGenContext::clearRest() {
 	STACK_CHECK;
 	es = data.word(kMapdata);
 	cx = (66*60)/2;
@@ -11205,26 +11205,26 @@ void DreamGenContext::clearrest() {
 	di = (0);
 	_stosw(cx, true);
 	es = data.word(kBackdrop);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kSetframes);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReels);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kPeople);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kSetdesc);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kBlockdesc);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kRoomdesc);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kFreeframes);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kFreedesc);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::watchreel() {
+void DreamGenContext::watchReel() {
 	STACK_CHECK;
 	_cmp(data.word(kReeltowatch), -1);
 	if (flags.z())
@@ -11264,10 +11264,10 @@ ismorereel:
 showwatchreel:
 	ax = data.word(kReeltowatch);
 	data.word(kReelpointer) = ax;
-	plotreel();
+	plotReel();
 	ax = data.word(kReelpointer);
 	data.word(kReeltowatch) = ax;
-	checkforshake();
+	checkForShake();
 	return;
 notplayingreel:
 	_cmp(data.byte(kWatchmode), 1);
@@ -11275,7 +11275,7 @@ notplayingreel:
 		goto notholdingreel;
 	ax = data.word(kReeltohold);
 	data.word(kReelpointer) = ax;
-	plotreel();
+	plotReel();
 	return;
 notholdingreel:
 	_cmp(data.byte(kWatchmode), 2);
@@ -11298,15 +11298,15 @@ notlastspeed2:
 	al = data.byte(kDestafterhold);
 	data.byte(kDestination) = al;
 	data.byte(kFinaldest) = al;
-	autosetwalk();
+	autoSetWalk();
 	return;
 ismorereel2:
 	ax = data.word(kReeltohold);
 	data.word(kReelpointer) = ax;
-	plotreel();
+	plotReel();
 }
 
-void DreamGenContext::checkforshake() {
+void DreamGenContext::checkForShake() {
 	STACK_CHECK;
 	_cmp(data.byte(kReallocation), 26);
 	if (!flags.z())
@@ -11317,26 +11317,26 @@ void DreamGenContext::checkforshake() {
 	data.byte(kShakecounter) = -1;
 }
 
-void DreamGenContext::madmanrun() {
+void DreamGenContext::madmanRun() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 14);
 	if (!flags.z())
-		{ identifyob(); return; };
+		{ identifyOb(); return; };
 	_cmp(data.byte(kMapx), 22);
 	if (!flags.z())
-		{ identifyob(); return; };
+		{ identifyOb(); return; };
 	_cmp(data.byte(kPointermode), 2);
 	if (!flags.z())
-		{ identifyob(); return; };
+		{ identifyOb(); return; };
 	_cmp(data.byte(kMadmanflag), 0);
 	if (!flags.z())
-		{ identifyob(); return; };
+		{ identifyOb(); return; };
 	_cmp(data.byte(kCommandtype), 211);
 	if (flags.z())
 		goto alreadyrun;
 	data.byte(kCommandtype) = 211;
 	al = 52;
-	commandonly();
+	commandOnly();
 alreadyrun:
 	_cmp(data.word(kMousebutton), 1);
 	if (!flags.z())
@@ -11348,7 +11348,7 @@ alreadyrun:
 	data.byte(kLastweapon) = 8;
 }
 
-void DreamGenContext::identifyob() {
+void DreamGenContext::identifyOb() {
 	STACK_CHECK;
 	_cmp(data.word(kWatchingtime), 0);
 	if (!flags.z())
@@ -11372,23 +11372,23 @@ notover2:
 	data.byte(kInmaparea) = 1;
 	ah = bl;
 	push(ax);
-	findpathofpoint();
+	findPathOfPoint();
 	data.byte(kPointerspath) = dl;
 	ax = pop();
 	push(ax);
-	findfirstpath();
+	findFirstPath();
 	data.byte(kPointerfirstpath) = al;
 	ax = pop();
-	checkifex();
+	checkIfEx();
 	if (!flags.z())
 		return /* (finishidentify) */;
-	checkiffree();
+	checkIfFree();
 	if (!flags.z())
 		return /* (finishidentify) */;
-	checkifperson();
+	checkIfPerson();
 	if (!flags.z())
 		return /* (finishidentify) */;
-	checkifset();
+	checkIfSet();
 	if (!flags.z())
 		return /* (finishidentify) */;
 	ax = data.word(kMousex);
@@ -11397,7 +11397,7 @@ notover2:
 	ax = data.word(kMousey);
 	_sub(ax, data.word(kMapady));
 	ch = al;
-	checkone();
+	checkOne();
 	_cmp(al, 0);
 	if (flags.z())
 		goto nothingund;
@@ -11405,13 +11405,13 @@ notover2:
 	if (flags.z())
 		goto nothingund;
 	ah = 3;
-	obname();
+	obName();
 	return;
 nothingund:
 	blank();
 }
 
-void DreamGenContext::findpathofpoint() {
+void DreamGenContext::findPathOfPoint() {
 	STACK_CHECK;
 	push(ax);
 	bx = (0);
@@ -11455,7 +11455,7 @@ flunkedit:
 	dl = 255;
 }
 
-void DreamGenContext::findfirstpath() {
+void DreamGenContext::findFirstPath() {
 	STACK_CHECK;
 	push(ax);
 	bx = (0);
@@ -11498,15 +11498,15 @@ gotfirst:
 	al = es.byte(bx+6);
 }
 
-void DreamGenContext::afternewroom() {
+void DreamGenContext::afterNewRoom() {
 	STACK_CHECK;
 	_cmp(data.byte(kNowinnewroom), 0);
 	if (flags.z())
 		return /* (notnew) */;
 	data.word(kTimecount) = 0;
-	createpanel();
+	createPanel();
 	data.byte(kCommandtype) = 0;
-	findroominloc();
+	findRoomInLoc();
 	_cmp(data.byte(kRyanon), 1);
 	if (flags.z())
 		goto ryansoff;
@@ -11514,25 +11514,25 @@ void DreamGenContext::afternewroom() {
 	_add(al, 12);
 	ah = data.byte(kRyany);
 	_add(ah, 12);
-	findpathofpoint();
+	findPathOfPoint();
 	data.byte(kManspath) = dl;
-	findxyfrompath();
+	findXYFromPath();
 	data.byte(kResetmanxy) = 1;
 ryansoff:
 	data.byte(kNewobs) = 1;
-	drawfloor();
+	drawFloor();
 	data.word(kLookcounter) = 160;
 	data.byte(kNowinnewroom) = 0;
-	showicon();
-	spriteupdate();
-	printsprites();
-	undertextline();
-	reelsonscreen();
-	mainscreen();
-	getunderzoom();
+	showIcon();
+	spriteUpdate();
+	printSprites();
+	underTextLine();
+	reelsOnScreen();
+	mainScreen();
+	getUnderZoom();
 	zoom();
-	worktoscreenm();
-	walkintoroom();
+	workToScreenM();
+	walkIntoRoom();
 	reminders();
 	atmospheres();
 }
@@ -11565,7 +11565,7 @@ nextatmos:
 	if (flags.z())
 		goto wrongatmos;
 notweb:
-	playchannel0();
+	playChannel0();
 	_cmp(data.byte(kReallocation), 2);
 	_cmp(data.byte(kMapy), 0);
 	if (flags.z())
@@ -11615,10 +11615,10 @@ wrongatmos:
 	_add(bx, 5);
 	goto nextatmos;
 nomoreatmos:
-	cancelch0();
+	cancelCh0();
 }
 
-void DreamGenContext::walkintoroom() {
+void DreamGenContext::walkIntoRoom() {
 	STACK_CHECK;
 	_cmp(data.byte(kLocation), 14);
 	if (!flags.z())
@@ -11628,22 +11628,22 @@ void DreamGenContext::walkintoroom() {
 		return /* (notlair) */;
 	data.byte(kDestination) = 1;
 	data.byte(kFinaldest) = 1;
-	autosetwalk();
+	autoSetWalk();
 }
 
-void DreamGenContext::afterintroroom() {
+void DreamGenContext::afterIntroRoom() {
 	STACK_CHECK;
 	_cmp(data.byte(kNowinnewroom), 0);
 	if (flags.z())
 		return /* (notnewintro) */;
-	clearwork();
-	findroominloc();
+	clearWork();
+	findRoomInLoc();
 	data.byte(kNewobs) = 1;
-	drawfloor();
-	reelsonscreen();
-	spriteupdate();
-	printsprites();
-	worktoscreen();
+	drawFloor();
+	reelsOnScreen();
+	spriteUpdate();
+	printSprites();
+	workToScreen();
 	data.byte(kNowinnewroom) = 0;
 }
 
@@ -11663,7 +11663,7 @@ void DreamGenContext::printmessage2() {
 	ax = pop();
 searchmess:
 	push(ax);
-	findnextcolon();
+	findNextColon();
 	ax = pop();
 	_dec(ah);
 	if (!flags.z())
@@ -11673,10 +11673,10 @@ searchmess:
 	dx = pop();
 	al = 0;
 	ah = 0;
-	printdirect();
+	printDirect();
 }
 
-void DreamGenContext::setwalk() {
+void DreamGenContext::setWalk() {
 	STACK_CHECK;
 	_cmp(data.byte(kLinepointer), 254);
 	if (!flags.z())
@@ -11705,10 +11705,10 @@ void DreamGenContext::setwalk() {
 	al = data.byte(kCommand);
 	data.byte(kWalkexamnum) = al;
 notwalkandexam:
-	autosetwalk();
+	autoSetWalk();
 	return;
 cantwalk2:
-	facerightway();
+	faceRightWay();
 	return;
 alreadywalking:
 	al = data.byte(kPointerspath);
@@ -11719,7 +11719,7 @@ holdingreel:
 	data.byte(kWatchmode) = 2;
 }
 
-void DreamGenContext::workoutframes() {
+void DreamGenContext::workoutFrames() {
 	STACK_CHECK;
 	bx = data.word(kLinestartx);
 	_add(bx, 32);
@@ -11806,48 +11806,48 @@ success:
 	data.byte(kTurndirection) = 0;
 }
 
-void DreamGenContext::middlepanel() {
+void DreamGenContext::middlePanel() {
 	STACK_CHECK;
 	ds = data.word(kTempsprites);
 	di = 72+47+20;
 	bx = 0;
 	al = 48;
 	ah = 0;
-	showframe();
+	showFrame();
 	ds = data.word(kTempsprites);
 	di = 72+19;
 	bx = 21;
 	al = 47;
 	ah = 0;
-	showframe();
+	showFrame();
 	ds = data.word(kTempsprites);
 	di = 160+23;
 	bx = 0;
 	al = 48;
 	ah = 4;
-	showframe();
+	showFrame();
 	ds = data.word(kTempsprites);
 	di = 160+71;
 	bx = 21;
 	al = 47;
 	ah = 4;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::showman() {
+void DreamGenContext::showMan() {
 	STACK_CHECK;
 	ds = data.word(kIcons1);
 	di = 0;
 	bx = 0;
 	al = 0;
 	ah = 0;
-	showframe();
+	showFrame();
 	ds = data.word(kIcons1);
 	di = 0;
 	bx = 114;
 	al = 1;
 	ah = 0;
-	showframe();
+	showFrame();
 	_cmp(data.byte(kShadeson), 0);
 	if (flags.z())
 		return /* (notverycool) */;
@@ -11856,20 +11856,20 @@ void DreamGenContext::showman() {
 	bx = 25;
 	al = 2;
 	ah = 0;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::showexit() {
+void DreamGenContext::showExit() {
 	STACK_CHECK;
 	ds = data.word(kIcons1);
 	di = 274;
 	bx = 154;
 	al = 11;
 	ah = 0;
-	showframe();
+	showFrame();
 }
 
-void DreamGenContext::panelicons1() {
+void DreamGenContext::panelIcons1() {
 	STACK_CHECK;
 	di = 0;
 	_cmp(data.byte(kWatchon), 1);
@@ -11883,7 +11883,7 @@ watchison:
 	bx = 4;
 	al = 2;
 	ah = 0;
-	showframe();
+	showFrame();
 	di = pop();
 	push(di);
 	_cmp(data.byte(kZoomon), 1);
@@ -11894,10 +11894,10 @@ watchison:
 	bx = 8;
 	al = 5;
 	ah = 0;
-	showframe();
+	showFrame();
 zoomisoff:
 	di = pop();
-	showwatch();
+	showWatch();
 }
 
 void DreamGenContext::blank() {
@@ -11907,17 +11907,17 @@ void DreamGenContext::blank() {
 		return /* (alreadyblnk) */;
 	data.byte(kCommandtype) = 199;
 	al = 0;
-	commandonly();
+	commandOnly();
 }
 
-void DreamGenContext::allpointer() {
+void DreamGenContext::allPointer() {
 	STACK_CHECK;
-	readmouse();
-	showpointer();
-	dumppointer();
+	readMouse();
+	showPointer();
+	dumpPointer();
 }
 
-void DreamGenContext::getunderzoom() {
+void DreamGenContext::getUnderZoom() {
 	STACK_CHECK;
 	di = (8)+5;
 	bx = (132)+4;
@@ -11925,10 +11925,10 @@ void DreamGenContext::getunderzoom() {
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5));
 	cl = 46;
 	ch = 40;
-	multiget();
+	multiGet();
 }
 
-void DreamGenContext::dumpzoom() {
+void DreamGenContext::dumpZoom() {
 	STACK_CHECK;
 	_cmp(data.byte(kZoomon), 1);
 	if (!flags.z())
@@ -11937,10 +11937,10 @@ void DreamGenContext::dumpzoom() {
 	bx = (132)+4;
 	cl = 46;
 	ch = 40;
-	multidump();
+	multiDump();
 }
 
-void DreamGenContext::putunderzoom() {
+void DreamGenContext::putUnderZoom() {
 	STACK_CHECK;
 	di = (8)+5;
 	bx = (132)+4;
@@ -11948,10 +11948,10 @@ void DreamGenContext::putunderzoom() {
 	si = (0+(228*13)+32+60+(32*32)+(11*10*3)+768+768+768+(32*32)+(128*5)+(80*5)+(100*5)+(12*5));
 	cl = 46;
 	ch = 40;
-	multiput();
+	multiPut();
 }
 
-void DreamGenContext::undertextline() {
+void DreamGenContext::underTextLine() {
 	STACK_CHECK;
 	di = data.word(kTextaddressx);
 	bx = data.word(kTextaddressy);
@@ -11964,10 +11964,10 @@ _tmp1:
 	si = (0);
 	cl = (228);
 	ch = (13);
-	multiget();
+	multiGet();
 }
 
-void DreamGenContext::readkey() {
+void DreamGenContext::readKey() {
 	STACK_CHECK;
 	bx = data.word(kBufferout);
 	_cmp(bx, data.word(kBufferin));
@@ -11985,14 +11985,14 @@ nokey:
 	data.byte(kCurrentkey) = 0;
 }
 
-void DreamGenContext::randomnum1() {
+void DreamGenContext::randomNum1() {
 	STACK_CHECK;
 	push(ds);
 	push(es);
 	push(di);
 	push(bx);
 	push(cx);
-	randomnumber();
+	randomNumber();
 	cx = pop();
 	bx = pop();
 	di = pop();
@@ -12000,14 +12000,14 @@ void DreamGenContext::randomnum1() {
 	ds = pop();
 }
 
-void DreamGenContext::randomnum2() {
+void DreamGenContext::randomNum2() {
 	STACK_CHECK;
 	push(ds);
 	push(es);
 	push(di);
 	push(bx);
 	push(ax);
-	randomnumber();
+	randomNumber();
 	cl = al;
 	ax = pop();
 	bx = pop();
@@ -12016,81 +12016,81 @@ void DreamGenContext::randomnum2() {
 	ds = pop();
 }
 
-void DreamGenContext::getridofreels() {
+void DreamGenContext::getRidOfReels() {
 	STACK_CHECK;
 	_cmp(data.byte(kRoomloaded), 0);
 	if (flags.z())
 		return /* (dontgetrid) */;
 	es = data.word(kReel1);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReel2);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReel3);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::getridofall() {
+void DreamGenContext::getRidOfAll() {
 	STACK_CHECK;
 	es = data.word(kBackdrop);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kSetframes);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReel1);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReel2);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReel3);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kReels);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kPeople);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kSetdesc);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kBlockdesc);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kRoomdesc);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kFreeframes);
-	deallocatemem();
+	deallocateMem();
 	es = data.word(kFreedesc);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::getridoftemp() {
+void DreamGenContext::getRidOfTemp() {
 	STACK_CHECK;
 	es = data.word(kTempgraphics);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::getridoftemptext() {
+void DreamGenContext::getRidOfTempText() {
 	STACK_CHECK;
 	es = data.word(kTextfile1);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::getridoftemp2() {
+void DreamGenContext::getRidOfTemp2() {
 	STACK_CHECK;
 	es = data.word(kTempgraphics2);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::getridoftemp3() {
+void DreamGenContext::getRidOfTemp3() {
 	STACK_CHECK;
 	es = data.word(kTempgraphics3);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::getridoftempcharset() {
+void DreamGenContext::getRidOfTempCharset() {
 	STACK_CHECK;
 	es = data.word(kTempcharset);
-	deallocatemem();
+	deallocateMem();
 }
 
-void DreamGenContext::getridoftempsp() {
+void DreamGenContext::getRidOfTempsP() {
 	STACK_CHECK;
 	es = data.word(kTempsprites);
-	deallocatemem();
+	deallocateMem();
 }
 
 
diff --git a/engines/dreamweb/dreamgen.h b/engines/dreamweb/dreamgen.h
index 78c4e5c58a..156838b297 100644
--- a/engines/dreamweb/dreamgen.h
+++ b/engines/dreamweb/dreamgen.h
@@ -1096,453 +1096,453 @@ public:
 	static const uint16 kMenux = (80+40);
 	static const uint16 kLenofreelrouts = (991-534);
 
-	void usewire();
-	void getnamepos();
-	void femalefan();
-	void identifyob();
-	void uselighter();
-	void showmenu();
-	void usepoolreader();
-	void useopenbox();
-	void clearbuffers();
-	void showsymbol();
-	void getobtextstart();
-	void dumpdiarykeys();
-	void getridofreels();
-	void readkey();
+	void useWire();
+	void getNamePos();
+	void femaleFan();
+	void identifyOb();
+	void useLighter();
+	void showMenu();
+	void usePoolReader();
+	void useOpenBox();
+	void clearBuffers();
+	void showSymbol();
+	void getObTextStart();
+	void dumpDiaryKeys();
+	void getRidOfReels();
+	void readKey();
 	void louis();
-	void entrytexts();
-	void buttonenter();
-	void checkinput();
-	void setmode();
-	void getbackfromops();
-	void opensarters();
-	void putundercentre();
-	void checkobjectsize();
+	void entryTexts();
+	void buttonEnter();
+	void checkInput();
+	void setMode();
+	void getBackFromOps();
+	void openSarters();
+	void putUnderCentre();
+	void checkObjectSize();
 	void titles();
-	void deallocatemem();
-	void mainscreen();
-	void watchreel();
-	void showslots();
-	void openfilefromc();
-	void gettime();
+	void deallocateMem();
+	void mainScreen();
+	void watchReel();
+	void showSlots();
+	void openFileFromC();
+	void getTime();
 	void candles1();
-	void fadedos();
-	void runendseq();
-	void loadkeypad();
-	void findtext1();
-	void isryanholding();
-	void interupttest();
-	void usecashcard();
-	void usewall();
-	void opentomb();
-	void buttonfour();
-	void dosometalk();
-	void getanyaddir();
-	void showsaveops();
-	void intromonks1();
-	void resetlocation();
-	void intromonks2();
+	void fadeDOS();
+	void runEndSeq();
+	void loadKeypad();
+	void findText1();
+	void isRyanHolding();
+	void interruptTest();
+	void useCashCard();
+	void useWall();
+	void openTomb();
+	void buttonFour();
+	void doSomeTalk();
+	void getAnyAdDir();
+	void showSaveOps();
+	void introMonks1();
+	void resetLocation();
+	void introMonks2();
 	void advisor();
-	void additionaltext();
-	void dofade();
-	void useelevator5();
-	void useelevator4();
-	void useelevator1();
-	void useelevator3();
-	void useelevator2();
-	void buttonone();
-	void keyboardread();
-	void entercode();
-	void getopenedsize();
-	void doshake();
-	void resetkeyboard();
-	void soundstartup();
-	void slabdoora();
-	void slabdoorc();
-	void slabdoorb();
-	void slabdoore();
-	void slabdoord();
-	void adjustup();
-	void slabdoorf();
-	void loadintroroom();
-	void mousecall();
+	void additionalText();
+	void doFade();
+	void useElevator5();
+	void useElevator4();
+	void useElevator1();
+	void useElevator3();
+	void useElevator2();
+	void buttonOne();
+	void keyboardRead();
+	void enterCode();
+	void getOpenedSize();
+	void doShake();
+	void resetKeyboard();
+	void soundStartup();
+	void sLabDoorA();
+	void sLabDoorC();
+	void sLabDoorB();
+	void sLabDoorE();
+	void sLabDoorD();
+	void adjustUp();
+	void sLabDoorF();
+	void loadIntroRoom();
+	void mouseCall();
 	void train();
-	void fadedownmon();
-	void loadcart();
+	void fadeDownMon();
+	void loadCart();
 	void bartender();
-	void showdiary();
-	void outofopen();
-	void dircom();
-	void dumpkeypad();
-	void dumpzoom();
-	void endgameseq();
-	void setbotleft();
-	void findfirstpath();
-	void loadold();
-	void useslab();
-	void usealtar();
-	void manasleep2();
-	void moretalk();
-	void starttalk();
-	void delchar();
-	void getanyad();
-	void endgame();
-	void usepipe();
-	void getunderzoom();
+	void showDiary();
+	void outOfOpen();
+	void dirCom();
+	void dumpKeypad();
+	void dumpZoom();
+	void endGameSeq();
+	void setBotLeft();
+	void findFirstPath();
+	void loadOld();
+	void useSLab();
+	void useAltar();
+	void manAsleep2();
+	void moreTalk();
+	void startTalk();
+	void delChar();
+	void getAnyAd();
+	void endGame();
+	void usePipe();
+	void getUnderZoom();
 	void candles();
-	void backobject();
-	void rollendcredits2();
+	void backObject();
+	void rollEndCredits2();
 	void reminders();
-	void selectslot2();
-	void runtap();
+	void selectSlot2();
+	void runTap();
 	void talk();
-	void getridoftemp2();
-	void usebalcony();
+	void getRidOfTemp2();
+	void useBalcony();
 	void decide();
-	void disablesoundint();
-	void priesttext();
-	void openpoolboss();
-	void buttontwo();
-	void fadescreendownhalf();
-	void useplate();
-	void lookininterface();
-	void manasleep();
-	void hotelbell();
-	void loadspeech();
-	void adjustleft();
-	void calledenslift();
-	void useclearbox();
-	void entryanims();
-	void getfreead();
-	void showarrows();
-	void walkintoroom();
-	void usehatch();
-	void printoutermon();
-	void setuppit();
-	void showpcx();
-	void showdecisions();
-	void showkeypad();
-	void removeobfrominv();
-	void usecoveredbox();
-	void openyourneighbour();
-	void fadescreenuphalf();
-	void getridoftempcharset();
+	void disableSoundInt();
+	void priestText();
+	void openPoolBoss();
+	void buttonTwo();
+	void fadeScreenDownHalf();
+	void usePlate();
+	void lookInInterface();
+	void manAsleep();
+	void hotelBell();
+	void loadSpeech();
+	void adjustLeft();
+	void callEdensLift();
+	void useClearBox();
+	void entryAnims();
+	void getFreeAd();
+	void showArrows();
+	void walkIntoRoom();
+	void useHatch();
+	void printOuterMon();
+	void setupPit();
+	void showPCX();
+	void showDecisions();
+	void showKeypad();
+	void removeObFromInv();
+	void useCoveredBox();
+	void openYourNeighbour();
+	void fadeScreenUpHalf();
+	void getRidOfTempCharset();
 	void heavy();
-	void usekey();
-	void locklighton();
-	void useladderb();
-	void discops();
-	void middlepanel();
-	void monitorlogo();
-	void entersymbol();
-	void dirfile();
-	void pickupconts();
-	void locklightoff();
-	void wearwatch();
-	void runintroseq();
-	void nextcolon();
+	void useKey();
+	void lockLightOn();
+	void useLadderB();
+	void discOps();
+	void middlePanel();
+	void monitorLogo();
+	void enterSymbol();
+	void dirFile();
+	void pickupConts();
+	void lockLightOff();
+	void wearWatch();
+	void runIntroSeq();
+	void nextColon();
 	void attendant();
-	void nextsymbol();
+	void nextSymbol();
 	void monks2text();
-	void clearpalette();
-	void cantdrop();
-	void getridofall();
+	void clearPalette();
+	void cantDrop();
+	void getRidOfAll();
 	void copper();
-	void openhoteldoor();
+	void openHotelDoor();
 	void blank();
 	void drinker();
-	void placefreeobject();
-	void allpalette();
+	void placeFreeObject();
+	void allPalette();
 	void rockstar();
-	void adjustright();
-	void putunderzoom();
-	void vsync();
-	void findinvpos();
-	void dumpmenu();
-	void liftnoise();
-	void workoutframes();
-	void dumpsymbox();
-	void loadgame();
-	void getridoftemp();
-	void dumpsymbol();
-	void buttonsix();
-	void intro2text();
-	void showouterpad();
-	void getkeyandlogo();
-	void selectob();
-	void useplinth();
-	void usecooker();
-	void loadmenu();
-	void checkforemm();
+	void adjustRight();
+	void putUnderZoom();
+	void vSync();
+	void findInvPos();
+	void dumpMenu();
+	void liftNoise();
+	void workoutFrames();
+	void dumpSymBox();
+	void loadGame();
+	void getRidOfTemp();
+	void dumpSymbol();
+	void buttonSix();
+	void intro2Text();
+	void showOuterPad();
+	void getKeyAndLogo();
+	void selectOb();
+	void usePlinth();
+	void useCooker();
+	void loadMenu();
+	void checkForEMM();
 	void receptionist();
-	void selectslot();
-	void openfilenocheck();
-	void fadeupmon();
-	void fadetowhite();
-	void loadsavebox();
-	void soundend();
+	void selectSlot();
+	void openFileNoCheck();
+	void fadeUpMon();
+	void fadeToWhite();
+	void loadSaveBox();
+	void soundEnd();
 	void redes();
-	void errormessage1();
-	void errormessage2();
-	void errormessage3();
-	void intromagic2();
-	void intromagic3();
-	void edeninbath();
-	void intromagic1();
-	void showdiarypage();
-	void useshield();
-	void getbacktoops();
-	void rollendcredits();
-	void intro1text();
-	void transfertoex();
-	void reexfrominv();
-	void examinventory();
-	void getridoftemp3();
-	void usedryer();
-	void outofinv();
-	void diarykeyp();
-	void reexfromopen();
-	void mansatstill();
-	void transfermap();
-	void showmonk();
-	void diarykeyn();
-	void set16colpalette();
+	void errorMessage1();
+	void errorMessage2();
+	void errorMessage3();
+	void introMagic2();
+	void introMagic3();
+	void edenInBath();
+	void introMagic1();
+	void showDiaryPage();
+	void useShield();
+	void getBackToOps();
+	void rollEndCredits();
+	void intro1Text();
+	void transferToEx();
+	void reExFromInv();
+	void examineInventory();
+	void getRidOfTemp3();
+	void useDryer();
+	void outOfInv();
+	void diaryKeyP();
+	void reExFromOpen();
+	void manSatStill();
+	void transferMap();
+	void showMonk();
+	void diaryKeyN();
+	void set16ColPalette();
 	void interviewer();
-	void purgeanitem();
+	void purgeAnItem();
 	void madman();
-	void enablesoundint();
-	void madmanstelly();
-	void purgealocation();
-	void getridofpit();
-	void nothelderror();
-	void getsetad();
+	void enableSoundInt();
+	void madmansTelly();
+	void purgeALocation();
+	void getRidOfPit();
+	void notHeldError();
+	void getSetAd();
 	void soldier1();
-	void getundercentre();
-	void checkforexit();
-	void loadseg();
-	void showkeys();
-	void setkeyboardint();
+	void getUnderCentre();
+	void checkForExit();
+	void loadSeg();
+	void showKeys();
+	void setKeyboardInt();
 	void priest();
 	void printmessage2();
-	void loadnews();
-	void rollem();
-	void hangonpq();
-	void savegame();
-	void findopenpos();
-	void describeob();
-	void deleteexframe();
-	void bossman();
-	void dosreturn();
-	void wheelsound();
-	void playguitar();
-	void searchforsame();
+	void loadNews();
+	void rollEm();
+	void hangOnPQ();
+	void saveGame();
+	void findOpenPos();
+	void describeOb();
+	void deleteExFrame();
+	void bossMan();
+	void DOSReturn();
+	void wheelSound();
+	void playGuitar();
+	void searchForSame();
 	void chewy();
-	void getback1();
-	void fadefromwhite();
-	void usewindow();
-	void wearshades();
-	void deleverything();
-	void fadescreendown();
-	void poolguard();
-	void openinv();
-	void lookatplace();
-	void useaxe();
-	void buttonnought();
-	void useelvdoor();
-	void putbackobstuff();
-	void useladder();
-	void realcredits();
-	void handclap();
-	void smokebloke();
-	void afterintroroom();
-	void buttonnine();
-	void findallopen();
-	void readfromfile();
-	void initialinv();
-	void quitsymbol();
-	void settopright();
-	void findsetobject();
-	void singlekey();
-	void hangone();
-	void carparkdrip();
-	void usediary();
-	void deleteexobject();
-	void moneypoke();
-	void destselect();
-	void lastdest();
-	void removefreeobject();
-	void trapdoor();
-	void openlouis();
-	void buttonthree();
-	void lookatcard();
+	void getBack1();
+	void fadeFromWhite();
+	void useWindow();
+	void wearShades();
+	void delEverything();
+	void fadeScreenDown();
+	void poolGuard();
+	void openInv();
+	void lookAtPlace();
+	void useAxe();
+	void buttonNought();
+	void useElvDoor();
+	void putBackObStuff();
+	void useLadder();
+	void realCredits();
+	void handClap();
+	void smokeBloke();
+	void afterIntroRoom();
+	void buttonNine();
+	void findAllOpen();
+	void readFromFile();
+	void initialInv();
+	void quitSymbol();
+	void setTopRight();
+	void findSetObject();
+	void singleKey();
+	void hangOne();
+	void carParkDrip();
+	void useDiary();
+	void deleteExObject();
+	void moneyPoke();
+	void destSelect();
+	void lastDest();
+	void removeFreeObject();
+	void trapDoor();
+	void openLouis();
+	void buttonThree();
+	void lookAtCard();
 	void helicopter();
-	void setsoundoff();
-	void setpickup();
-	void dropobject();
-	void isitright();
-	void openob();
-	void drawitall();
-	void usestereo();
+	void setSoundOff();
+	void setPickup();
+	void dropObject();
+	void isItRight();
+	void openOb();
+	void drawItAll();
+	void useStereo();
 	void candles2();
-	void pickupob();
+	void pickupOb();
 	void error();
-	void showopbox();
-	void clearbeforeload();
-	void biblequote();
-	void doload();
-	void showexit();
-	void usetrainer();
-	void addtopresslist();
-	void dumpcurrent();
-	void showdiarykeys();
-	void dontloadseg();
-	void intro3text();
-	void allocatemem();
-	void useopened();
+	void showOpBox();
+	void clearBeforeLoad();
+	void bibleQuote();
+	void doLoad();
+	void showExit();
+	void useTrainer();
+	void addToPressList();
+	void dumpCurrent();
+	void showDiaryKeys();
+	void dontLoadSeg();
+	void intro3Text();
+	void allocateMem();
+	void useOpened();
 	void inventory();
-	void fillopen();
-	void signon();
-	void deleteextext();
-	void foghornsound();
-	void showloadops();
-	void examicon();
-	void showgun();
-	void louischair();
-	void locationpic();
-	void opentvdoor();
-	void triggermessage();
-	void smallcandle();
-	void swapwithopen();
+	void fillOpen();
+	void signOn();
+	void deleteExText();
+	void foghornSound();
+	void showLoadOps();
+	void examIcon();
+	void showGun();
+	void louisChair();
+	void locationPic();
+	void openTVDoor();
+	void triggerMessage();
+	void smallCandle();
+	void swapWithOpen();
 	void dreamweb();
-	void droperror();
-	void edenscdplayer();
-	void calledensdlift();
-	void checkinside();
+	void dropError();
+	void edensCDPlayer();
+	void callEdensDLift();
+	void checkInside();
 	void gates();
-	void newgame();
-	void setwalk();
-	void findpathofpoint();
-	void issetobonmap();
-	void getdestinfo();
+	void newGame();
+	void setWalk();
+	void findPathOfPoint();
+	void isSetObOnMap();
+	void getDestInfo();
 	void drunk();
-	void getridoftemptext();
-	void setuptimeduse();
-	void grafittidoor();
-	void nextdest();
-	void makecaps();
+	void getRidOfTempText();
+	void setupTimedUse();
+	void grafittiDoor();
+	void nextDest();
+	void makeCaps();
 	void read();
-	void fadescreenups();
-	void hotelcontrol();
+	void fadeScreenUps();
+	void hotelControl();
 	void mugger();
 	void atmospheres();
-	void loadpersonal();
-	void gettingshot();
-	void settopleft();
-	void searchforstring();
-	void selectopenob();
+	void loadPersonal();
+	void gettingShot();
+	void setTopLeft();
+	void searchForString();
+	void selectOpenOb();
 	void security();
-	void buttonfive();
-	void soundonreels();
-	void usegun();
-	void autoappear();
-	void openryan();
-	void callhotellift();
-	void showman();
-	void usefullcart();
-	void newplace();
-	void loadsample();
-	void usecardreader1();
-	void usecardreader2();
-	void usecardreader3();
-	void tattooman();
-	void usehandle();
-	void openfile();
-	void showpuztext();
-	void incryanpage();
-	void greyscalesum();
-	void buttoneight();
-	void findexobject();
-	void clearchanges();
-	void usechurchhole();
-	void searchforfiles();
-	void monkspeaking();
-	void clearrest();
+	void buttonFive();
+	void soundOnReels();
+	void useGun();
+	void autoAppear();
+	void openRyan();
+	void callHotelLift();
+	void showMan();
+	void useFullCart();
+	void newPlace();
+	void loadSample();
+	void useCardReader1();
+	void useCardReader2();
+	void useCardReader3();
+	void tattooMan();
+	void useHandle();
+	void openFile();
+	void showPuzText();
+	void incRyanPage();
+	void greyscaleSum();
+	void buttonEight();
+	void findExObject();
+	void clearChanges();
+	void useChurchHole();
+	void searchForFiles();
+	void monkSpeaking();
+	void clearRest();
 	void credits();
-	void madmanrun();
-	void randomnum1();
+	void madmanRun();
+	void randomNum1();
 	void keeper();
-	void afternewroom();
-	void getexad();
-	void closefile();
-	void initialmoncols();
-	void checkforshake();
-	void usebuttona();
-	void fadescreenup();
-	void generalerror();
+	void afterNewRoom();
+	void getExAd();
+	void closeFile();
+	void initialMonCols();
+	void checkForShake();
+	void useButtonA();
+	void fadeScreenUp();
+	void generalError();
 	void mode640x480();
-	void openeden();
-	void execcommand();
-	void obsthatdothings();
-	void updatesymbolbot();
-	void findpuztext();
-	void usechurchgate();
-	void monkandryan();
-	void swapwithinv();
-	void usecontrol();
-	void buttonseven();
-	void redrawmainscrn();
-	void showgroup();
-	void buttonpress();
-	void makemainscreen();
-	void usewinch();
-	void setbotright();
-	void mainman();
+	void openEden();
+	void execCommand();
+	void obsThatDoThings();
+	void updateSymbolBot();
+	void findPuzText();
+	void useChurchGate();
+	void monkAndRyan();
+	void swapWithInv();
+	void useControl();
+	void buttonSeven();
+	void redrawMainScrn();
+	void showGroup();
+	void buttonPress();
+	void makeMainScreen();
+	void useWinch();
+	void setBotRight();
+	void mainMan();
 	void aide();
-	void geteitherad();
-	void zoomonoff();
-	void updatesymboltop();
-	void allpointer();
-	void checksoundint();
-	void clearreels();
-	void malefan();
-	void dosaveload();
-	void createname();
-	void readcitypic();
-	void getpersontext();
-	void intoinv();
+	void getEitherAd();
+	void zoomOnOff();
+	void updateSymbolTop();
+	void allPointer();
+	void checkSoundInt();
+	void clearReels();
+	void maleFan();
+	void doSaveLoad();
+	void createName();
+	void readCityPic();
+	void getPersonText();
+	void inToInv();
 	void parser();
-	void setmouse();
+	void setMouse();
 	void intro();
-	void fadescreendowns();
-	void openhoteldoor2();
-	void getridoftempsp();
-	void scanfornames();
-	void selectlocation();
-	void undertextline();
-	void sitdowninbar();
-	void shownames();
-	void savefileread();
-	void emergencypurge();
-	void usemenu();
-	void alleybarksound();
-	void usecart();
-	void intromusic();
-	void quitkey();
-	void processtrigger();
-	void volumeadjust();
-	void randomnum2();
-	void loadsecondsample();
-	void transfercontoex();
-	void businessman();
-	void panelicons1();
-	void adjustdown();
-	void withwhat();
-	void createfile();
-	void userailing();
-	void usehole();
-	void useobject();
-	void readdesticon();
+	void fadeScreenDowns();
+	void openHotelDoor2();
+	void getRidOfTempsP();
+	void scanForNames();
+	void selectLocation();
+	void underTextLine();
+	void sitDownInBar();
+	void showNames();
+	void saveFileRead();
+	void emergencyPurge();
+	void useMenu();
+	void alleyBarkSound();
+	void useCart();
+	void introMusic();
+	void quitKey();
+	void processTrigger();
+	void volumeAdjust();
+	void randomNum2();
+	void loadSecondSample();
+	void transferConToEx();
+	void businessMan();
+	void panelIcons1();
+	void adjustDown();
+	void withWhat();
+	void createFile();
+	void useRailing();
+	void useHole();
+	void useObject();
+	void readDestIcon();
 };
 }
 
diff --git a/engines/dreamweb/dreamweb.cpp b/engines/dreamweb/dreamweb.cpp
index 84790d40b2..4781647ce1 100644
--- a/engines/dreamweb/dreamweb.cpp
+++ b/engines/dreamweb/dreamweb.cpp
@@ -93,8 +93,8 @@ void DreamWebEngine::waitForVSync() {
 		setVSyncInterrupt(false);
 	}
 
-	_context.doshake();
-	_context.dofade();
+	_context.doShake();
+	_context.doFade();
 	_system->updateScreen();
 }
 
@@ -203,7 +203,6 @@ void DreamWebEngine::processEvents() {
 	}
 }
 
-
 Common::Error DreamWebEngine::run() {
 	syncSoundSettings();
 	_console = new DreamWebConsole(this);
@@ -289,7 +288,6 @@ uint DreamWebEngine::readFromSaveFile(uint8 *data, uint size) {
 	return _inSaveFile->read(data, size);
 }
 
-
 void DreamWebEngine::keyPressed(uint16 ascii) {
 	debug(2, "key pressed = %04x", ascii);
 	uint8* keybuf = _context.data.ptr(5912, 16); //fixme: some hardcoded offsets are not added as consts
@@ -365,7 +363,6 @@ void DreamWebEngine::setPalette(const uint8 *data, uint start, uint count) {
 	_system->getPaletteManager()->setPalette(fixed, start, count);
 }
 
-
 void DreamWebEngine::blit(const uint8 *src, int pitch, int x, int y, int w, int h) {
 	if (y + h > 200)
 		h = 200 - y;
@@ -485,11 +482,10 @@ bool DreamWebEngine::loadSpeech(const Common::String &filename) {
 	return true;
 }
 
-
 void DreamWebEngine::soundHandler() {
 	_context.data.byte(_context.kSubtitles) = ConfMan.getBool("subtitles");
 	_context.push(_context.ax);
-	_context.volumeadjust();
+	_context.volumeAdjust();
 	_context.ax = _context.pop();
 
 	uint volume = _context.data.byte(DreamGen::DreamGenContext::kVolume);
diff --git a/engines/dreamweb/keypad.cpp b/engines/dreamweb/keypad.cpp
index de5a560af1..0867ffd2ab 100644
--- a/engines/dreamweb/keypad.cpp
+++ b/engines/dreamweb/keypad.cpp
@@ -24,12 +24,12 @@
 
 namespace DreamGen {
 
-void DreamGenContext::getundermenu() {
-	multiget(segRef(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
+void DreamGenContext::getUnderMenu() {
+	multiGet(segRef(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
 }
 
-void DreamGenContext::putundermenu() {
-	multiput(segRef(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
+void DreamGenContext::putUnderMenu() {
+	multiPut(segRef(data.word(kBuffers)).ptr(kUndertimedtext, 0), kMenux, kMenuy, 48, 48);
 }
 
 } /*namespace dreamgen */
diff --git a/engines/dreamweb/monitor.cpp b/engines/dreamweb/monitor.cpp
index cb41e75552..42a8f41e22 100644
--- a/engines/dreamweb/monitor.cpp
+++ b/engines/dreamweb/monitor.cpp
@@ -30,7 +30,7 @@ struct MonitorKeyEntry {
 	char  b2[24];
 };
 
-void DreamGenContext::usemon() {
+void DreamGenContext::useMon() {
 	data.byte(kLasttrigger) = 0;
 	memset(cs.ptr(kCurrentfile+1, 0), ' ', 12);
 	memset(cs.ptr(offset_operand1+1, 0), ' ', 12);
@@ -41,33 +41,33 @@ void DreamGenContext::usemon() {
 	monitorKeyEntries[2].b0 = 0;
 	monitorKeyEntries[3].b0 = 0;
 
-	createpanel();
-	showpanel();
-	showicon();
-	drawfloor();
-	getridofall();
-	loadintotemp("DREAMWEB.G03");
-	loadpersonal();
-	loadnews();
-	loadcart();
-	loadtempcharset("DREAMWEB.C01");
-	printoutermon();
-	initialmoncols();
-	printlogo();
-	worktoscreen();
-	turnonpower();
-	fadeupyellows();
-	fadeupmonfirst();
+	createPanel();
+	showPanel();
+	showIcon();
+	drawFloor();
+	getRidOfAll();
+	loadIntoTemp("DREAMWEB.G03");
+	loadPersonal();
+	loadNews();
+	loadCart();
+	loadTempCharset("DREAMWEB.C01");
+	printOuterMon();
+	initialMonCols();
+	printLogo();
+	workToScreen();
+	turnOnPower();
+	fadeupYellows();
+	fadeupMonFirst();
 	data.word(kMonadx) = 76;
 	data.word(kMonady) = 141;
-	monmessage(1);
-	hangoncurs(120);
-	monmessage(2);
-	randomaccess(60);
-	monmessage(3);
-	hangoncurs(100);
-	printlogo();
-	scrollmonitor();
+	monMessage(1);
+	hangOnCurs(120);
+	monMessage(2);
+	randomAccess(60);
+	monMessage(3);
+	hangOnCurs(100);
+	printLogo();
+	scrollMonitor();
 	data.word(kBufferin) = 0;
 	data.word(kBufferout) = 0;
 	do {
@@ -80,42 +80,42 @@ void DreamGenContext::usemon() {
 		di = pop();
 		data.word(kMonadx) = di;
 		data.word(kMonady) = bx;
-		execcommand();
+		execCommand();
 		if (quitRequested()) //TODO : Check why it crashes when put before the execcommand
 			break;
 	} while (al == 0);
-	getridoftemp();
-	getridoftempcharset();
-	deallocatemem(data.word(kTextfile1));
-	deallocatemem(data.word(kTextfile2));
-	deallocatemem(data.word(kTextfile3));
+	getRidOfTemp();
+	getRidOfTempCharset();
+	deallocateMem(data.word(kTextfile1));
+	deallocateMem(data.word(kTextfile2));
+	deallocateMem(data.word(kTextfile3));
 	data.byte(kGetback) = 1;
-	playchannel1(26);
+	playChannel1(26);
 	data.byte(kManisoffscreen) = 0;
-	restoreall();
-	redrawmainscrn();
-	worktoscreenm();
+	restoreAll();
+	redrawMainScrn();
+	workToScreenM();
 }
 
-void DreamGenContext::printlogo() {
-	showframe(tempGraphics(), 56, 32, 0, 0);
-	showcurrentfile();
+void DreamGenContext::printLogo() {
+	showFrame(tempGraphics(), 56, 32, 0, 0);
+	showCurrentFile();
 }
 
 void DreamGenContext::input() {
 	char *inputLine = (char *)cs.ptr(kInputline, 64);
 	memset(inputLine, 0, 64);
 	data.word(kCurpos) = 0;
-	printchar(tempCharset(), data.word(kMonadx), data.word(kMonady), '>', 0, NULL, NULL);
-	multidump(data.word(kMonadx), data.word(kMonady), 6, 8);
+	printChar(tempCharset(), data.word(kMonadx), data.word(kMonady), '>', 0, NULL, NULL);
+	multiDump(data.word(kMonadx), data.word(kMonady), 6, 8);
 	data.word(kMonadx) += 6;
 	data.word(kCurslocx) = data.word(kMonadx);
 	data.word(kCurslocy) = data.word(kMonady);
 	while (true) {
-		printcurs();
-		vsync();
-		delcurs();
-		readkey();
+		printCurs();
+		vSync();
+		delCurs();
+		readKey();
 		if (quitRequested())
 			return;
 		uint8 currentKey = data.byte(kCurrentkey);
@@ -125,7 +125,7 @@ void DreamGenContext::input() {
 			return;
 		if (currentKey == 8) {
 			if (data.word(kCurpos) > 0)
-				delchar();
+				delChar();
 			continue;
 		}
 		if (data.word(kCurpos) == 28)
@@ -133,14 +133,14 @@ void DreamGenContext::input() {
 		if ((currentKey == 32) && (data.word(kCurpos) == 0))
 			continue;
 		al = currentKey;
-		makecaps();
+		makeCaps();
 		currentKey = al;
 		inputLine[data.word(kCurpos) * 2 + 0] = currentKey;
 		if (currentKey > 'Z')
 			continue;
-		multiget(segRef(data.word(kMapstore)).ptr(data.word(kCurpos) * 256, 0), data.word(kMonadx), data.word(kMonady), 8, 8);
+		multiGet(segRef(data.word(kMapstore)).ptr(data.word(kCurpos) * 256, 0), data.word(kMonadx), data.word(kMonady), 8, 8);
 		uint8 charWidth;
-		printchar(tempCharset(), data.word(kMonadx), data.word(kMonady), currentKey, 0, &charWidth, NULL);
+		printChar(tempCharset(), data.word(kMonadx), data.word(kMonady), currentKey, 0, &charWidth, NULL);
 		inputLine[data.word(kCurpos) * 2 + 1] = charWidth;
 		data.word(kMonadx) += charWidth;
 		++data.word(kCurpos);
@@ -148,7 +148,7 @@ void DreamGenContext::input() {
 	}
 }
 
-void DreamGenContext::printcurs() {
+void DreamGenContext::printCurs() {
 	uint16 x = data.word(kCurslocx);
 	uint16 y = data.word(kCurslocy);
 	uint16 height;
@@ -157,14 +157,14 @@ void DreamGenContext::printcurs() {
 		height = 11;
 	} else
 		height = 8;
-	multiget(textUnder(), x, y, 6, height);
+	multiGet(textUnder(), x, y, 6, height);
 	++data.word(kMaintimer);
 	if ((data.word(kMaintimer) & 16) == 0)
-		showframe(tempCharset(), x, y, '/' - 32, 0);
-	multidump(x - 6, y, 12, height);
+		showFrame(tempCharset(), x, y, '/' - 32, 0);
+	multiDump(x - 6, y, 12, height);
 }
 
-void DreamGenContext::delcurs() {
+void DreamGenContext::delCurs() {
 	uint16 x = data.word(kCurslocx);
 	uint16 y = data.word(kCurslocy);
 	uint16 width = 6;
@@ -174,95 +174,95 @@ void DreamGenContext::delcurs() {
 		height = 11;
 	} else
 		height = 8;
-	multiput(textUnder(), x, y, width, height);
-	multidump(x, y, width, height);
+	multiPut(textUnder(), x, y, width, height);
+	multiDump(x, y, width, height);
 }
 
-void DreamGenContext::hangoncurs() {
-	hangoncurs(cx);
+void DreamGenContext::hangOnCurs() {
+	hangOnCurs(cx);
 }
 
-void DreamGenContext::scrollmonitor() {
-	printlogo();
-	printundermon();
+void DreamGenContext::scrollMonitor() {
+	printLogo();
+	printUnderMon();
 	workToScreenCPP();
-	playchannel1(25);
+	playChannel1(25);
 }
 
-void DreamGenContext::showcurrentfile() {
+void DreamGenContext::showCurrentFile() {
 	uint16 x = 178; // TODO: Looks like this hardcoded constant in the asm doesn't match the frame
 	const char *currentFile = (const char *)cs.ptr(kCurrentfile+1, 0);
 	while (*currentFile) {
 		char c = *currentFile++;
 		c = engine->modifyChar(c);
-		printchar(tempCharset(), &x, 37, c, 0, NULL, NULL);
+		printChar(tempCharset(), &x, 37, c, 0, NULL, NULL);
 	}
 }
 
-void DreamGenContext::accesslighton() {
-	showframe(tempGraphics(), 74, 182, 8, 0);
-	multidump(74, 182, 12, 8);
+void DreamGenContext::accessLightOn() {
+	showFrame(tempGraphics(), 74, 182, 8, 0);
+	multiDump(74, 182, 12, 8);
 }
 
-void DreamGenContext::accesslightoff() {
-	showframe(tempGraphics(), 74, 182, 7, 0);
-	multidump(74, 182, 12, 8);
+void DreamGenContext::accessLightOff() {
+	showFrame(tempGraphics(), 74, 182, 7, 0);
+	multiDump(74, 182, 12, 8);
 }
 
-void DreamGenContext::randomaccess() {
-	randomaccess(cx);
+void DreamGenContext::randomAccess() {
+	randomAccess(cx);
 }
 
-void DreamGenContext::randomaccess(uint16 count) {
+void DreamGenContext::randomAccess(uint16 count) {
 	for (uint16 i = 0; i < count; ++i) {
-		vsync();
-		vsync();
+		vSync();
+		vSync();
 		uint16 v = engine->randomNumber() & 15;
 		if (v < 10)
-			accesslightoff();
+			accessLightOff();
 		else
-			accesslighton();
+			accessLightOn();
 	}
-	accesslightoff();
+	accessLightOff();
 }
 
-void DreamGenContext::monmessage() {
-	monmessage(al);
+void DreamGenContext::monMessage() {
+	monMessage(al);
 }
 
-void DreamGenContext::monmessage(uint8 index) {
+void DreamGenContext::monMessage(uint8 index) {
 	assert(index > 0);
 	const char *string = (const char *)segRef(data.word(kTextfile1)).ptr(kTextstart, 0);
 	for (uint8 i = 0; i < index; ++i) {
 		while (*string++ != '+') {
 		}
 	}
-	monprint(string);
+	monPrint(string);
 }
 
-void DreamGenContext::neterror() {
-	monmessage(5);
-	scrollmonitor();
+void DreamGenContext::netError() {
+	monMessage(5);
+	scrollMonitor();
 }
 
-void DreamGenContext::powerlighton() {
-	showframe(tempGraphics(), 257+4, 182, 6, 0);
-	multidump(257+4, 182, 12, 8);
+void DreamGenContext::powerLightOn() {
+	showFrame(tempGraphics(), 257+4, 182, 6, 0);
+	multiDump(257+4, 182, 12, 8);
 }
 
-void DreamGenContext::powerlightoff() {
-	showframe(tempGraphics(), 257+4, 182, 5, 0);
-	multidump(257+4, 182, 12, 8);
+void DreamGenContext::powerLightOff() {
+	showFrame(tempGraphics(), 257+4, 182, 5, 0);
+	multiDump(257+4, 182, 12, 8);
 }
 
-void DreamGenContext::turnonpower() {
+void DreamGenContext::turnOnPower() {
 	for (size_t i = 0; i < 3; ++i) {
-		powerlighton();
-		hangon(30);
-		powerlightoff();
-		hangon(30);
+		powerLightOn();
+		hangOn(30);
+		powerLightOff();
+		hangOn(30);
 	}
-	powerlighton();
+	powerLightOn();
 }
 
 
diff --git a/engines/dreamweb/object.cpp b/engines/dreamweb/object.cpp
index 9378729665..a01da08700 100644
--- a/engines/dreamweb/object.cpp
+++ b/engines/dreamweb/object.cpp
@@ -24,71 +24,71 @@
 
 namespace DreamGen {
 
-void DreamGenContext::fillryan() {
+void DreamGenContext::fillRyan() {
 	uint8 *inv = segRef(data.word(kBuffers)).ptr(kRyaninvlist, 60);
-	findallryan(inv);
+	findAllRyan(inv);
 	inv += data.byte(kRyanpage) * 2 * 10;
 	for (size_t i = 0; i < 2; ++i) {
 		for (size_t j = 0; j < 5; ++j) {
 			uint8 objIndex = *inv++;
 			uint8 objType = *inv++;
-			obtoinv(objIndex, objType, kInventx + j * kItempicsize, kInventy + i * kItempicsize);
+			obToInv(objIndex, objType, kInventx + j * kItempicsize, kInventy + i * kItempicsize);
 		}
 	}
-	showryanpage();
+	showRyanPage();
 }
 
-void DreamGenContext::isitworn() {
-	flags._z = isitworn((const DynObject *)es.ptr(bx, sizeof(DynObject)));
+void DreamGenContext::isItWorn() {
+	flags._z = isItWorn((const DynObject *)es.ptr(bx, sizeof(DynObject)));
 }
 
-bool DreamGenContext::isitworn(const DynObject *object) {
+bool DreamGenContext::isItWorn(const DynObject *object) {
 	return (object->id[0] == 'W'-'A') && (object->id[1] == 'E'-'A');
 }
 
-void DreamGenContext::wornerror() {
+void DreamGenContext::wornError() {
 	data.byte(kCommandtype) = 255;
-	delpointer();
-	printmessage(76, 21, 57, 240, false);
-	worktoscreenm();
-	hangonp(50);
-	showpanel();
-	showman();
-	examicon();
+	delPointer();
+	printMessage(76, 21, 57, 240, false);
+	workToScreenM();
+	hangOnP(50);
+	showPanel();
+	showMan();
+	examIcon();
 	data.byte(kCommandtype) = 255;
-	worktoscreenm();
+	workToScreenM();
 }
 
-void DreamGenContext::makeworn() {
-	makeworn((DynObject *)es.ptr(bx, sizeof(DynObject)));
+void DreamGenContext::makeWorn() {
+	makeWorn((DynObject *)es.ptr(bx, sizeof(DynObject)));
 }
 
-void DreamGenContext::makeworn(DynObject *object) {
+void DreamGenContext::makeWorn(DynObject *object) {
 	object->id[0] = 'W'-'A';
 	object->id[1] = 'E'-'A';
 }
 
-void DreamGenContext::obtoinv() {
-	obtoinv(al, ah, di, bx);
+void DreamGenContext::obToInv() {
+	obToInv(al, ah, di, bx);
 }
 
-void DreamGenContext::obtoinv(uint8 index, uint8 flag, uint16 x, uint16 y) {
+void DreamGenContext::obToInv(uint8 index, uint8 flag, uint16 x, uint16 y) {
 	Frame *icons1 = (Frame *)segRef(data.word(kIcons1)).ptr(0, 0);
-	showframe(icons1, x - 2, y - 1, 10, 0);
+	showFrame(icons1, x - 2, y - 1, 10, 0);
 	if (index == 0xff)
 		return;
 
 	Frame *extras = (Frame *)segRef(data.word(kExtras)).ptr(0, 0);
 	Frame *frees = (Frame *)segRef(data.word(kFreeframes)).ptr(0, 0);
 	Frame *frames = (flag == 4) ? extras : frees;
-	showframe(frames, x + 18, y + 19, 3 * index + 1, 128);
-	const DynObject *object = (const DynObject *)getanyaddir(index, flag);
-	bool worn = isitworn(object);
+	showFrame(frames, x + 18, y + 19, 3 * index + 1, 128);
+	const DynObject *object = (const DynObject *)getAnyAdDir(index, flag);
+	bool worn = isItWorn(object);
 	if (worn)
-		showframe(icons1, x - 3, y - 2, 7, 0);
+		showFrame(icons1, x - 3, y - 2, 7, 0);
 }
 
-void DreamGenContext::obpicture() {
+void DreamGenContext::obPicture() {
 	if (data.byte(kObjecttype) == 1)
 		return;
 	Frame *frames;
@@ -97,21 +97,21 @@ void DreamGenContext::obpicture() {
 	else
 		frames = (Frame *)segRef(data.word(kFreeframes)).ptr(0, 0);
 	uint8 frame = 3 * data.byte(kCommand) + 1;
-	showframe(frames, 160, 68, frame, 0x80);
+	showFrame(frames, 160, 68, frame, 0x80);
 }
 
-void DreamGenContext::obicons() {
+void DreamGenContext::obIcons() {
 	uint8 value1, value2;
-	getanyad(&value1, &value2);
+	getAnyAd(&value1, &value2);
 	if (value1 != 0xff) {
 		// can open it
-		showframe((Frame *)segRef(data.word(kIcons2)).ptr(0, 0), 210, 1, 4, 0);
+		showFrame((Frame *)segRef(data.word(kIcons2)).ptr(0, 0), 210, 1, 4, 0);
 	}
 
-	showframe((Frame *)segRef(data.word(kIcons2)).ptr(0, 0), 260, 1, 1, 0);
+	showFrame((Frame *)segRef(data.word(kIcons2)).ptr(0, 0), 260, 1, 1, 0);
 }
 
-void DreamGenContext::examineob(bool examineAgain) {
+void DreamGenContext::examineOb(bool examineAgain) {
 	data.byte(kPointermode) = 0;
 	data.word(kTimecount) = 0;
 	while (true) {
@@ -125,66 +125,66 @@ void DreamGenContext::examineob(bool examineAgain) {
 			data.byte(kObjecttype) = al;
 			data.byte(kItemframe) = 0;
 			data.byte(kPointerframe) = 0;
-			createpanel();
-			showpanel();
-			showman();
-			showexit();
-			obicons();
-			obpicture();
-			describeob();
-			undertextline();
+			createPanel();
+			showPanel();
+			showMan();
+			showExit();
+			obIcons();
+			obPicture();
+			describeOb();
+			underTextLine();
 			data.byte(kCommandtype) = 255;
-			readmouse();
-			showpointer();
-			worktoscreen();
-			delpointer();
+			readMouse();
+			showPointer();
+			workToScreen();
+			delPointer();
 			examineAgain = false;
 		}
 
-		readmouse();
-		showpointer();
-		vsync();
-		dumppointer();
-		dumptextline();
-		delpointer();
+		readMouse();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpTextLine();
+		delPointer();
 		data.byte(kGetback) = 0;
 		switch (data.byte(kInvopen)) {
 		case 0: {
-			RectWithCallback examlist[] = {
-				{ 273,320,157,198,&DreamGenContext::getbackfromob },
-				{ 260,300,0,44,&DreamGenContext::useobject },
-				{ 210,254,0,44,&DreamGenContext::selectopenob },
-				{ 144,176,64,96,&DreamGenContext::setpickup },
-				{ 0,50,50,200,&DreamGenContext::examinventory },
+			RectWithCallback examList[] = {
+				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
+				{ 260,300,0,44,&DreamGenContext::useObject },
+				{ 210,254,0,44,&DreamGenContext::selectOpenOb },
+				{ 144,176,64,96,&DreamGenContext::setPickup },
+				{ 0,50,50,200,&DreamGenContext::examineInventory },
 				{ 0,320,0,200,&DreamGenContext::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
-			checkcoords(examlist);
+			checkCoords(examList);
 			break;
 		}
 		case 1: {
-			// NB: This table contains the non-constant openchangesize!
-			RectWithCallback invlist1[] = {
-				{ 273,320,157,198,&DreamGenContext::getbackfromob },
-				{ 255,294,0,24,&DreamGenContext::dropobject },
-				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incryanpage },
-				{ kInventx, cs.word(offset_openchangesize),kInventy+100,kInventy+100+kItempicsize,&DreamGenContext::useopened },
-				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::intoinv },
+			// NB: This table contains the non-constant openChangeSize!
+			RectWithCallback invList1[] = {
+				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
+				{ 255,294,0,24,&DreamGenContext::dropObject },
+				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
+				{ kInventx, cs.word(offset_openchangesize),kInventy+100,kInventy+100+kItempicsize,&DreamGenContext::useOpened },
+				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::inToInv },
 				{ 0,320,0,200,&DreamGenContext::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
-			checkcoords(invlist1);
+			checkCoords(invList1);
 			break;
 		}
 		default: {
-			RectWithCallback withlist1[] = {
-				{ 273,320,157,198,&DreamGenContext::getbackfromob },
-				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incryanpage },
-				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectob },
+			RectWithCallback withList1[] = {
+				{ 273,320,157,198,&DreamGenContext::getBackFromOb },
+				{ kInventx+167,kInventx+167+(18*3),kInventy-18,kInventy-2,&DreamGenContext::incRyanPage },
+				{ kInventx,kInventx+(5*kItempicsize), kInventy,kInventy+(2*kItempicsize),&DreamGenContext::selectOb },
 				{ 0,320,0,200,&DreamGenContext::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
-			checkcoords(withlist1);
+			checkCoords(withList1);
 			break;
 		}
 		}
@@ -198,8 +198,8 @@ void DreamGenContext::examineob(bool examineAgain) {
 
 	data.byte(kPickup) = 0;
 	if (data.word(kWatchingtime) != 0 || data.byte(kNewlocation) == 255) {
-		// iswatching
-		makemainscreen();
+		// isWatching
+		makeMainScreen();
 	}
 
 	data.byte(kInvopen) = 0;
@@ -215,7 +215,7 @@ void DreamGenContext::inventory() {
 	if (data.byte(kCommandtype) != 239) {
 		data.byte(kCommandtype) = 239;
 		al = 32;
-		commandonly();
+		commandOnly();
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton))
@@ -227,25 +227,25 @@ void DreamGenContext::inventory() {
 	data.word(kTimecount) = 0;
 	data.byte(kPointermode) = 0;
 	data.byte(kInmaparea) = 0;
-	animpointer();
-	createpanel();
-	showpanel();
-	examicon();
-	showman();
-	showexit();
-	undertextline();
+	animPointer();
+	createPanel();
+	showPanel();
+	examIcon();
+	showMan();
+	showExit();
+	underTextLine();
 	data.byte(kPickup) = 0;
 	data.byte(kInvopen) = 2;
-	openinv();
-	readmouse();
-	showpointer();
-	worktoscreen();
-	delpointer();
+	openInv();
+	readMouse();
+	showPointer();
+	workToScreen();
+	delPointer();
 	data.byte(kOpenedob) = 255;
-	examineob(false);
+	examineOb(false);
 }
 
-void DreamGenContext::transfertext() {
+void DreamGenContext::transferText() {
 	segRef(data.word(kExtras)).word(kExtextdat + data.byte(kExpos) * 2) = data.word(kExtextpos);
 	uint16 freeTextOffset = data.byte(kItemtotran) * 2;
 	uint16 srcOffset = segRef(data.word(kFreedesc)).word(kFreetextdat + freeTextOffset);
@@ -257,9 +257,9 @@ void DreamGenContext::transfertext() {
 	data.word(kExtextpos) += len + 1;
 }
 
-void DreamGenContext::getbackfromob() {
+void DreamGenContext::getBackFromOb() {
 	if (data.byte(kPickup) != 1)
-		getback1();
+		getBack1();
 	else
 		blank();
 }
diff --git a/engines/dreamweb/pathfind.cpp b/engines/dreamweb/pathfind.cpp
index d367f02d15..2ca732467f 100644
--- a/engines/dreamweb/pathfind.cpp
+++ b/engines/dreamweb/pathfind.cpp
@@ -24,62 +24,61 @@
 
 namespace DreamGen {
 
-void DreamGenContext::turnpathon() {
-	turnpathon(al);
+void DreamGenContext::turnPathOn() {
+	turnPathOn(al);
 }
 
-void DreamGenContext::turnpathon(uint8 param) {
-	findormake(param, 0xff, data.byte(kRoomnum) + 100);
-	PathNode *roomsPaths = getroomspaths()->nodes;
+void DreamGenContext::turnPathOn(uint8 param) {
+	findOrMake(param, 0xff, data.byte(kRoomnum) + 100);
+	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
 		return;
 	roomsPaths[param].on = 0xff;
 }
 
-void DreamGenContext::turnpathoff() {
-	turnpathoff(al);
+void DreamGenContext::turnPathOff() {
+	turnPathOff(al);
 }
 
-void DreamGenContext::turnpathoff(uint8 param) {
-	findormake(param, 0x00, data.byte(kRoomnum) + 100);
-	PathNode *roomsPaths = getroomspaths()->nodes;
+void DreamGenContext::turnPathOff(uint8 param) {
+	findOrMake(param, 0x00, data.byte(kRoomnum) + 100);
+	PathNode *roomsPaths = getRoomsPaths()->nodes;
 	if (param == 0xff)
 		return;
 	roomsPaths[param].on = 0x00;
 }
 
-void DreamGenContext::turnanypathon(uint8 param, uint8 room) {
-	findormake(param, 0xff, room + 100);
+void DreamGenContext::turnAnyPathOn(uint8 param, uint8 room) {
+	findOrMake(param, 0xff, room + 100);
 	PathNode *paths = (PathNode *)segRef(data.word(kReels)).ptr(kPathdata + 144 * room, 0);
 	paths[param].on = 0xff;
 }
 
-
-void DreamGenContext::turnanypathon() {
-	turnanypathon(al, ah);
+void DreamGenContext::turnAnyPathOn() {
+	turnAnyPathOn(al, ah);
 }
 
-void DreamGenContext::turnanypathoff(uint8 param, uint8 room) {
-	findormake(param, 0x00, room + 100);
+void DreamGenContext::turnAnyPathOff(uint8 param, uint8 room) {
+	findOrMake(param, 0x00, room + 100);
 	PathNode *paths = (PathNode *)segRef(data.word(kReels)).ptr(kPathdata + 144 * room, 0);
 	paths[param].on = 0x00;
 }
 
-void DreamGenContext::turnanypathoff() {
-	turnanypathoff(al, ah);
+void DreamGenContext::turnAnyPathOff() {
+	turnAnyPathOff(al, ah);
 }
 
-RoomPaths *DreamGenContext::getroomspaths() {
+RoomPaths *DreamGenContext::getRoomsPaths() {
 	void *result = segRef(data.word(kReels)).ptr(data.byte(kRoomnum) * 144, 144);
 	return (RoomPaths *)result;
 }
 
-void DreamGenContext::autosetwalk() {
+void DreamGenContext::autoSetWalk() {
 	al = data.byte(kManspath);
 	if (data.byte(kFinaldest) == al)
 		return;
-	const RoomPaths *roomsPaths = getroomspaths();
-	checkdest(roomsPaths);
+	const RoomPaths *roomsPaths = getRoomsPaths();
+	checkDest(roomsPaths);
 	data.word(kLinestartx) = roomsPaths->nodes[data.byte(kManspath)].x - 12;
 	data.word(kLinestarty) = roomsPaths->nodes[data.byte(kManspath)].y - 12;
 	data.word(kLineendx) = roomsPaths->nodes[data.byte(kDestination)].x - 12;
@@ -93,7 +92,7 @@ void DreamGenContext::autosetwalk() {
 	data.byte(kLinepointer) = 0;
 }
 
-void DreamGenContext::checkdest(const RoomPaths *roomsPaths) {
+void DreamGenContext::checkDest(const RoomPaths *roomsPaths) {
 	const PathSegment *segments = roomsPaths->segments;
 	ah = data.byte(kManspath) << 4;
 	al = data.byte(kDestination);
@@ -114,24 +113,24 @@ void DreamGenContext::checkdest(const RoomPaths *roomsPaths) {
 	data.byte(kDestination) = destination;
 }
 
-void DreamGenContext::findxyfrompath() {
-	const PathNode *roomsPaths = getroomspaths()->nodes;
+void DreamGenContext::findXYFromPath() {
+	const PathNode *roomsPaths = getRoomsPaths()->nodes;
 	data.byte(kRyanx) = roomsPaths[data.byte(kManspath)].x - 12;
 	data.byte(kRyany) = roomsPaths[data.byte(kManspath)].y - 12;
 }
 
-void DreamGenContext::checkifpathison() {
-	flags._z = checkifpathison(al);
+void DreamGenContext::checkIfPathIsOn() {
+	flags._z = checkIfPathIsOn(al);
 }
 
-bool DreamGenContext::checkifpathison(uint8 index) {
-	RoomPaths *roomsPaths = getroomspaths();
+bool DreamGenContext::checkIfPathIsOn(uint8 index) {
+	RoomPaths *roomsPaths = getRoomsPaths();
 	uint8 pathOn = roomsPaths->nodes[index].on;
 	return pathOn == 0xff;
 }
 
 void DreamGenContext::bresenhams() {
-	workoutframes();
+	workoutFrames();
 	int8 *lineData = (int8 *)data.ptr(kLinedata, 0);
 	int16 startX = (int16)data.word(kLinestartx);
 	int16 startY = (int16)data.word(kLinestarty);
diff --git a/engines/dreamweb/print.cpp b/engines/dreamweb/print.cpp
index 791c85be55..fcdaad902e 100644
--- a/engines/dreamweb/print.cpp
+++ b/engines/dreamweb/print.cpp
@@ -24,15 +24,15 @@
 
 namespace DreamGen {
 
-void DreamGenContext::printboth(const Frame *charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar) {
+void DreamGenContext::printBoth(const Frame *charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar) {
 	uint16 newX = *x;
 	uint8 width, height;
-	printchar(charSet, &newX, y, c, nextChar, &width, &height);
-	multidump(*x, y, width, height);
+	printChar(charSet, &newX, y, c, nextChar, &width, &height);
+	multiDump(*x, y, width, height);
 	*x = newX;
 }
 
-uint8 DreamGenContext::getnextword(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount) {
+uint8 DreamGenContext::getNextWord(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount) {
 	*totalWidth = 0;
 	*charCount = 0;
 	while(true) {
@@ -51,22 +51,22 @@ uint8 DreamGenContext::getnextword(const Frame *charSet, const uint8 *string, ui
 		if (firstChar != 255) {
 			uint8 secondChar = *string;
 			uint8 width = charSet[firstChar - 32 + data.word(kCharshift)].width;
-			width = kernchars(firstChar, secondChar, width);
+			width = kernChars(firstChar, secondChar, width);
 			*totalWidth += width;
 		}
 	}
 }
 
-void DreamGenContext::printchar() {
+void DreamGenContext::printChar() {
 	uint16 x = di;
 	uint8 width, height;
-	printchar((const Frame *)ds.ptr(0, 0), &x, bx, al, ah, &width, &height);
+	printChar((const Frame *)ds.ptr(0, 0), &x, bx, al, ah, &width, &height);
 	di = x;
 	cl = width;
 	ch = height;
 }
 
-void DreamGenContext::printchar(const Frame *charSet, uint16* x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
+void DreamGenContext::printChar(const Frame *charSet, uint16* x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
 	if (c == 255)
 		return;
 
@@ -78,33 +78,33 @@ void DreamGenContext::printchar(const Frame *charSet, uint16* x, uint16 y, uint8
 	if (data.byte(kForeignrelease))
 		y -= 3;
 	uint16 tmp = c - 32 + data.word(kCharshift);
-	showframe(charSet, *x, y, tmp & 0x1ff, (tmp >> 8) & 0xfe, width, height);
+	showFrame(charSet, *x, y, tmp & 0x1ff, (tmp >> 8) & 0xfe, width, height);
 	if (data.byte(kKerning), 0)
-		*width = kernchars(c, nextChar, *width);
+		*width = kernChars(c, nextChar, *width);
 	(*x) += *width;
 }
 
-void DreamGenContext::printchar(const Frame *charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
-	printchar(charSet, &x, y, c, nextChar, width, height);
+void DreamGenContext::printChar(const Frame *charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height) {
+	printChar(charSet, &x, y, c, nextChar, width, height);
 }
 
-void DreamGenContext::printslow() {
-	al = printslow(es.ptr(si, 0), di, bx, dl, (bool)(dl & 1));
+void DreamGenContext::printSlow() {
+	al = printSlow(es.ptr(si, 0), di, bx, dl, (bool)(dl & 1));
 }
 
-uint8 DreamGenContext::printslow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
+uint8 DreamGenContext::printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
 	data.byte(kPointerframe) = 1;
 	data.byte(kPointermode) = 3;
 	const Frame* charSet = (const Frame *)segRef(data.word(kCharset1)).ptr(0, 0);
 	do {
 		uint16 offset = x;
-		uint16 charCount = getnumber(charSet, string, maxWidth, centered, &offset);
+		uint16 charCount = getNumber(charSet, string, maxWidth, centered, &offset);
 		do {
 			uint8 c0 = string[0];
 			uint8 c1 = string[1];
 			uint8 c2 = string[2];
 			c0 = engine->modifyChar(c0);
-			printboth(charSet, &offset, y, c0, c1);
+			printBoth(charSet, &offset, y, c0, c1);
 			if ((c1 == 0) || (c1 == ':')) {
 				return 0;
 			}
@@ -112,10 +112,10 @@ uint8 DreamGenContext::printslow(const uint8 *string, uint16 x, uint16 y, uint8
 				c1 = engine->modifyChar(c1);
 				data.word(kCharshift) = 91;
 				uint16 offset2 = offset;
-				printboth(charSet, &offset2, y, c1, c2);
+				printBoth(charSet, &offset2, y, c1, c2);
 				data.word(kCharshift) = 0;
 				for (int i=0; i<2; ++i) {
-					uint16 mouseState = waitframes();
+					uint16 mouseState = waitFrames();
 					if (data.byte(kQuitrequested))
 						return 0;
 					if (mouseState == 0)
@@ -133,26 +133,26 @@ uint8 DreamGenContext::printslow(const uint8 *string, uint16 x, uint16 y, uint8
 	} while (true);
 }
 
-void DreamGenContext::printdirect() {
+void DreamGenContext::printDirect() {
 	uint16 y = bx;
 	uint16 initialSi = si;
 	const uint8 *initialString = es.ptr(si, 0);
 	const uint8 *string = initialString;
-	al = printdirect(&string, di, &y, dl, (bool)(dl & 1));
+	al = printDirect(&string, di, &y, dl, (bool)(dl & 1));
 	si = initialSi + (string - initialString);
 	bx = y;
 }
 
-uint8 DreamGenContext::printdirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
-	return printdirect(&string, x, &y, maxWidth, centered);
+uint8 DreamGenContext::printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered) {
+	return printDirect(&string, x, &y, maxWidth, centered);
 }
 
-uint8 DreamGenContext::printdirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
+uint8 DreamGenContext::printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered) {
 	data.word(kLastxpos) = x;
 	const Frame *charSet = (const Frame *)segRef(data.word(kCurrentset)).ptr(0, 0);
 	while (true) {
 		uint16 offset = x;
-		uint8 charCount = getnumber(charSet, *string, maxWidth, centered, &offset);
+		uint8 charCount = getNumber(charSet, *string, maxWidth, centered, &offset);
 		uint16 i = offset;
 		do {
 			uint8 c = (*string)[0];
@@ -163,7 +163,7 @@ uint8 DreamGenContext::printdirect(const uint8** string, uint16 x, uint16 *y, ui
 			}
 			c = engine->modifyChar(c);
 			uint8 width, height;
-			printchar(charSet, &i, *y, c, nextChar, &width, &height);
+			printChar(charSet, &i, *y, c, nextChar, &width, &height);
 			data.word(kLastxpos) = i;
 			--charCount;
 		} while(charCount);
@@ -171,18 +171,18 @@ uint8 DreamGenContext::printdirect(const uint8** string, uint16 x, uint16 *y, ui
 	}
 }
 
-void DreamGenContext::getnumber() {
+void DreamGenContext::getNumber() {
 	uint16 offset = di;
-	cl = getnumber((Frame *)ds.ptr(0, 0), es.ptr(si, 0), dl, (bool)(dl & 1), &offset);
+	cl = getNumber((Frame *)ds.ptr(0, 0), es.ptr(si, 0), dl, (bool)(dl & 1), &offset);
 	di = offset;
 }
 
-uint8 DreamGenContext::getnumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16* offset) {
+uint8 DreamGenContext::getNumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16* offset) {
 	uint8 totalWidth = 0;
 	uint8 charCount = 0;
 	while (true) {
 		uint8 wordTotalWidth, wordCharCount;
-		uint8 done = getnextword(charSet, string, &wordTotalWidth, &wordCharCount);
+		uint8 done = getNextWord(charSet, string, &wordTotalWidth, &wordCharCount);
 		string += wordCharCount;
 
 		if (done == 1) { //endoftext
@@ -217,7 +217,7 @@ uint8 DreamGenContext::getnumber(const Frame *charSet, const uint8 *string, uint
 	}
 }
 
-uint8 DreamGenContext::kernchars(uint8 firstChar, uint8 secondChar, uint8 width) {
+uint8 DreamGenContext::kernChars(uint8 firstChar, uint8 secondChar, uint8 width) {
 	if ((firstChar == 'a') || (al == 'u')) {
 		if ((secondChar == 'n') || (secondChar == 't') || (secondChar == 'r') || (secondChar == 'i') || (secondChar == 'l'))
 			return width-1;
@@ -225,23 +225,23 @@ uint8 DreamGenContext::kernchars(uint8 firstChar, uint8 secondChar, uint8 width)
 	return width;
 }
 
-uint16 DreamGenContext::waitframes() {
-	readmouse();
-	showpointer();
-	vsync();
-	dumppointer();
-	delpointer();
+uint16 DreamGenContext::waitFrames() {
+	readMouse();
+	showPointer();
+	vSync();
+	dumpPointer();
+	delPointer();
 	return data.word(kMousebutton);
 }
 
-void DreamGenContext::monprint() {
+void DreamGenContext::monPrint() {
 	uint16 originalBx = bx;
 	const char *string = (const char *)es.ptr(bx, 0);
-	const char *nextString = monprint(string);
+	const char *nextString = monPrint(string);
 	bx = originalBx + (nextString - string);
 }
 
-const char *DreamGenContext::monprint(const char *string) {
+const char *DreamGenContext::monPrint(const char *string) {
 	data.byte(kKerning) = 1;
 	uint16 x = data.word(kMonadx);
 	Frame *charset = tempCharset();
@@ -249,7 +249,7 @@ const char *DreamGenContext::monprint(const char *string) {
 	bool done = false;
 	while (!done) {
 
-		uint16 count = getnumber(charset, (const uint8 *)iterator, 166, false, &x);
+		uint16 count = getNumber(charset, (const uint8 *)iterator, 166, false, &x);
 		do {	
 			char c = *iterator++;
 			if (c == ':')
@@ -265,18 +265,18 @@ const char *DreamGenContext::monprint(const char *string) {
 				break;
 			}
 			c = engine->modifyChar(c);
-			printchar(charset, &x, data.word(kMonady), c, 0, NULL, NULL);
+			printChar(charset, &x, data.word(kMonady), c, 0, NULL, NULL);
 			data.word(kCurslocx) = x;
 			data.word(kCurslocy) = data.word(kMonady);
 			data.word(kMaintimer) = 1;
-			printcurs();
-			vsync();
-			lockmon();
-			delcurs();
+			printCurs();
+			vSync();
+			lockMon();
+			delCurs();
 		} while (--count);
 
 		x = data.word(kMonadx);
-		scrollmonitor();
+		scrollMonitor();
 		data.word(kCurslocx) = data.word(kMonadx);
 	}
 
diff --git a/engines/dreamweb/saveload.cpp b/engines/dreamweb/saveload.cpp
index 00e81ed645..83db639ff5 100644
--- a/engines/dreamweb/saveload.cpp
+++ b/engines/dreamweb/saveload.cpp
@@ -28,55 +28,55 @@
 
 namespace DreamGen {
 
-void DreamGenContext::loadgame() {
+void DreamGenContext::loadGame() {
 	if (data.byte(kCommandtype) != 246) {
 		data.byte(kCommandtype) = 246;
-		commandonly(41);
+		commandOnly(41);
 	}
 	if (data.word(kMousebutton) == data.word(kOldbutton))
 		return; // "noload"
 	if (data.word(kMousebutton) == 1) {
 		ax = 0xFFFF;
-		doload();
+		doLoad();
 	}
 }
 
 // input: ax = savegameId
 // if -1, open menu to ask for slot to load
 // if >= 0, directly load from that slot
-void DreamGenContext::doload() {
+void DreamGenContext::doLoad() {
 	int savegameId = (int16)ax;
 
 	data.byte(kLoadingorsave) = 1;
 
 	if (ConfMan.getBool("dreamweb_originalsaveload") && savegameId == -1) {
-		showopbox();
-		showloadops();
+		showOpBox();
+		showLoadOps();
 		data.byte(kCurrentslot) = 0;
-		showslots();
-		shownames();
+		showSlots();
+		showNames();
 		data.byte(kPointerframe) = 0;
-		worktoscreenm();
-		namestoold();
+		workToScreenM();
+		namesToOld();
 		data.byte(kGetback) = 0;
 
 		while (true) {
 			if (quitRequested())
 				return;
-			delpointer();
-			readmouse();
-			showpointer();
-			vsync();
-			dumppointer();
-			dumptextline();
+			delPointer();
+			readMouse();
+			showPointer();
+			vSync();
+			dumpPointer();
+			dumpTextLine();
 			RectWithCallback loadlist[] = {
-				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getbacktoops },
-				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamGenContext::actualload },
-				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamGenContext::selectslot },
+				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
+				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamGenContext::actualLoad },
+				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamGenContext::selectSlot },
 				{ 0,320,0,200,&DreamGenContext::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
-			checkcoords(loadlist);
+			checkCoords(loadlist);
 			if (data.byte(kGetback) == 1)
 				break;
 			if (data.byte(kGetback) == 2)
@@ -101,35 +101,35 @@ void DreamGenContext::doload() {
 			return;
 		}
 
-		loadposition(savegameId);
+		loadPosition(savegameId);
 
 		data.byte(kGetback) = 1;
 	}
 
 	// kTempgraphics might not have been allocated if we bypassed all menus
 	if (data.word(kTempgraphics) != 0xFFFF)
-		getridoftemp();
+		getRidOfTemp();
 
 	dx = data;
 	es = dx;
 	const Room *room = (Room *)cs.ptr(kMadeuproomdat, sizeof(Room));
-	startloading(room);
-	loadroomssample();
+	startLoading(room);
+	loadRoomsSample();
 	data.byte(kRoomloaded) = 1;
 	data.byte(kNewlocation) = 255;
-	clearsprites();
-	initman();
-	initrain();
+	clearSprites();
+	initMan();
+	initRain();
 	data.word(kTextaddressx) = 13;
 	data.word(kTextaddressy) = 182;
 	data.byte(kTextlen) = 240;
 	startup();
-	worktoscreen();
+	workToScreen();
 	data.byte(kGetback) = 4;
 }
 
 
-void DreamGenContext::savegame() {
+void DreamGenContext::saveGame() {
 	if (data.byte(kMandead) == 2) {
 		blank();
 		return;
@@ -137,7 +137,7 @@ void DreamGenContext::savegame() {
 
 	if (data.byte(kCommandtype) != 247) {
 		data.byte(kCommandtype) = 247;
-		commandonly(44);
+		commandOnly(44);
 	}
 	if (data.word(kMousebutton) != 1)
 		return;
@@ -145,13 +145,13 @@ void DreamGenContext::savegame() {
 	data.byte(kLoadingorsave) = 2;
 
 	if (ConfMan.getBool("dreamweb_originalsaveload")) {
-		showopbox();
-		showsaveops();
+		showOpBox();
+		showSaveOps();
 		data.byte(kCurrentslot) = 0;
-		showslots();
-		shownames();
-		worktoscreenm();
-		namestoold();
+		showSlots();
+		showNames();
+		workToScreenM();
+		namesToOld();
 		data.word(kBufferin) = 0;
 		data.word(kBufferout) = 0;
 		data.byte(kGetback) = 0;
@@ -159,22 +159,22 @@ void DreamGenContext::savegame() {
 		while (true) {
 			if (quitRequested())
 				return;
-			delpointer();
-			checkinput();
-			readmouse();
-			showpointer();
-			vsync();
-			dumppointer();
-			dumptextline();
+			delPointer();
+			checkInput();
+			readMouse();
+			showPointer();
+			vSync();
+			dumpPointer();
+			dumpTextLine();
 
 			RectWithCallback savelist[] = {
-				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getbacktoops },
-				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamGenContext::actualsave },
-				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamGenContext::selectslot },
+				{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
+				{ kOpsx+128,kOpsx+190,kOpsy+12,kOpsy+100,&DreamGenContext::actualSave },
+				{ kOpsx+2,kOpsx+92,kOpsy+4,kOpsy+81,&DreamGenContext::selectSlot },
 				{ 0,320,0,200,&DreamGenContext::blank },
 				{ 0xFFFF,0,0,0,0 }
 			};
-			checkcoords(savelist);
+			checkCoords(savelist);
 			_cmp(data.byte(kGetback), 0);
 			if (flags.z())
 				continue;
@@ -211,58 +211,58 @@ void DreamGenContext::savegame() {
 		if (savegameId < 7)
 			memcpy(data.ptr(kSavenames + 17*savegameId, 17), descbuf, 17);
 
-		saveposition(savegameId, descbuf);
+		savePosition(savegameId, descbuf);
 
 		// TODO: The below is copied from actualsave
-		getridoftemp();
-		restoreall(); // reels
+		getRidOfTemp();
+		restoreAll(); // reels
 		data.word(kTextaddressx) = 13;
 		data.word(kTextaddressy) = 182;
 		data.byte(kTextlen) = 240;
-		redrawmainscrn();
-		worktoscreenm();
+		redrawMainScrn();
+		workToScreenM();
 		data.byte(kGetback) = 4;
 	}
 }
 
-void DreamGenContext::namestoold() {
+void DreamGenContext::namesToOld() {
 	memcpy(segRef(data.word(kBuffers)).ptr(kZoomspace, 0), cs.ptr(kSavenames, 0), 17*4);
 }
 
-void DreamGenContext::oldtonames() {
+void DreamGenContext::oldToNames() {
 	memcpy(cs.ptr(kSavenames, 0), segRef(data.word(kBuffers)).ptr(kZoomspace, 0), 17*4);
 }
 
-void DreamGenContext::saveload() {
+void DreamGenContext::saveLoad() {
 	if (data.word(kWatchingtime) || (data.byte(kPointermode) == 2)) {
 		blank();
 		return;
 	}
 	if (data.byte(kCommandtype) != 253) {
 		data.byte(kCommandtype) = 253;
-		commandonly(43);
+		commandOnly(43);
 	}
 	if ((data.word(kMousebutton) != data.word(kOldbutton)) && (data.word(kMousebutton) & 1))
-		dosaveload();
+		doSaveLoad();
 }
 
-void DreamGenContext::showmainops() {
-	showframe(tempGraphics(), kOpsx+10, kOpsy+10, 8, 0);
-	showframe(tempGraphics(), kOpsx+59, kOpsy+30, 7, 0);
-	showframe(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
+void DreamGenContext::showMainOps() {
+	showFrame(tempGraphics(), kOpsx+10, kOpsy+10, 8, 0);
+	showFrame(tempGraphics(), kOpsx+59, kOpsy+30, 7, 0);
+	showFrame(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
 }
 
-void DreamGenContext::showdiscops() {
-	showframe(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
-	showframe(tempGraphics(), kOpsx+10, kOpsy+10, 9, 0);
-	showframe(tempGraphics(), kOpsx+59, kOpsy+30, 10, 0);
-	showframe(tempGraphics(), kOpsx+176+2, kOpsy+60-4, 5, 0);
+void DreamGenContext::showDiscOps() {
+	showFrame(tempGraphics(), kOpsx+128+4, kOpsy+12, 1, 0);
+	showFrame(tempGraphics(), kOpsx+10, kOpsy+10, 9, 0);
+	showFrame(tempGraphics(), kOpsx+59, kOpsy+30, 10, 0);
+	showFrame(tempGraphics(), kOpsx+176+2, kOpsy+60-4, 5, 0);
 }
 
-void DreamGenContext::actualsave() {
+void DreamGenContext::actualSave() {
 	if (data.byte(kCommandtype) != 222) {
 		data.byte(kCommandtype) = 222;
-		commandonly(44);
+		commandOnly(44);
 	}
 
 	if (!(data.word(kMousebutton) & 1))
@@ -274,22 +274,22 @@ void DreamGenContext::actualsave() {
 	if (desc[1] == 0) // The actual description string starts at desc[1]
 		return;
 
-	saveposition(slot, desc);
+	savePosition(slot, desc);
 
-	getridoftemp();
-	restoreall(); // reels
+	getRidOfTemp();
+	restoreAll(); // reels
 	data.word(kTextaddressx) = 13;
 	data.word(kTextaddressy) = 182;
 	data.byte(kTextlen) = 240;
-	redrawmainscrn();
-	worktoscreenm();
+	redrawMainScrn();
+	workToScreenM();
 	data.byte(kGetback) = 4;
 }
 
-void DreamGenContext::actualload() {
+void DreamGenContext::actualLoad() {
 	if (data.byte(kCommandtype) != 221) {
 		data.byte(kCommandtype) = 221;
-		commandonly(41);
+		commandOnly(41);
 	}
 
 	if (data.word(kMousebutton) == data.word(kOldbutton) || data.word(kMousebutton) != 1)
@@ -301,11 +301,11 @@ void DreamGenContext::actualload() {
 	if (desc[1] == 0) // The actual description string starts at desc[1]
 		return;
 
-	loadposition(data.byte(kCurrentslot));
+	loadPosition(data.byte(kCurrentslot));
 	data.byte(kGetback) = 1;
 }
 
-void DreamGenContext::saveposition(unsigned int slot, const uint8 *descbuf) {
+void DreamGenContext::savePosition(unsigned int slot, const uint8 *descbuf) {
 
 	const Room *currentRoom = (const Room *)cs.ptr(kRoomdata + sizeof(Room)*data.byte(kLocation), sizeof(Room));
 	Room *madeUpRoom = (Room *)cs.ptr(kMadeuproomdat, sizeof(Room));
@@ -319,8 +319,7 @@ void DreamGenContext::saveposition(unsigned int slot, const uint8 *descbuf) {
 	madeUpRoom->facing = data.byte(kFacing);
 	madeUpRoom->b27 = 255;
 
-
-	openforsave(slot);
+	openForSave(slot);
 
 	// fill length fields in savegame file header
 	uint16 len[6] = { 17, kLengthofvars, kLengthofextra,
@@ -335,16 +334,14 @@ void DreamGenContext::saveposition(unsigned int slot, const uint8 *descbuf) {
 	engine->writeToSaveFile(segRef(data.word(kBuffers)).ptr(kListofchanges, len[3]), len[3]);
 	engine->writeToSaveFile(data.ptr(kMadeuproomdat, len[4]), len[4]);
 	engine->writeToSaveFile(data.ptr(kReelroutines, len[5]), len[5]);
-	closefile();
-
-
+	closeFile();
 }
 
-void DreamGenContext::loadposition(unsigned int slot) {
+void DreamGenContext::loadPosition(unsigned int slot) {
 	data.word(kTimecount) = 0;
-	clearchanges();
+	clearChanges();
 
-	openforload(slot);
+	openForLoad(slot);
 
 	engine->readFromSaveFile(cs.ptr(kFileheader, kHeaderlen), kHeaderlen);
 
@@ -368,7 +365,7 @@ void DreamGenContext::loadposition(unsigned int slot) {
 	engine->readFromSaveFile(data.ptr(kMadeuproomdat, len[4]), len[4]);
 	engine->readFromSaveFile(cs.ptr(kReelroutines, len[5]), len[5]);
 
-	closefile();
+	closeFile();
 }
 
 } /*namespace dreamgen */
diff --git a/engines/dreamweb/sprite.cpp b/engines/dreamweb/sprite.cpp
index 76f1dd34dd..2659f5b885 100644
--- a/engines/dreamweb/sprite.cpp
+++ b/engines/dreamweb/sprite.cpp
@@ -24,14 +24,14 @@
 
 namespace DreamGen {
 
-Sprite *DreamGenContext::spritetable() {
+Sprite *DreamGenContext::spriteTable() {
 	Sprite *sprite = (Sprite *)segRef(data.word(kBuffers)).ptr(kSpritetable, 16 * sizeof(Sprite));
 	return sprite;
 }
 
-void DreamGenContext::printsprites() {
+void DreamGenContext::printSprites() {
 	for (size_t priority = 0; priority < 7; ++priority) {
-		Sprite *sprites = spritetable();
+		Sprite *sprites = spriteTable();
 		for (size_t j = 0; j < 16; ++j) {
 			const Sprite &sprite = sprites[j];
 			if (sprite.updateCallback() == 0x0ffff)
@@ -40,12 +40,12 @@ void DreamGenContext::printsprites() {
 				continue;
 			if (sprite.hidden == 1)
 				continue;
-			printasprite(&sprite);
+			printASprite(&sprite);
 		}
 	}
 }
 
-void DreamGenContext::printasprite(const Sprite *sprite) {
+void DreamGenContext::printASprite(const Sprite *sprite) {
 	uint16 x, y;
 	if (sprite->y >= 220) {
 		y = data.word(kMapady) - (256 - sprite->y);
@@ -64,15 +64,15 @@ void DreamGenContext::printasprite(const Sprite *sprite) {
 		c = 8;
 	else
 		c = 0;
-	showframe((const Frame *)segRef(sprite->frameData()).ptr(0, 0), x, y, sprite->frameNumber, c);
+	showFrame((const Frame *)segRef(sprite->frameData()).ptr(0, 0), x, y, sprite->frameNumber, c);
 }
 
-void DreamGenContext::clearsprites() {
-	memset(spritetable(), 0xff, sizeof(Sprite) * 16);
+void DreamGenContext::clearSprites() {
+	memset(spriteTable(), 0xff, sizeof(Sprite) * 16);
 }
 
-Sprite *DreamGenContext::makesprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi) {
-	Sprite *sprite = spritetable();
+Sprite *DreamGenContext::makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi) {
+	Sprite *sprite = spriteTable();
 	while (sprite->frameNumber != 0xff) { // NB: No boundchecking in the original code either
 		++sprite;
 	}
@@ -88,8 +88,8 @@ Sprite *DreamGenContext::makesprite(uint8 x, uint8 y, uint16 updateCallback, uin
 	return sprite;
 }
 
-void DreamGenContext::spriteupdate() {
-	Sprite *sprites = spritetable();
+void DreamGenContext::spriteUpdate() {
+	Sprite *sprites = spriteTable();
 	sprites[0].hidden = data.byte(kRyanon);
 
 	Sprite *sprite = sprites;
@@ -98,10 +98,10 @@ void DreamGenContext::spriteupdate() {
 		if (updateCallback != 0xffff) {
 			sprite->w24 = sprite->w2;
 			if (updateCallback == addr_mainman) // NB : Let's consider the callback as an enum while more code is not ported to C++
-				mainman(sprite);
+				mainMan(sprite);
 			else {
 				assert(updateCallback == addr_backobject);
-				backobject(sprite);
+				backObject(sprite);
 			}
 		}
 	
@@ -111,18 +111,18 @@ void DreamGenContext::spriteupdate() {
 	}
 }
 
-void DreamGenContext::initman() {
-	Sprite *sprite = makesprite(data.byte(kRyanx), data.byte(kRyany), addr_mainman, data.word(kMainsprites), 0);
+void DreamGenContext::initMan() {
+	Sprite *sprite = makeSprite(data.byte(kRyanx), data.byte(kRyany), addr_mainman, data.word(kMainsprites), 0);
 	sprite->priority = 4;
 	sprite->speed = 0;
 	sprite->walkFrame = 0;
 }
 
-void DreamGenContext::mainman() {
+void DreamGenContext::mainMan() {
 	assert(false);
 }
 
-void DreamGenContext::mainman(Sprite *sprite) {
+void DreamGenContext::mainMan(Sprite *sprite) {
 	push(es);
 	push(ds);
 
@@ -147,12 +147,12 @@ void DreamGenContext::mainman(Sprite *sprite) {
 	}
 	sprite->speed = 0;
 	if (data.byte(kTurntoface) != data.byte(kFacing)) {
-		aboutturn(sprite);
+		aboutTurn(sprite);
 	} else {
 		if ((data.byte(kTurndirection) != 0) && (data.byte(kLinepointer) == 254)) {
 			data.byte(kReasseschanges) = 1;
 			if (data.byte(kFacing) == data.byte(kLeavedirection))
-				checkforexit();
+				checkForExit();
 		}
 		data.byte(kTurndirection) = 0;
 		if (data.byte(kLinepointer) == 254) {
@@ -172,7 +172,7 @@ void DreamGenContext::mainman(Sprite *sprite) {
 				if (data.byte(kTurntoface) == data.byte(kFacing)) {
 					data.byte(kReasseschanges) = 1;
 					if (data.byte(kFacing) == data.byte(kLeavedirection))
-						checkforexit();
+						checkForExit();
 				}
 			}
 		}
@@ -204,18 +204,18 @@ void DreamGenContext::walking(Sprite *sprite) {
 	data.byte(kLinepointer) = 254;
 	data.byte(kManspath) = data.byte(kDestination);
 	if (data.byte(kDestination) == data.byte(kFinaldest)) {
-		facerightway();
+		faceRightWay();
 		return;
 	}
 	data.byte(kDestination) = data.byte(kFinaldest);
 	push(es);
 	push(bx);
-	autosetwalk();
+	autoSetWalk();
 	bx = pop();
 	es = pop();
 }
 
-void DreamGenContext::aboutturn(Sprite *sprite) {
+void DreamGenContext::aboutTurn(Sprite *sprite) {
 	bool incdir = true;
 
 	if (data.byte(kTurndirection) == 1)
@@ -249,11 +249,11 @@ void DreamGenContext::aboutturn(Sprite *sprite) {
 	}
 }
 
-void DreamGenContext::backobject() {
+void DreamGenContext::backObject() {
 	assert(false);
 }
 
-void DreamGenContext::backobject(Sprite *sprite) {
+void DreamGenContext::backObject(Sprite *sprite) {
 	SetObject *objData = (SetObject *)segRef(data.word(kSetdat)).ptr(sprite->objData(), 0);
 
 	if (sprite->delay != 0) {
@@ -263,13 +263,13 @@ void DreamGenContext::backobject(Sprite *sprite) {
 
 	sprite->delay = objData->delay;
 	if (objData->type == 6)
-		widedoor(sprite, objData);
+		wideDoor(sprite, objData);
 	else if (objData->type == 5)
 		random(sprite, objData);
 	else if (objData->type == 4)
-		lockeddoorway(sprite, objData);
+		lockedDoorway(sprite, objData);
 	else if (objData->type == 3)
-		liftsprite(sprite, objData);
+		liftSprite(sprite, objData);
 	else if (objData->type == 2)
 		doorway(sprite, objData);
 	else if (objData->type == 1)
@@ -289,23 +289,22 @@ void DreamGenContext::constant(Sprite *sprite, SetObject *objData) {
 }
 
 void DreamGenContext::random(Sprite *sprite, SetObject *objData) {
-	randomnum1();
+	randomNum1();
 	uint16 r = ax;
 	sprite->frameNumber = objData->frames[r&7];
 }
 
 void DreamGenContext::doorway(Sprite *sprite, SetObject *objData) {
 	Common::Rect check(-24, -30, 10, 10);
-	dodoor(sprite, objData, check);
+	doDoor(sprite, objData, check);
 }
 
-void DreamGenContext::widedoor(Sprite *sprite, SetObject *objData) {
+void DreamGenContext::wideDoor(Sprite *sprite, SetObject *objData) {
 	Common::Rect check(-24, -30, 24, 24);
-	dodoor(sprite, objData, check);
+	doDoor(sprite, objData, check);
 }
 
-void DreamGenContext::dodoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
-
+void DreamGenContext::doDoor(Sprite *sprite, SetObject *objData, Common::Rect check) {
 	int ryanx = data.byte(kRyanx);
 	int ryany = data.byte(kRyany);
 
@@ -326,7 +325,7 @@ void DreamGenContext::dodoor(Sprite *sprite, SetObject *objData, Common::Rect ch
 				soundIndex = 13;
 			else
 				soundIndex = 0;
-			playchannel1(soundIndex);
+			playChannel1(soundIndex);
 		}
 		if (objData->frames[sprite->animFrame] == 255)
 			--sprite->animFrame;
@@ -343,7 +342,7 @@ void DreamGenContext::dodoor(Sprite *sprite, SetObject *objData, Common::Rect ch
 				soundIndex = 13;
 			else
 				soundIndex = 1;
-			playchannel1(soundIndex);
+			playChannel1(soundIndex);
 		}
 		if (sprite->animFrame != 0)
 			--sprite->animFrame;
@@ -360,8 +359,7 @@ void DreamGenContext::steady(Sprite *sprite, SetObject *objData) {
 	sprite->frameNumber = frame;
 }
 
-void DreamGenContext::lockeddoorway(Sprite *sprite, SetObject *objData) {
-
+void DreamGenContext::lockedDoorway(Sprite *sprite, SetObject *objData) {
 	int ryanx = data.byte(kRyanx);
 	int ryany = data.byte(kRyany);
 
@@ -375,11 +373,11 @@ void DreamGenContext::lockeddoorway(Sprite *sprite, SetObject *objData) {
 	if (openDoor) {
 
 		if (sprite->animFrame == 1) {
-			playchannel1(0);
+			playChannel1(0);
 		}
 
 		if (sprite->animFrame == 6)
-			turnpathon(data.byte(kDoorpath));
+			turnPathOn(data.byte(kDoorpath));
 
 		if (data.byte(kThroughdoor) == 1 && sprite->animFrame == 0)
 			sprite->animFrame = 6;
@@ -396,7 +394,7 @@ void DreamGenContext::lockeddoorway(Sprite *sprite, SetObject *objData) {
 		// shut door
 
 		if (sprite->animFrame == 5) {
-			playchannel1(1);
+			playChannel1(1);
 		}
 
 		if (sprite->animFrame != 0)
@@ -406,16 +404,16 @@ void DreamGenContext::lockeddoorway(Sprite *sprite, SetObject *objData) {
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 
 		if (sprite->animFrame == 0) {
-			turnpathoff(data.byte(kDoorpath));
+			turnPathOff(data.byte(kDoorpath));
 			data.byte(kLockstatus) = 1;
 		}
 	}
 }
 
-void DreamGenContext::liftsprite(Sprite *sprite, SetObject *objData) {
+void DreamGenContext::liftSprite(Sprite *sprite, SetObject *objData) {
 	uint8 liftFlag = data.byte(kLiftflag);
 	if (liftFlag == 0) { //liftclosed
-		turnpathoff(data.byte(kLiftpath));
+		turnPathOff(data.byte(kLiftpath));
 
 		if (data.byte(kCounttoopen) != 0) {
 			_dec(data.byte(kCounttoopen));
@@ -426,7 +424,7 @@ void DreamGenContext::liftsprite(Sprite *sprite, SetObject *objData) {
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 	}
 	else if (liftFlag == 1) {  //liftopen
-		turnpathon(data.byte(kLiftpath));
+		turnPathOn(data.byte(kLiftpath));
 
 		if (data.byte(kCounttoclose) != 0) {
 			_dec(data.byte(kCounttoclose));
@@ -444,7 +442,7 @@ void DreamGenContext::liftsprite(Sprite *sprite, SetObject *objData) {
 		++sprite->animFrame;
 		if (sprite->animFrame == 1) {
 			al = 2;
-			liftnoise();
+			liftNoise();
 		}
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 	} else { //closeLift
@@ -456,14 +454,14 @@ void DreamGenContext::liftsprite(Sprite *sprite, SetObject *objData) {
 		--sprite->animFrame;
 		if (sprite->animFrame == 11) {
 			al = 3;
-			liftnoise();
+			liftNoise();
 		}
 		sprite->frameNumber = objData->index = objData->frames[sprite->animFrame];
 	}
 }
 
-void DreamGenContext::facerightway() {
-	PathNode *paths = getroomspaths()->nodes;
+void DreamGenContext::faceRightWay() {
+	PathNode *paths = getRoomsPaths()->nodes;
 	uint8 dir = paths[data.byte(kManspath)].dir;
 	data.byte(kTurntoface) = dir;
 	data.byte(kLeavedirection) = dir;
@@ -473,7 +471,7 @@ void DreamGenContext::facerightway() {
 // The return value is a pointer to the start of the segment.
 // data.word(kCurrentframe) - data.word(kTakeoff) is the number of the frame
 // inside that segment
-Frame *DreamGenContext::findsource() {
+Frame *DreamGenContext::findSource() {
 	uint16 currentFrame = data.word(kCurrentframe);
 	if (currentFrame < 160) {
 		data.word(kTakeoff) = 0;
@@ -487,41 +485,41 @@ Frame *DreamGenContext::findsource() {
 	}
 }
 
-Reel *DreamGenContext::getreelstart() {
+Reel *DreamGenContext::getReelStart() {
 	Reel *reel = (Reel *)segRef(data.word(kReels)).ptr(kReellist + data.word(kReelpointer) * sizeof(Reel) * 8, sizeof(Reel));
 	return reel;
 }
 
-void DreamGenContext::showreelframe(Reel *reel) {
+void DreamGenContext::showReelFrame(Reel *reel) {
 	uint16 x = reel->x + data.word(kMapadx);
 	uint16 y = reel->y + data.word(kMapady);
 	data.word(kCurrentframe) = reel->frame();
-	Frame *source = findsource();
+	Frame *source = findSource();
 	uint16 frame = data.word(kCurrentframe) - data.word(kTakeoff);
-	showframe(source, x, y, frame, 8);
+	showFrame(source, x, y, frame, 8);
 }
 
-void DreamGenContext::showgamereel() {
-	showgamereel((ReelRoutine *)es.ptr(bx, sizeof(ReelRoutine)));
+void DreamGenContext::showGameReel() {
+	showGameReel((ReelRoutine *)es.ptr(bx, sizeof(ReelRoutine)));
 }
 
-void DreamGenContext::showgamereel(ReelRoutine *routine) {
-	uint16 reelpointer = routine->reelPointer();
-	if (reelpointer >= 512)
+void DreamGenContext::showGameReel(ReelRoutine *routine) {
+	uint16 reelPointer = routine->reelPointer();
+	if (reelPointer >= 512)
 		return;
-	data.word(kReelpointer) = reelpointer;
-	plotreel();
+	data.word(kReelpointer) = reelPointer;
+	plotReel();
 	routine->setReelPointer(data.word(kReelpointer));
 }
 
-const Frame *DreamGenContext::getreelframeax(uint16 frame) {
+const Frame *DreamGenContext::getReelFrameAX(uint16 frame) {
 	data.word(kCurrentframe) = frame;
-	Frame *source = findsource();
+	Frame *source = findSource();
 	uint16 offset = data.word(kCurrentframe) - data.word(kTakeoff);
 	return source + offset;
 }
 
-void DreamGenContext::showrain() {
+void DreamGenContext::showRain() {
 	Rain *rain = (Rain *)segRef(data.word(kBuffers)).ptr(kRainlist, 0);
 
 	// Do nothing if there's no rain at all
@@ -564,74 +562,74 @@ void DreamGenContext::showrain() {
 		soundIndex = 4;
 	else
 		soundIndex = 7;
-	playchannel1(soundIndex);
+	playChannel1(soundIndex);
 }
 
 static void (DreamGenContext::*reelCallbacks[57])() = {
 	NULL, NULL,
-	NULL, &DreamGenContext::edeninbath,
-	NULL, &DreamGenContext::smokebloke,
-	&DreamGenContext::manasleep, &DreamGenContext::drunk,
-	&DreamGenContext::receptionist, &DreamGenContext::malefan,
-	&DreamGenContext::femalefan, &DreamGenContext::louis,
-	&DreamGenContext::louischair, &DreamGenContext::soldier1,
-	&DreamGenContext::bossman, &DreamGenContext::interviewer,
-	&DreamGenContext::heavy, &DreamGenContext::manasleep2,
-	&DreamGenContext::mansatstill, &DreamGenContext::drinker,
+	NULL, &DreamGenContext::edenInBath,
+	NULL, &DreamGenContext::smokeBloke,
+	&DreamGenContext::manAsleep, &DreamGenContext::drunk,
+	&DreamGenContext::receptionist, &DreamGenContext::maleFan,
+	&DreamGenContext::femaleFan, &DreamGenContext::louis,
+	&DreamGenContext::louisChair, &DreamGenContext::soldier1,
+	&DreamGenContext::bossMan, &DreamGenContext::interviewer,
+	&DreamGenContext::heavy, &DreamGenContext::manAsleep2,
+	&DreamGenContext::manSatStill, &DreamGenContext::drinker,
 	&DreamGenContext::bartender, NULL,
-	&DreamGenContext::tattooman, &DreamGenContext::attendant,
+	&DreamGenContext::tattooMan, &DreamGenContext::attendant,
 	&DreamGenContext::keeper, &DreamGenContext::candles1,
-	&DreamGenContext::smallcandle, &DreamGenContext::security,
-	&DreamGenContext::copper, &DreamGenContext::poolguard,
-	&DreamGenContext::rockstar, &DreamGenContext::businessman,
+	&DreamGenContext::smallCandle, &DreamGenContext::security,
+	&DreamGenContext::copper, &DreamGenContext::poolGuard,
+	&DreamGenContext::rockstar, &DreamGenContext::businessMan,
 	&DreamGenContext::train, &DreamGenContext::aide,
 	&DreamGenContext::mugger, &DreamGenContext::helicopter,
-	&DreamGenContext::intromagic1, &DreamGenContext::intromusic,
-	&DreamGenContext::intromagic2, &DreamGenContext::candles2,
-	&DreamGenContext::gates, &DreamGenContext::intromagic3,
-	&DreamGenContext::intromonks1, &DreamGenContext::candles,
-	&DreamGenContext::intromonks2, &DreamGenContext::handclap,
-	&DreamGenContext::monkandryan, &DreamGenContext::endgameseq,
+	&DreamGenContext::introMagic1, &DreamGenContext::introMusic,
+	&DreamGenContext::introMagic2, &DreamGenContext::candles2,
+	&DreamGenContext::gates, &DreamGenContext::introMagic3,
+	&DreamGenContext::introMonks1, &DreamGenContext::candles,
+	&DreamGenContext::introMonks2, &DreamGenContext::handClap,
+	&DreamGenContext::monkAndRyan, &DreamGenContext::endGameSeq,
 	&DreamGenContext::priest, &DreamGenContext::madman,
-	&DreamGenContext::madmanstelly, &DreamGenContext::alleybarksound,
-	&DreamGenContext::foghornsound, &DreamGenContext::carparkdrip,
-	&DreamGenContext::carparkdrip, &DreamGenContext::carparkdrip,
-	&DreamGenContext::carparkdrip
+	&DreamGenContext::madmansTelly, &DreamGenContext::alleyBarkSound,
+	&DreamGenContext::foghornSound, &DreamGenContext::carParkDrip,
+	&DreamGenContext::carParkDrip, &DreamGenContext::carParkDrip,
+	&DreamGenContext::carParkDrip
 };
 
 static void (DreamGenContext::*reelCallbacksCPP[57])(ReelRoutine &) = {
-	&DreamGenContext::gamer, &DreamGenContext::sparkydrip,
-	&DreamGenContext::eden, /*&DreamGenContext::edeninbath*/NULL,
-	&DreamGenContext::sparky, /*&DreamGenContext::smokebloke*/NULL,
-	/*&DreamGenContext::manasleep*/NULL, /*&DreamGenContext::drunk*/NULL,
-	/*&DreamGenContext::receptionist*/NULL, /*&DreamGenContext::malefan*/NULL,
-	/*&DreamGenContext::femalefan*/NULL, /*&DreamGenContext::louis*/NULL,
-	/*&DreamGenContext::louischair*/NULL, /*&DreamGenContext::soldier1*/NULL,
-	/*&DreamGenContext::bossman*/NULL, /*&DreamGenContext::interviewer*/NULL,
-	/*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manasleep2*/NULL,
-	/*&DreamGenContext::mansatstill*/NULL, /*&DreamGenContext::drinker*/NULL,
-	/*&DreamGenContext::bartender*/NULL, &DreamGenContext::othersmoker,
-	/*&DreamGenContext::tattooman*/NULL, /*&DreamGenContext::attendant*/NULL,
+	&DreamGenContext::gamer, &DreamGenContext::sparkyDrip,
+	&DreamGenContext::eden, /*&DreamGenContext::edenInBath*/NULL,
+	&DreamGenContext::sparky, /*&DreamGenContext::smokeBloke*/NULL,
+	/*&DreamGenContext::manAsleep*/NULL, /*&DreamGenContext::drunk*/NULL,
+	/*&DreamGenContext::receptionist*/NULL, /*&DreamGenContext::maleFan*/NULL,
+	/*&DreamGenContext::femaleFan*/NULL, /*&DreamGenContext::louis*/NULL,
+	/*&DreamGenContext::louisChair*/NULL, /*&DreamGenContext::soldier1*/NULL,
+	/*&DreamGenContext::bossMan*/NULL, /*&DreamGenContext::interviewer*/NULL,
+	/*&DreamGenContext::heavy*/NULL, /*&DreamGenContext::manAsleep2*/NULL,
+	/*&DreamGenContext::manSatStill*/NULL, /*&DreamGenContext::drinker*/NULL,
+	/*&DreamGenContext::bartender*/NULL, &DreamGenContext::otherSmoker,
+	/*&DreamGenContext::tattooMan*/NULL, /*&DreamGenContext::attendant*/NULL,
 	/*&DreamGenContext::keeper*/NULL, /*&DreamGenContext::candles1*/NULL,
 	/*&DreamGenContext::smallcandle*/NULL, /*&DreamGenContext::security*/NULL,
-	/*&DreamGenContext::copper*/NULL, /*&DreamGenContext::poolguard*/NULL,
-	/*&DreamGenContext::rockstar*/NULL, /*&DreamGenContext::businessman*/NULL,
+	/*&DreamGenContext::copper*/NULL, /*&DreamGenContext::poolGuard*/NULL,
+	/*&DreamGenContext::rockstar*/NULL, /*&DreamGenContext::businessMan*/NULL,
 	/*&DreamGenContext::train*/NULL, /*&DreamGenContext::aide*/NULL,
 	/*&DreamGenContext::mugger*/NULL, /*&DreamGenContext::helicopter*/NULL,
-	/*&DreamGenContext::intromagic1*/NULL, /*&DreamGenContext::intromusic*/NULL,
-	/*&DreamGenContext::intromagic2*/NULL, /*&DreamGenContext::candles2*/NULL,
-	/*&DreamGenContext::gates*/NULL, /*&DreamGenContext::intromagic3*/NULL,
+	/*&DreamGenContext::introMagic1*/NULL, /*&DreamGenContext::introMusic*/NULL,
+	/*&DreamGenContext::introMagic2*/NULL, /*&DreamGenContext::candles2*/NULL,
+	/*&DreamGenContext::gates*/NULL, /*&DreamGenContext::introMagic3*/NULL,
 	/*&DreamGenContext::intromonks1*/NULL, /*&DreamGenContext::candles*/NULL,
-	/*&DreamGenContext::intromonks2*/NULL, /*&DreamGenContext::handclap*/NULL,
-	/*&DreamGenContext::monkandryan*/NULL, /*&DreamGenContext::endgameseq*/NULL,
+	/*&DreamGenContext::intromonks2*/NULL, /*&DreamGenContext::handClap*/NULL,
+	/*&DreamGenContext::monkAndRyan*/NULL, /*&DreamGenContext::endGameSeq*/NULL,
 	/*&DreamGenContext::priest*/NULL, /*&DreamGenContext::madman*/NULL,
-	/*&DreamGenContext::madmanstelly*/NULL, /*&DreamGenContext::alleybarksound*/NULL,
-	/*&DreamGenContext::foghornsound*/NULL, /*&DreamGenContext::carparkdrip*/NULL,
-	/*&DreamGenContext::carparkdrip*/NULL, /*&DreamGenContext::carparkdrip*/NULL,
-	/*&DreamGenContext::carparkdrip*/NULL
+	/*&DreamGenContext::madmansTelly*/NULL, /*&DreamGenContext::alleyBarkSound*/NULL,
+	/*&DreamGenContext::foghornSound*/NULL, /*&DreamGenContext::carParkDrip*/NULL,
+	/*&DreamGenContext::carParkDrip*/NULL, /*&DreamGenContext::carParkDrip*/NULL,
+	/*&DreamGenContext::carParkDrip*/NULL
 };
 
-void DreamGenContext::updatepeople() {
+void DreamGenContext::updatePeople() {
 	data.word(kListpos) = kPeoplelist;
 	memset(segRef(data.word(kBuffers)).ptr(kPeoplelist, 12 * sizeof(People)), 0xff, 12 * sizeof(People));
 	++data.word(kMaintimer);
@@ -658,7 +656,7 @@ void DreamGenContext::updatepeople() {
 	}
 }
 
-void DreamGenContext::madmantext() {
+void DreamGenContext::madmanText() {
 	if (isCD()) {
 		if (data.byte(kSpeechcount) >= 63)
 			return;
@@ -675,21 +673,21 @@ void DreamGenContext::madmantext() {
 			return;
 		al = data.byte(kCombatcount) / 4;
 	}
-	setuptimedtemp(47 + al, 82, 72, 80, 90, 1);
+	setupTimedTemp(47 + al, 82, 72, 80, 90, 1);
 }
 
 void DreamGenContext::madman() {
 	ReelRoutine *routine = (ReelRoutine *)es.ptr(bx, 0);
 	data.word(kWatchingtime) = 2;
-	if (checkspeed(routine)) {
+	if (checkSpeed(routine)) {
 		ax = routine->reelPointer();
 		if (ax >= 364) {
 			data.byte(kMandead) = 2;
-			showgamereel(routine);
+			showGameReel(routine);
 			return;
 		}
 		if (ax == 10) {
-			loadtemptext("DREAMWEB.T82");
+			loadTempText("DREAMWEB.T82");
 			data.byte(kCombatcount) = (uint8)-1;
 			data.byte(kSpeechcount) = 0;
 		}
@@ -700,7 +698,7 @@ void DreamGenContext::madman() {
 			data.byte(kWongame) = 1;
 			push(es);
 			push(bx);
-			getridoftemptext();
+			getRidOfTempText();
 			bx = pop();
 			es = pop();
 			return;
@@ -709,7 +707,7 @@ void DreamGenContext::madman() {
 			++data.byte(kCombatcount);
 			push(es);
 			push(bx);
-			madmantext();
+			madmanText();
 			bx = pop();
 			es = pop();
 			ax = 53;
@@ -728,12 +726,12 @@ void DreamGenContext::madman() {
 		}
 		routine->setReelPointer(ax);
 	}
-	showgamereel(routine);
+	showGameReel(routine);
 	routine->mapX = data.byte(kMapx);
-	madmode();
+	madMode();
 }
 
-void DreamGenContext::madmode() {
+void DreamGenContext::madMode() {
 	data.word(kWatchingtime) = 2;
 	data.byte(kPointermode) = 0;
 	if (data.byte(kCombatcount) < (isCD() ? 65 : 63))
@@ -743,7 +741,7 @@ void DreamGenContext::madmode() {
 	data.byte(kPointermode) = 2;
 }
 
-void DreamGenContext::movemap(uint8 param) {
+void DreamGenContext::moveMap(uint8 param) {
 	switch (param) {
 	case 32:
 		data.byte(kMapy) -= 20;
@@ -764,9 +762,9 @@ void DreamGenContext::movemap(uint8 param) {
 	data.byte(kNowinnewroom) = 1;
 }
 
-void DreamGenContext::checkone() {
+void DreamGenContext::checkOne() {
 	uint8 flag, flagEx, type, flagX, flagY;
-	checkone(cl, ch, &flag, &flagEx, &type, &flagX, &flagY);
+	checkOne(cl, ch, &flag, &flagEx, &type, &flagX, &flagY);
 
 	cl = flag;
 	ch = flagEx;
@@ -775,7 +773,7 @@ void DreamGenContext::checkone() {
 	al = type;
 }
 
-void DreamGenContext::checkone(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
+void DreamGenContext::checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY) {
 	*flagX = x / 16;
 	*flagY = y / 16;
 	const uint8 *tileData = segRef(data.word(kBuffers)).ptr(kMapflags + (*flagY * 11 + *flagX) * 3, 3);
@@ -784,24 +782,24 @@ void DreamGenContext::checkone(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uin
 	*type = tileData[2];
 }
 
-void DreamGenContext::getblockofpixel() {
-	al = getblockofpixel(cl, ch);
+void DreamGenContext::getBlockOfPixel() {
+	al = getBlockOfPixel(cl, ch);
 }
 
-uint8 DreamGenContext::getblockofpixel(uint8 x, uint8 y) {
+uint8 DreamGenContext::getBlockOfPixel(uint8 x, uint8 y) {
 	uint8 flag, flagEx, type, flagX, flagY;
-	checkone(x + data.word(kMapxstart), y + data.word(kMapystart), &flag, &flagEx, &type, &flagX, &flagY);
+	checkOne(x + data.word(kMapxstart), y + data.word(kMapystart), &flag, &flagEx, &type, &flagX, &flagY);
 	if (flag & 1)
 		return 0;
 	else
 		return type;
 }
 
-void DreamGenContext::addtopeoplelist() {
-	addtopeoplelist((ReelRoutine *)es.ptr(bx, sizeof(ReelRoutine)));
+void DreamGenContext::addToPeopleList() {
+	addToPeopleList((ReelRoutine *)es.ptr(bx, sizeof(ReelRoutine)));
 }
 
-void DreamGenContext::addtopeoplelist(ReelRoutine *routine) {
+void DreamGenContext::addToPeopleList(ReelRoutine *routine) {
 	uint16 routinePointer = (const uint8 *)routine - cs.ptr(0, 0);
 
 	People *people = (People *)segRef(data.word(kBuffers)).ptr(data.word(kListpos), sizeof(People));
@@ -811,10 +809,10 @@ void DreamGenContext::addtopeoplelist(ReelRoutine *routine) {
 	data.word(kListpos) += sizeof(People);
 }
 
-Rain *DreamGenContext::splitintolines(uint8 x, uint8 y, Rain *rain) {
+Rain *DreamGenContext::splitIntoLines(uint8 x, uint8 y, Rain *rain) {
 	do {
 		// Look for line start
-		while (!getblockofpixel(x, y)) {
+		while (!getBlockOfPixel(x, y)) {
 			--x;
 			++y;
 			if (x == 0 || y >= data.byte(kMapysize))
@@ -827,7 +825,7 @@ Rain *DreamGenContext::splitintolines(uint8 x, uint8 y, Rain *rain) {
 		uint8 length = 1;
 
 		// Look for line end
-		while (getblockofpixel(x, y)) {
+		while (getBlockOfPixel(x, y)) {
 			--x;
 			++y;
 			if (x == 0 || y >= data.byte(kMapysize))
@@ -882,7 +880,7 @@ static const RainLocation rainLocationList[] = {
 	{ 255,0,0,0 }
 };
 
-void DreamGenContext::initrain() {
+void DreamGenContext::initRain() {
 	const RainLocation *r = rainLocationList;
 	Rain *rainList = (Rain *)segRef(data.word(kBuffers)).ptr(kRainlist, 0);
 	Rain *rain = rainList;
@@ -916,7 +914,7 @@ void DreamGenContext::initrain() {
 		if (x >= data.byte(kMapxsize))
 			break;
 
-		rain = splitintolines(x, 0, rain);
+		rain = splitIntoLines(x, 0, rain);
 	} while (true);
 
 	// start lines of rain from side of screen
@@ -931,13 +929,13 @@ void DreamGenContext::initrain() {
 		if (y >= data.byte(kMapysize))
 			break;
 
-		rain = splitintolines(data.byte(kMapxsize) - 1, y, rain);
+		rain = splitIntoLines(data.byte(kMapxsize) - 1, y, rain);
 	} while (true);
 
 	rain->x = 0xff;
 }
 
-void DreamGenContext::textforend() {
+void DreamGenContext::textForEnd() {
 	if (data.byte(kIntrocount) == 20)
 		al = 0;
 	else if (data.byte(kIntrocount) == (isCD() ? 50 : 65))
@@ -952,10 +950,10 @@ void DreamGenContext::textforend() {
 	cx = 60;
 	dx = 1;
 	ah = 83;
-	setuptimedtemp();
+	setupTimedTemp();
 }
 
-void DreamGenContext::textformonk() {
+void DreamGenContext::textForMonk() {
 	if (data.byte(kIntrocount) == 1) {
 		al = 19;
 		bl = 68;
@@ -1022,7 +1020,7 @@ void DreamGenContext::textformonk() {
 		bh = 154;
 		cx = 220;
 	} else if (data.byte(kIntrocount) == 53) {
-		fadescreendowns();
+		fadeScreenDowns();
 		if (isCD()) {
 			data.byte(kVolumeto) = 7;
 			data.byte(kVolumedirection) = 1;
@@ -1039,35 +1037,35 @@ void DreamGenContext::textformonk() {
 		return;
 	}
 
-	setuptimedtemp();
+	setupTimedTemp();
 }
 
-void DreamGenContext::reelsonscreen() {
+void DreamGenContext::reelsOnScreen() {
 	reconstruct();
-	updatepeople();
-	watchreel();
-	showrain();
-	usetimedtext();
+	updatePeople();
+	watchReel();
+	showRain();
+	useTimedText();
 }
 
 void DreamGenContext::reconstruct() {
 	if (data.byte(kHavedoneobs) == 0)
 		return;
 	data.byte(kNewobs) = 1;
-	drawfloor();
-	spriteupdate();
-	printsprites();
+	drawFloor();
+	spriteUpdate();
+	printSprites();
 	if ((data.byte(kForeignrelease) != 0) && (data.byte(kReallocation) == 20))
-		undertextline();
+		underTextLine();
 	data.byte(kHavedoneobs) = 0;
 }
 
-void DreamGenContext::checkspeed() {
+void DreamGenContext::checkSpeed() {
 	ReelRoutine *routine = (ReelRoutine *)es.ptr(bx, sizeof(ReelRoutine));
-	flags._z = checkspeed(routine);
+	flags._z = checkSpeed(routine);
 }
 
-bool DreamGenContext::checkspeed(ReelRoutine *routine) {
+bool DreamGenContext::checkSpeed(ReelRoutine *routine) {
 	if (data.byte(kLastweapon) != (uint8)-1)
 		return true;
 	++routine->counter;
@@ -1077,18 +1075,18 @@ bool DreamGenContext::checkspeed(ReelRoutine *routine) {
 	return true;
 }
 
-void DreamGenContext::sparkydrip(ReelRoutine &routine) {
-	if (checkspeed(&routine))
-		playchannel0(14, 0);
+void DreamGenContext::sparkyDrip(ReelRoutine &routine) {
+	if (checkSpeed(&routine))
+		playChannel0(14, 0);
 }
 
-void DreamGenContext::othersmoker(ReelRoutine &routine) {
-	showgamereel(&routine);
-	addtopeoplelist(&routine);
+void DreamGenContext::otherSmoker(ReelRoutine &routine) {
+	showGameReel(&routine);
+	addToPeopleList(&routine);
 }
 
 void DreamGenContext::gamer(ReelRoutine &routine) {
-	if (checkspeed(&routine)) {
+	if (checkSpeed(&routine)) {
 		uint8 v;
 		do {
 			v = 20 + engine->randomNumber() % 5;
@@ -1096,21 +1094,21 @@ void DreamGenContext::gamer(ReelRoutine &routine) {
 		routine.setReelPointer(v);
 	}
 
-	showgamereel(&routine);
-	addtopeoplelist(&routine);
+	showGameReel(&routine);
+	addToPeopleList(&routine);
 }
 
 void DreamGenContext::eden(ReelRoutine &routine) {
 	if (data.byte(kGeneraldead))
 		return;
-	showgamereel(&routine);
-	addtopeoplelist(&routine);
+	showGameReel(&routine);
+	addToPeopleList(&routine);
 }
 
 void DreamGenContext::sparky(ReelRoutine &routine) {
 	if (data.word(kCard1money))
 		routine.b7 = 3;
-	if (checkspeed(&routine)) {
+	if (checkSpeed(&routine)) {
 		if (routine.reelPointer() != 34) {
 			if (engine->randomNumber() < 30)
 				routine.incReelPointer();
@@ -1123,8 +1121,8 @@ void DreamGenContext::sparky(ReelRoutine &routine) {
 				routine.setReelPointer(27);
 		}
 	}
-	showgamereel(&routine);
-	addtopeoplelist(&routine);
+	showGameReel(&routine);
+	addToPeopleList(&routine);
 	if (routine.b7 & 128)
 		data.byte(kTalkedtosparky) = 1;
 }
diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 2d8faa7a58..46e849628a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -40,22 +40,22 @@ void DreamGenContext::dreamweb() {
 		break;
 	}
 
-	seecommandtail();
-	soundstartup();
-	setkeyboardint();
-	allocatebuffers();
-	setmouse();
-	fadedos();
-	gettime();
-	clearbuffers();
-	clearpalette();
-	set16colpalette();
-	readsetdata();
+	seeCommandTail();
+	soundStartup();
+	setKeyboardInt();
+	allocateBuffers();
+	setMouse();
+	fadeDOS();
+	getTime();
+	clearBuffers();
+	clearPalette();
+	set16ColPalette();
+	readSetData();
 	data.byte(kWongame) = 0;
 
 	dx = 1909;
-	loadsample();
-	setsoundoff();
+	loadSample();
+	setSoundOff();
 
 	bool firstLoop = true;
 
@@ -63,7 +63,7 @@ void DreamGenContext::dreamweb() {
 
 	while (true) {
 
-		scanfornames();
+		scanForNames();
 
 		bool startNewGame = true;
 
@@ -72,32 +72,32 @@ void DreamGenContext::dreamweb() {
 			// loading a savegame requested from launcher/command line
 
 			cls();
-			setmode();
-			loadpalfromiff();
-			clearpalette();
+			setMode();
+			loadPalFromIFF();
+			clearPalette();
 
 			ax = savegameId;
-			doload();
-			worktoscreen();
-			fadescreenup();
+			doLoad();
+			workToScreen();
+			fadeScreenUp();
 			startNewGame = false;
 
 		} else if (al == 0 && firstLoop) {
 
 			// no savegames found, and we're not restarting.
 
-			setmode();
-			loadpalfromiff();
+			setMode();
+			loadPalFromIFF();
 
 		} else {
-			// "dodecisions"
+			// "doDecisions"
 
 			// Savegames found, so ask if we should load one.
 			// (If we're restarting after game over, we also always show these
 			// options.)
 
 			cls();
-			setmode();
+			setMode();
 			decide();
 			if (quitRequested())
 				return; // exit game
@@ -110,7 +110,7 @@ void DreamGenContext::dreamweb() {
 		firstLoop = false;
 
 		if (startNewGame) {
-			// "playgame"
+			// "playGame"
 
 			titles();
 			if (quitRequested())
@@ -120,20 +120,20 @@ void DreamGenContext::dreamweb() {
 			if (quitRequested())
 				return; // exit game
 
-			clearchanges();
-			setmode();
-			loadpalfromiff();
+			clearChanges();
+			setMode();
+			loadPalFromIFF();
 			data.byte(kLocation) = 255;
 			data.byte(kRoomafterdream) = 1;
 			data.byte(kNewlocation) = 35;
 			data.byte(kVolume) = 7;
-			loadroom();
-			clearsprites();
-			initman();
-			entrytexts();
-			entryanims();
+			loadRoom();
+			clearSprites();
+			initMan();
+			entryTexts();
+			entryAnims();
 			data.byte(kDestpos) = 3;
-			initialinv();
+			initialInv();
 			data.byte(kLastflag) = 32;
 			startup1();
 			data.byte(kVolumeto) = 0;
@@ -148,18 +148,18 @@ void DreamGenContext::dreamweb() {
 			if (quitRequested())
 				return; // exit game
 
-			screenupdate();
+			screenUpdate();
 
 			if (quitRequested())
 				return; // exit game
 
 			if (data.byte(kWongame) != 0) {
 				// "endofgame"
-				clearbeforeload();
-				fadescreendowns();
-				hangon(200);
-				endgame();
-				quickquit2();
+				clearBeforeLoad();
+				fadeScreenDowns();
+				hangOn(200);
+				endGame();
+				quickQuit2();
 				return;
 			}
 
@@ -172,32 +172,32 @@ void DreamGenContext::dreamweb() {
 			}
 
 			if (data.word(kWatchingtime) == 0) {
-				// "notwatching"
+				// "notWatching"
 
 				if (data.byte(kMandead) == 4)
 					break;
 
 				if (data.byte(kNewlocation) != 255) {
-					// "loadnew"
-					clearbeforeload();
-					loadroom();
-					clearsprites();
-					initman();
-					entrytexts();
-					entryanims();
+					// "loadNew"
+					clearBeforeLoad();
+					loadRoom();
+					clearSprites();
+					initMan();
+					entryTexts();
+					entryAnims();
 					data.byte(kNewlocation) = 255;
 					startup();
 					data.byte(kCommandtype) = 255;
-					worktoscreenm();
+					workToScreenM();
 				}
 			}
 		}
 
-		// "gameover"
-		clearbeforeload();
-		showgun();
-		fadescreendown();
-		hangon(100);
+		// "gameOver"
+		clearBeforeLoad();
+		showGun();
+		fadeScreenDown();
+		hangOn(100);
 
 	}
 }
@@ -206,92 +206,92 @@ bool DreamGenContext::quitRequested() {
 	return data.byte(kQuitrequested);
 }
 
-void DreamGenContext::screenupdate() {
-	newplace();
-	mainscreen();
+void DreamGenContext::screenUpdate() {
+	newPlace();
+	mainScreen();
 	if (quitRequested())
 		return;
-	animpointer();
+	animPointer();
 
-	showpointer();
+	showPointer();
 	if ((data.word(kWatchingtime) == 0) && (data.byte(kNewlocation) != 0xff))
 		return;
-	vsync();
+	vSync();
 	uint16 mouseState = 0;
 	mouseState |= readMouseState();
-	dumppointer();
+	dumpPointer();
 
-	dumptextline();
-	delpointer();
-	autolook();
-	spriteupdate();
-	watchcount();
+	dumpTextLine();
+	delPointer();
+	autoLook();
+	spriteUpdate();
+	watchCount();
 	zoom();
 
-	showpointer();
+	showPointer();
 	if (data.byte(kWongame))
 		return;
-	vsync();
+	vSync();
 	mouseState |= readMouseState();
-	dumppointer();
+	dumpPointer();
 
-	dumpzoom();
-	delpointer();
-	deleverything();
-	printsprites();
-	reelsonscreen();
-	afternewroom();
+	dumpZoom();
+	delPointer();
+	delEverything();
+	printSprites();
+	reelsOnScreen();
+	afterNewRoom();
 
-	showpointer();
-	vsync();
+	showPointer();
+	vSync();
 	mouseState |= readMouseState();
-	dumppointer();
+	dumpPointer();
 
-	dumpmap();
-	dumptimedtext();
-	delpointer();
+	dumpMap();
+	dumpTimedText();
+	delPointer();
 
-	showpointer();
-	vsync();
+	showPointer();
+	vSync();
 	data.word(kOldbutton) = data.word(kMousebutton);
 	mouseState |= readMouseState();
 	data.word(kMousebutton) = mouseState;
-	dumppointer();
+	dumpPointer();
 
-	dumpwatch();
-	delpointer();
+	dumpWatch();
+	delPointer();
 }
 
 void DreamGenContext::startup() {
 	data.byte(kCurrentkey) = 0;
 	data.byte(kMainmode) = 0;
-	createpanel();
+	createPanel();
 	data.byte(kNewobs) = 1;
-	drawfloor();
-	showicon();
-	getunderzoom();
-	spriteupdate();
-	printsprites();
-	undertextline();
-	reelsonscreen();
+	drawFloor();
+	showIcon();
+	getUnderZoom();
+	spriteUpdate();
+	printSprites();
+	underTextLine();
+	reelsOnScreen();
 	atmospheres();
 }
 
 void DreamGenContext::startup1() {
-	clearpalette();
+	clearPalette();
 	data.byte(kThroughdoor) = 0;
 
 	startup();
 
-	worktoscreen();
-	fadescreenup();
+	workToScreen();
+	fadeScreenUp();
 }
 
-void DreamGenContext::switchryanon() {
+void DreamGenContext::switchRyanOn() {
 	data.byte(kRyanon) = 255;
 }
 
-void DreamGenContext::switchryanoff() {
+void DreamGenContext::switchRyanOff() {
 	data.byte(kRyanon) = 1;
 }
 
@@ -304,65 +304,65 @@ uint8 *DreamGenContext::textUnder() {
 	return segRef(data.word(kBuffers)).ptr(kTextunder, 0);
 }
 
-uint16 DreamGenContext::standardload(const char *fileName) {
+uint16 DreamGenContext::standardLoad(const char *fileName) {
 	engine->openFile(fileName);
 	engine->readFromFile(cs.ptr(kFileheader, kHeaderlen), kHeaderlen);
 	uint16 sizeInBytes = cs.word(kFiledata);
-	uint16 result = allocatemem((sizeInBytes + 15) / 16);
+	uint16 result = allocateMem((sizeInBytes + 15) / 16);
 	engine->readFromFile(segRef(result).ptr(0, 0), sizeInBytes);
 	engine->closeFile();
 	return result;
 }
 
-void DreamGenContext::standardload() {
-	ax = standardload((const char *)cs.ptr(dx, 0));
+void DreamGenContext::standardLoad() {
+	ax = standardLoad((const char *)cs.ptr(dx, 0));
 }
 
-void DreamGenContext::loadintotemp() {
-	loadintotemp((const char *)cs.ptr(dx, 0));
+void DreamGenContext::loadIntoTemp() {
+	loadIntoTemp((const char *)cs.ptr(dx, 0));
 }
 
-void DreamGenContext::loadintotemp2() {
-	loadintotemp2((const char *)cs.ptr(dx, 0));
+void DreamGenContext::loadIntoTemp2() {
+	loadIntoTemp2((const char *)cs.ptr(dx, 0));
 }
 
-void DreamGenContext::loadintotemp3() {
-	loadintotemp3((const char *)cs.ptr(dx, 0));
+void DreamGenContext::loadIntoTemp3() {
+	loadIntoTemp3((const char *)cs.ptr(dx, 0));
 }
 
-void DreamGenContext::loadintotemp(const char *fileName) {
-	data.word(kTempgraphics) = standardload(fileName);
+void DreamGenContext::loadIntoTemp(const char *fileName) {
+	data.word(kTempgraphics) = standardLoad(fileName);
 }
 
-void DreamGenContext::loadintotemp2(const char *fileName) {
-	data.word(kTempgraphics2) = standardload(fileName);
+void DreamGenContext::loadIntoTemp2(const char *fileName) {
+	data.word(kTempgraphics2) = standardLoad(fileName);
 }
 
-void DreamGenContext::loadintotemp3(const char *fileName) {
-	data.word(kTempgraphics3) = standardload(fileName);
+void DreamGenContext::loadIntoTemp3(const char *fileName) {
+	data.word(kTempgraphics3) = standardLoad(fileName);
 }
 
-void DreamGenContext::loadtempcharset() {
-	loadtempcharset((const char *)cs.ptr(dx, 0));
+void DreamGenContext::loadTempCharset() {
+	loadTempCharset((const char *)cs.ptr(dx, 0));
 }
 
-void DreamGenContext::loadtempcharset(const char *fileName) {
-	data.word(kTempcharset) = standardload(fileName);
+void DreamGenContext::loadTempCharset(const char *fileName) {
+	data.word(kTempcharset) = standardLoad(fileName);
 }
 
 Frame *DreamGenContext::tempCharset() {
 	return (Frame *)segRef(data.word(kTempcharset)).ptr(0, 0);
 }
 
-void DreamGenContext::hangoncurs(uint16 frameCount) {
+void DreamGenContext::hangOnCurs(uint16 frameCount) {
 	for (uint16 i = 0; i < frameCount; ++i) {
-		printcurs();
-		vsync();
-		delcurs();
+		printCurs();
+		vSync();
+		delCurs();
 	}
 }
 
-void DreamGenContext::seecommandtail() {
+void DreamGenContext::seeCommandTail() {
 	data.word(kSoundbaseadd) = 0x220;
 	data.byte(kSoundint) = 5;
 	data.byte(kSounddmachannel) = 1;
@@ -370,29 +370,29 @@ void DreamGenContext::seecommandtail() {
 	data.word(kHowmuchalloc) = 0x9360;
 }
 
-void DreamGenContext::randomnumber() {
+void DreamGenContext::randomNumber() {
 	al = engine->randomNumber();
 }
 
-void DreamGenContext::quickquit() {
+void DreamGenContext::quickQuit() {
 	engine->quit();
 }
 
-void DreamGenContext::quickquit2() {
+void DreamGenContext::quickQuit2() {
 	engine->quit();
 }
 
-void DreamGenContext::keyboardread() {
+void DreamGenContext::keyboardRead() {
 	::error("keyboardread"); //this keyboard int handler, must never be called
 }
 
-void DreamGenContext::resetkeyboard() {
+void DreamGenContext::resetKeyboard() {
 }
 
-void DreamGenContext::setkeyboardint() {
+void DreamGenContext::setKeyboardInt() {
 }
 
-void DreamGenContext::readfromfile() {
+void DreamGenContext::readFromFile() {
 	uint16 dst_offset = dx;
 	uint16 size = cx;
 	debug(1, "readfromfile(%04x:%u, %u)", (uint16)ds, dst_offset, size);
@@ -400,38 +400,37 @@ void DreamGenContext::readfromfile() {
 	flags._c = false;
 }
 
-void DreamGenContext::closefile() {
+void DreamGenContext::closeFile() {
 	engine->closeFile();
 	data.byte(kHandle) = 0;
 }
 
-void DreamGenContext::openforsave(unsigned int slot) {
+void DreamGenContext::openForSave(unsigned int slot) {
 	//Common::String filename = ConfMan.getActiveDomainName() + Common::String::format(".d%02d", savegameId);
 	Common::String filename = Common::String::format("DREAMWEB.D%02d", slot);
-	debug(1, "openforsave(%s)", filename.c_str());
+	debug(1, "openForSave(%s)", filename.c_str());
 	engine->openSaveFileForWriting(filename);
 }
 
-void DreamGenContext::openforload(unsigned int slot) {
+void DreamGenContext::openForLoad(unsigned int slot) {
 	//Common::String filename = ConfMan.getActiveDomainName() + Common::String::format(".d%02d", savegameId);
 	Common::String filename = Common::String::format("DREAMWEB.D%02d", slot);
-	debug(1, "openforload(%s)", filename.c_str());
+	debug(1, "openForLoad(%s)", filename.c_str());
 	engine->openSaveFileForReading(filename);
 }
 
-
-void DreamGenContext::openfilenocheck() {
+void DreamGenContext::openFileNoCheck() {
 	const char *name = (const char *)ds.ptr(dx, 13);
-	debug(1, "checksavefile(%s)", name);
+	debug(1, "checkSaveFile(%s)", name);
 	bool ok = engine->openSaveFileForReading(name);
 	flags._c = !ok;
 }
 
-void DreamGenContext::openfilefromc() {
-	openfilenocheck();
+void DreamGenContext::openFileFromC() {
+	openFileNoCheck();
 }
 
-void DreamGenContext::openfile() {
+void DreamGenContext::openFile() {
 	Common::String name = getFilename(*this);
 	debug(1, "opening file: %s", name.c_str());
 	engine->openFile(name);
@@ -439,11 +438,11 @@ void DreamGenContext::openfile() {
 	flags._c = false;
 }
 
-void DreamGenContext::createfile() {
+void DreamGenContext::createFile() {
 	::error("createfile");
 }
 
-void DreamGenContext::dontloadseg() {
+void DreamGenContext::dontLoadSeg() {
 	ax = es.word(di);
 	_add(di, 2);
 	dx = ax;
@@ -454,7 +453,7 @@ void DreamGenContext::dontloadseg() {
 	flags._c = false;
 }
 
-void DreamGenContext::mousecall() {
+void DreamGenContext::mouseCall() {
 	uint16 x, y, state;
 	engine->mouseCall(&x, &y, &state);
 	cx = x;
@@ -462,7 +461,7 @@ void DreamGenContext::mousecall() {
 	bx = state;
 }
 
-void DreamGenContext::readmouse() {
+void DreamGenContext::readMouse() {
 	data.word(kOldbutton) = data.word(kMousebutton);
 	uint16 state = readMouseState();
 	data.word(kMousebutton) = state;
@@ -478,11 +477,11 @@ uint16 DreamGenContext::readMouseState() {
 	return state;
 }
 
-void DreamGenContext::setmouse() {
+void DreamGenContext::setMouse() {
 	data.word(kOldpointerx) = 0xffff;
 }
 
-void DreamGenContext::dumptextline() {
+void DreamGenContext::dumpTextLine() {
 	if (data.byte(kNewtextline) != 1)
 		return;
 	data.byte(kNewtextline) = 0;
@@ -490,39 +489,39 @@ void DreamGenContext::dumptextline() {
 	uint16 y = data.word(kTextaddressy);
 	if (data.byte(kForeignrelease) != 0)
 		y -= 3;
-	multidump(x, y, 228, 13);
+	multiDump(x, y, 228, 13);
 }
 
-void DreamGenContext::getundertimed() {
+void DreamGenContext::getUnderTimed() {
 	uint16 y = data.byte(kTimedy);
 	if (data.byte(kForeignrelease))
 		y -= 3;
 	ds = data.word(kBuffers);
 	si = kUndertimedtext;
-	multiget(ds.ptr(si, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
+	multiGet(ds.ptr(si, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
 }
 
-void DreamGenContext::putundertimed() {
+void DreamGenContext::putUnderTimed() {
 	uint16 y = data.byte(kTimedy);
 	if (data.byte(kForeignrelease))
 		y -= 3;
 	ds = data.word(kBuffers);
 	si = kUndertimedtext;
-	multiput(ds.ptr(si, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
+	multiPut(ds.ptr(si, 0), data.byte(kTimedx), y, 240, kUndertimedysize);
 }
 
-void DreamGenContext::usetimedtext() {
+void DreamGenContext::useTimedText() {
 	if (data.word(kTimecount) == 0)
 		return;
 	--data.word(kTimecount);
 	if (data.word(kTimecount) == 0) {
-		putundertimed();
+		putUnderTimed();
 		data.byte(kNeedtodumptimed) = 1;
 		return;
 	}
 
 	if (data.word(kTimecount) == data.word(kCounttotimed))
-		getundertimed();
+		getUnderTimed();
 	else if (data.word(kTimecount) > data.word(kCounttotimed))
 		return;
 
@@ -530,15 +529,15 @@ void DreamGenContext::usetimedtext() {
 	si = data.word(kTimedoffset);
 	const uint8 *string = es.ptr(si, 0);
 	uint16 y = data.byte(kTimedy);
-	printdirect(&string, data.byte(kTimedx), &y, 237, true);
+	printDirect(&string, data.byte(kTimedx), &y, 237, true);
 	data.byte(kNeedtodumptimed) = 1;
 }
 
-void DreamGenContext::setuptimedtemp() {
-	setuptimedtemp(al, ah, bl, bh, cx, dx);
+void DreamGenContext::setupTimedTemp() {
+	setupTimedTemp(al, ah, bl, bh, cx, dx);
 }
 
-void DreamGenContext::setuptimedtemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
+void DreamGenContext::setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount) {
 #if 1 // if cd
 	if (voiceIndex != 0) {
 		push(ax);
@@ -550,9 +549,9 @@ void DreamGenContext::setuptimedtemp(uint8 textIndex, uint8 voiceIndex, uint8 x,
 		cl = 'T';
 		ah = 0;
 		al = textIndex;
-		loadspeech();
+		loadSpeech();
 		if (data.byte(kSpeechloaded) == 1) {
-			playchannel1(50+12);
+			playChannel1(50+12);
 		}
 		dx = pop();
 		cx = pop();
@@ -576,21 +575,21 @@ void DreamGenContext::setuptimedtemp(uint8 textIndex, uint8 voiceIndex, uint8 x,
 	data.word(kTimedseg) = data.word(kTextfile1);
 	data.word(kTimedoffset) = kTextstart + segRef(data.word(kTextfile1)).word(textIndex * 2);
 	const uint8 *string = segRef(data.word(kTextfile1)).ptr(data.word(kTimedoffset), 0);
-	debug(1, "setuptimedtemp: (%d, %d) => '%s'", textIndex, voiceIndex, string);
+	debug(1, "setupTimedTemp: (%d, %d) => '%s'", textIndex, voiceIndex, string);
 }
 
-void DreamGenContext::dumptimedtext() {
+void DreamGenContext::dumpTimedText() {
 	if (data.byte(kNeedtodumptimed) != 1)
 		return;
 	uint8 y = data.byte(kTimedy);
 	if (data.byte(kForeignrelease) != 0)
 		y -= 3;
 
-	multidump(data.byte(kTimedx), y, 240, kUndertimedysize);
+	multiDump(data.byte(kTimedx), y, 240, kUndertimedysize);
 	data.byte(kNeedtodumptimed) = 0;
 }
 
-void DreamGenContext::gettime() {
+void DreamGenContext::getTime() {
 	TimeDate t;
 	g_system->getTimeAndDate(t);
 	debug(1, "\tgettime: %02d:%02d:%02d", t.tm_hour, t.tm_min, t.tm_sec);
@@ -602,11 +601,11 @@ void DreamGenContext::gettime() {
 	data.byte(kHourcount) = ch;
 }
 
-void DreamGenContext::allocatemem() {
-	ax = allocatemem(bx);
+void DreamGenContext::allocateMem() {
+	ax = allocateMem(bx);
 }
 
-uint16 DreamGenContext::allocatemem(uint16 paragraphs) {
+uint16 DreamGenContext::allocateMem(uint16 paragraphs) {
 	uint size = (paragraphs + 2) * 16;
 	debug(1, "allocate mem, %u bytes", size);
 	flags._c = false;
@@ -616,11 +615,11 @@ uint16 DreamGenContext::allocatemem(uint16 paragraphs) {
 	return result;
 }
 
-void DreamGenContext::deallocatemem() {
-	deallocatemem((uint16)es);
+void DreamGenContext::deallocateMem() {
+	deallocateMem((uint16)es);
 }
 
-void DreamGenContext::deallocatemem(uint16 segment) {
+void DreamGenContext::deallocateMem(uint16 segment) {
 	debug(1, "deallocating segment %04x", segment);
 	deallocateSegment(segment);
 
@@ -641,48 +640,48 @@ void DreamGenContext::deallocatemem(uint16 segment) {
 	}
 }
 
-void DreamGenContext::soundstartup() {}
-void DreamGenContext::soundend() {}
-void DreamGenContext::interupttest() {}
-void DreamGenContext::disablesoundint() {}
-void DreamGenContext::enablesoundint() {}
-void DreamGenContext::checksoundint() {
+void DreamGenContext::soundStartup() {}
+void DreamGenContext::soundEnd() {}
+void DreamGenContext::interruptTest() {}
+void DreamGenContext::disableSoundInt() {}
+void DreamGenContext::enableSoundInt() {}
+void DreamGenContext::checkSoundInt() {
 	data.byte(kTestresult) = 1;
 }
 
-void DreamGenContext::setsoundoff() {
+void DreamGenContext::setSoundOff() {
 	warning("setsoundoff: STUB");
 }
 
-void DreamGenContext::loadsample() {
+void DreamGenContext::loadSample() {
 	engine->loadSounds(0, (const char *)data.ptr(dx, 13));
 }
 
-void DreamGenContext::loadsecondsample() {
+void DreamGenContext::loadSecondSample() {
 	uint8 ch0 = data.byte(kCh0playing);
 	if (ch0 >= 12 && ch0 != 255)
-		cancelch0();
+		cancelCh0();
 	uint8 ch1 = data.byte(kCh1playing);
 	if (ch1 >= 12)
-		cancelch1();
+		cancelCh1();
 	engine->loadSounds(1, (const char *)data.ptr(dx, 13));
 }
 
-void DreamGenContext::loadspeech() {
-	cancelch1();
+void DreamGenContext::loadSpeech() {
+	cancelCh1();
 	data.byte(kSpeechloaded) = 0;
-	createname();
+	createName();
 	const char *name = (const char *)data.ptr(di, 13);
 	//warning("name = %s", name);
 	if (engine->loadSpeech(name))
 		data.byte(kSpeechloaded) = 1;
 }
 
-void DreamGenContext::savefileread() {
+void DreamGenContext::saveFileRead() {
 	ax = engine->readFromSaveFile(ds.ptr(dx, cx), cx);
 }
 
-void DreamGenContext::loadseg() {
+void DreamGenContext::loadSeg() {
 	ax = es.word(di);
 	di += 2;
 
@@ -698,17 +697,16 @@ void DreamGenContext::error() {
 	::error("error");
 }
 
-void DreamGenContext::generalerror() {
-	::error("generalerror");
+void DreamGenContext::generalError() {
+	::error("generalError");
 }
 
-void DreamGenContext::dosreturn() {
-
+void DreamGenContext::DOSReturn() {
 	_cmp(data.byte(kCommandtype), 250);
 	if (!flags.z()) {
 		data.byte(kCommandtype) = 250;
 		al = 46;
-		commandonly();
+		commandOnly();
 	}
 
 	ax = data.word(kMousebutton);
@@ -720,7 +718,7 @@ void DreamGenContext::dosreturn() {
 	engine->quit();
 }
 
-void DreamGenContext::set16colpalette() {
+void DreamGenContext::set16ColPalette() {
 }
 
 void DreamGenContext::mode640x480() {
@@ -730,19 +728,19 @@ void DreamGenContext::mode640x480() {
 	initGraphics(640, 480, true);
 }
 
-void DreamGenContext::showgroup() {
+void DreamGenContext::showGroup() {
 	engine->setPalette();
 }
 
-void DreamGenContext::fadedos() {
+void DreamGenContext::fadeDOS() {
 	engine->fadeDos();
 }
 
-void DreamGenContext::eraseoldobs() {
+void DreamGenContext::eraseOldObs() {
 	if (data.byte(kNewobs) == 0)
 		return;
 
-	Sprite *sprites = spritetable();
+	Sprite *sprites = spriteTable();
 	for (size_t i = 0; i < 16; ++i) {
 		Sprite &sprite = sprites[i];
 		if (sprite.objData() != 0xffff) {
@@ -751,11 +749,11 @@ void DreamGenContext::eraseoldobs() {
 	}
 }
 
-void DreamGenContext::modifychar() {
+void DreamGenContext::modifyChar() {
 	al = engine->modifyChar(al);
 }
 
-void DreamGenContext::lockmon() {
+void DreamGenContext::lockMon() {
 	// Pressing space pauses text output in the monitor. We use the "hard"
 	// key because calling readkey() drains characters from the input
 	// buffer, we we want the user to be able to type ahead while the text
@@ -764,42 +762,42 @@ void DreamGenContext::lockmon() {
 		// Clear the keyboard buffer. Otherwise the space that caused
 		// the pause will be read immediately unpause the game.
 		do {
-			readkey();
+			readKey();
 		} while (data.byte(kCurrentkey) != 0);
 
-		locklighton();
+		lockLightOn();
 		while (!engine->shouldQuit()) {
 			engine->waitForVSync();
-			readkey();
+			readKey();
 			if (data.byte(kCurrentkey) == ' ')
 				break;
 		}
 		// Forget the last "hard" key, otherwise the space that caused
 		// the unpausing will immediately re-pause the game.
 		data.byte(kLasthardkey) = 0;
-		locklightoff();
+		lockLightOff();
 	}
 }
 
-void DreamGenContext::cancelch0() {
+void DreamGenContext::cancelCh0() {
 	data.byte(kCh0repeat) = 0;
 	data.word(kCh0blockstocopy) = 0;
 	data.byte(kCh0playing) = 255;
 	engine->stopSound(0);
 }
 
-void DreamGenContext::cancelch1() {
+void DreamGenContext::cancelCh1() {
 	data.word(kCh1blockstocopy) = 0;
 	data.byte(kCh1playing) = 255;
 	engine->stopSound(1);
 }
 
-void DreamGenContext::makebackob(SetObject *objData) {
+void DreamGenContext::makeBackOb(SetObject *objData) {
 	if (data.byte(kNewobs) == 0)
 		return;
 	uint8 priority = objData->priority;
 	uint8 type = objData->type;
-	Sprite *sprite = makesprite(data.word(kObjectx), data.word(kObjecty), addr_backobject, data.word(kSetframes), 0);
+	Sprite *sprite = makeSprite(data.word(kObjectx), data.word(kObjecty), addr_backobject, data.word(kSetframes), 0);
 
 	uint16 objDataOffset = (uint8 *)objData - segRef(data.word(kSetdat)).ptr(0, 0);
 	assert(objDataOffset % sizeof(SetObject) == 0);
@@ -814,16 +812,16 @@ void DreamGenContext::makebackob(SetObject *objData) {
 	sprite->animFrame = 0;
 }
 
-void DreamGenContext::getroomdata() {
-	Room *room = getroomdata(al);
+void DreamGenContext::getRoomData() {
+	Room *room = getRoomData(al);
 	bx = (uint8 *)room - cs.ptr(0, 0);
 }
 
-Room *DreamGenContext::getroomdata(uint8 room) {
+Room *DreamGenContext::getRoomData(uint8 room) {
 	return (Room *)cs.ptr(kRoomdata, 0) + room;
 }
 
-void DreamGenContext::readheader() {
+void DreamGenContext::readHeader() {
 	ax = engine->readFromFile(cs.ptr(kFileheader, kHeaderlen), kHeaderlen);
 	es = cs;
 	di = kFiledata;
@@ -831,7 +829,7 @@ void DreamGenContext::readheader() {
 
 uint16 DreamGenContext::allocateAndLoad(unsigned int size) {
 	// allocatemem adds 32 bytes, so it doesn't matter that size/16 rounds down
-	uint16 result = allocatemem(size / 16);
+	uint16 result = allocateMem(size / 16);
 	engine->readFromFile(segRef(result).ptr(0, size), size);
 	return result;
 }
@@ -844,7 +842,7 @@ void DreamGenContext::clearAndLoad(uint16 seg, uint8 c,
 	engine->readFromFile(buf, size);
 }
 
-void DreamGenContext::startloading(const Room *room) {
+void DreamGenContext::startLoading(const Room *room) {
 	data.byte(kCombatcount) = 0;
 	data.byte(kRoomssample) = room->roomsSample;
 	data.byte(kMapx) = room->mapX;
@@ -864,11 +862,11 @@ void DreamGenContext::startloading(const Room *room) {
 
 	loadRoomData(room, false);
 
-	findroominloc();
-	deletetaken();
-	setallchanges();
-	autoappear();
-	Room *newRoom = getroomdata(data.byte(kNewlocation));
+	findRoomInLoc();
+	deleteTaken();
+	setAllChanges();
+	autoAppear();
+	Room *newRoom = getRoomData(data.byte(kNewlocation));
 	bx = (uint8 *)newRoom - cs.ptr(0, 0);
 	data.byte(kLastweapon) = (uint8)-1;
 	data.byte(kMandead) = 0;
@@ -878,61 +876,61 @@ void DreamGenContext::startloading(const Room *room) {
 	if (room->b27 != 255) {
 		data.byte(kManspath) = room->b27;
 		push(bx);
-		autosetwalk();
+		autoSetWalk();
 		bx = pop();
 	}
-	findxyfrompath();
+	findXYFromPath();
 }
 
-void DreamGenContext::fillspace() {
+void DreamGenContext::fillSpace() {
 	memset(ds.ptr(dx, cx), al, cx);
 }
 
-void DreamGenContext::dealwithspecial(uint8 firstParam, uint8 secondParam) {
+void DreamGenContext::dealWithSpecial(uint8 firstParam, uint8 secondParam) {
 	uint8 type = firstParam - 220;
 	if (type == 0) {
-		placesetobject(secondParam);
+		placeSetObject(secondParam);
 		data.byte(kHavedoneobs) = 1;
 	} else if (type == 1) {
-		removesetobject(secondParam);
+		removeSetObject(secondParam);
 		data.byte(kHavedoneobs) = 1;
 	} else if (type == 2) {
 		al = secondParam;
-		placefreeobject();
+		placeFreeObject();
 		data.byte(kHavedoneobs) = 1;
 	} else if (type == 3) {
 		al = secondParam;
-		removefreeobject();
+		removeFreeObject();
 		data.byte(kHavedoneobs) = 1;
 	} else if (type == 4) {
-		switchryanoff();
+		switchRyanOff();
 	} else if (type == 5) {
 		data.byte(kTurntoface) = secondParam;
 		data.byte(kFacing) = secondParam;
-		switchryanon();
+		switchRyanOn();
 	} else if (type == 6) {
 		data.byte(kNewlocation) = secondParam;
 	} else {
-		movemap(secondParam);
+		moveMap(secondParam);
 	}
 }
 
-void DreamGenContext::plotreel() {
-	Reel *reel = getreelstart();
+void DreamGenContext::plotReel() {
+	Reel *reel = getReelStart();
 	while (reel->x >= 220 && reel->x != 255) {
-		dealwithspecial(reel->x, reel->y);
+		dealWithSpecial(reel->x, reel->y);
 		++data.word(kReelpointer);
 		reel += 8;
 	}
 
 	for (size_t i = 0; i < 8; ++i) {
 		if (reel->frame() != 0xffff)
-			showreelframe(reel);
+			showReelFrame(reel);
 		++reel;
 	}
 	push(es);
 	push(bx);
-	soundonreels();
+	soundOnReels();
 	bx = pop();
 	es = pop();
 }
@@ -945,46 +943,46 @@ void DreamGenContext::crosshair() {
 		frame = 29;
 	}
 	const Frame *src = (const Frame *)segRef(data.word(kIcons1)).ptr(0, 0);
-	showframe(src, kZoomx + 24, kZoomy + 19, frame, 0);
+	showFrame(src, kZoomx + 24, kZoomy + 19, frame, 0);
 }
 
-void DreamGenContext::deltextline() {
+void DreamGenContext::delTextLine() {
 	uint16 x = data.word(kTextaddressx);
 	uint16 y = data.word(kTextaddressy);
 	if (data.byte(kForeignrelease) != 0)
 		y -= 3;
-	multiput(textUnder(), x, y, kUndertextsizex, kUndertextsizey);
+	multiPut(textUnder(), x, y, kUndertextsizex, kUndertextsizey);
 }
 
-void DreamGenContext::commandonly() {
-	commandonly(al);	
+void DreamGenContext::commandOnly() {
+	commandOnly(al);	
 }
 
-void DreamGenContext::commandonly(uint8 command) {
-	deltextline();
+void DreamGenContext::commandOnly(uint8 command) {
+	delTextLine();
 	uint16 index = command * 2;
 	uint16 offset = kTextstart + segRef(data.word(kCommandtext)).word(index);
 	uint16 y = data.word(kTextaddressy);
 	const uint8 *string = segRef(data.word(kCommandtext)).ptr(offset, 0);
-	printdirect(&string, data.word(kTextaddressx), &y, data.byte(kTextlen), (bool)(data.byte(kTextlen) & 1));
+	printDirect(&string, data.word(kTextaddressx), &y, data.byte(kTextlen), (bool)(data.byte(kTextlen) & 1));
 	data.byte(kNewtextline) = 1;
 }
 
-void DreamGenContext::checkifperson() {
-	flags._z = !checkifperson(al, ah);
+void DreamGenContext::checkIfPerson() {
+	flags._z = !checkIfPerson(al, ah);
 }
 
-bool DreamGenContext::checkifperson(uint8 x, uint8 y) {
+bool DreamGenContext::checkIfPerson(uint8 x, uint8 y) {
 	People *people = (People *)segRef(data.word(kBuffers)).ptr(kPeoplelist, 0);
 
 	for (size_t i = 0; i < 12; ++i, ++people) {
 		if (people->b4 == 255)
 			continue;
 		data.word(kReelpointer) = people->reelPointer();
-		Reel *reel = getreelstart();
+		Reel *reel = getReelStart();
 		if (reel->frame() == 0xffff)
 			++reel;
-		const Frame *frame = getreelframeax(reel->frame());
+		const Frame *frame = getReelFrameAX(reel->frame());
 		uint8 xmin = reel->x + frame->x;
 		uint8 ymin = reel->y + frame->y;
 		uint8 xmax = xmin + frame->width;
@@ -998,45 +996,45 @@ bool DreamGenContext::checkifperson(uint8 x, uint8 y) {
 		if (y >= ymax)
 			continue;
 		data.word(kPersondata) = people->routinePointer();
-		obname(people->b4, 5);
+		obName(people->b4, 5);
 		return true;
 	}
 	return false;
 }
 
-void DreamGenContext::checkiffree() {
-	flags._z = !checkiffree(al, ah);
+void DreamGenContext::checkIfFree() {
+	flags._z = !checkIfFree(al, ah);
 }
 
-bool DreamGenContext::checkiffree(uint8 x, uint8 y) {
+bool DreamGenContext::checkIfFree(uint8 x, uint8 y) {
 	const ObjPos *freeList = (const ObjPos *)segRef(data.word(kBuffers)).ptr(kFreelist, 80 * sizeof(ObjPos));
 	for (size_t i = 0; i < 80; ++i) {
 		const ObjPos *objPos = freeList + 79 - i;
 		if (objPos->index == 0xff || !objPos->contains(x,y))
 			continue;
-		obname(objPos->index, 2);
+		obName(objPos->index, 2);
 		return true;
 	}
 	return false;
 }
 
-void DreamGenContext::checkifex() {
-	flags._z = !checkifex(al, ah);
+void DreamGenContext::checkIfEx() {
+	flags._z = !checkIfEx(al, ah);
 }
 
-bool DreamGenContext::checkifex(uint8 x, uint8 y) {
+bool DreamGenContext::checkIfEx(uint8 x, uint8 y) {
 	const ObjPos *exList = (const ObjPos *)segRef(data.word(kBuffers)).ptr(kExlist, 100 * sizeof(ObjPos));
 	for (size_t i = 0; i < 100; ++i) {
 		const ObjPos *objPos = exList + 99 - i;
 		if (objPos->index == 0xff || !objPos->contains(x,y))
 			continue;
-		obname(objPos->index, 4);
+		obName(objPos->index, 4);
 		return true;
 	}
 	return false;
 }
 
-const uint8 *DreamGenContext::findobname(uint8 type, uint8 index) {
+const uint8 *DreamGenContext::findObName(uint8 type, uint8 index) {
 	if (type == 5) {
 		uint16 i = 64 * 2 * (index & 127);
 		uint16 offset = segRef(data.word(kPeople)).word(kPersontxtdat + i) + kPersontext;
@@ -1056,12 +1054,12 @@ const uint8 *DreamGenContext::findobname(uint8 type, uint8 index) {
 	}
 }
 
-void DreamGenContext::copyname() {
-	copyname(ah, al, cs.ptr(di, 0));
+void DreamGenContext::copyName() {
+	copyName(ah, al, cs.ptr(di, 0));
 }
 
-void DreamGenContext::copyname(uint8 type, uint8 index, uint8 *dst) {
-	const uint8 *src = findobname(type, index);
+void DreamGenContext::copyName(uint8 type, uint8 index, uint8 *dst) {
+	const uint8 *src = findObName(type, index);
 	size_t i;
 	for (i = 0; i < 28; ++i) { 
 		char c = src[i];
@@ -1074,57 +1072,57 @@ void DreamGenContext::copyname(uint8 type, uint8 index, uint8 *dst) {
 	dst[i] = 0;
 }
 
-void DreamGenContext::commandwithob() {
-	commandwithob(al, bh, bl); 
+void DreamGenContext::commandWithOb() {
+	commandWithOb(al, bh, bl); 
 }
 
-void DreamGenContext::commandwithob(uint8 command, uint8 type, uint8 index) {
+void DreamGenContext::commandWithOb(uint8 command, uint8 type, uint8 index) {
 	uint8 commandLine[64] = "OBJECT NAME ONE                         ";
-	deltextline();
+	delTextLine();
 	uint16 commandText = kTextstart + segRef(data.word(kCommandtext)).word(command * 2);
 	uint8 textLen = data.byte(kTextlen);
 	{
 		const uint8 *string = segRef(data.word(kCommandtext)).ptr(commandText, 0);
-		printdirect(string, data.word(kTextaddressx), data.word(kTextaddressy), textLen, (bool)(textLen & 1));
+		printDirect(string, data.word(kTextaddressx), data.word(kTextaddressy), textLen, (bool)(textLen & 1));
 	}
-	copyname(type, index, commandLine);
+	copyName(type, index, commandLine);
 	uint16 x = data.word(kLastxpos);
 	if (command != 0)
 		x += 5;
-	printdirect(commandLine, x, data.word(kTextaddressy), textLen, (bool)(textLen & 1));
+	printDirect(commandLine, x, data.word(kTextaddressy), textLen, (bool)(textLen & 1));
 	data.byte(kNewtextline) = 1;
 }
 
-void DreamGenContext::examineobtext() {
-	commandwithob(1, data.byte(kCommandtype), data.byte(kCommand));
+void DreamGenContext::examineObText() {
+	commandWithOb(1, data.byte(kCommandtype), data.byte(kCommand));
 }
 
-void DreamGenContext::showpanel() {
+void DreamGenContext::showPanel() {
 	Frame *frame = (Frame *)segRef(data.word(kIcons1)).ptr(0, sizeof(Frame));
-	showframe(frame, 72, 0, 19, 0);
-	showframe(frame, 192, 0, 19, 0);
+	showFrame(frame, 72, 0, 19, 0);
+	showFrame(frame, 192, 0, 19, 0);
 }
 
-void DreamGenContext::blocknametext() {
-	commandwithob(0, data.byte(kCommandtype), data.byte(kCommand));
+void DreamGenContext::blockNameText() {
+	commandWithOb(0, data.byte(kCommandtype), data.byte(kCommand));
 }
 
-void DreamGenContext::personnametext() {
-	commandwithob(2, data.byte(kCommandtype), data.byte(kCommand) & 127);
+void DreamGenContext::personNameText() {
+	commandWithOb(2, data.byte(kCommandtype), data.byte(kCommand) & 127);
 }
 
-void DreamGenContext::walktotext() {
-	commandwithob(3, data.byte(kCommandtype), data.byte(kCommand));
+void DreamGenContext::walkToText() {
+	commandWithOb(3, data.byte(kCommandtype), data.byte(kCommand));
 }
 
-void DreamGenContext::findormake() {
+void DreamGenContext::findOrMake() {
 	uint8 b0 = al;
 	uint8 b2 = cl;
 	uint8 b3 = ch;
-	findormake(b0, b2, b3);
+	findOrMake(b0, b2, b3);
 }
 
-void DreamGenContext::findormake(uint8 index, uint8 value, uint8 type) {
+void DreamGenContext::findOrMake(uint8 index, uint8 value, uint8 type) {
 	Change *change = (Change *)segRef(data.word(kBuffers)).ptr(kListofchanges, sizeof(Change));
 	for (; change->index != 0xff; ++change) {
 		if (index == change->index && data.byte(kReallocation) == change->location && type == change->type) {
@@ -1139,65 +1137,65 @@ void DreamGenContext::findormake(uint8 index, uint8 value, uint8 type) {
 	change->type = type;
 }
 
-void DreamGenContext::setallchanges() {
+void DreamGenContext::setAllChanges() {
 	Change *change = (Change *)segRef(data.word(kBuffers)).ptr(kListofchanges, sizeof(Change));
 	for (; change->index != 0xff; ++change)
 		if (change->location == data.byte(kReallocation))
-			dochange(change->index, change->value, change->type);
+			doChange(change->index, change->value, change->type);
 }
 
-DynObject *DreamGenContext::getfreead(uint8 index) {
+DynObject *DreamGenContext::getFreeAd(uint8 index) {
 	return (DynObject *)segRef(data.word(kFreedat)).ptr(0, 0) + index;
 }
 
-DynObject *DreamGenContext::getexad(uint8 index) {
+DynObject *DreamGenContext::getExAd(uint8 index) {
 	return (DynObject *)segRef(data.word(kExtras)).ptr(kExdata, 0) + index;
 }
 
-DynObject *DreamGenContext::geteitheradCPP() {
+DynObject *DreamGenContext::getEitherAdCPP() {
 	if (data.byte(kObjecttype) == 4)
-		return getexad(data.byte(kItemframe));
+		return getExAd(data.byte(kItemframe));
 	else
-		return getfreead(data.byte(kItemframe));
+		return getFreeAd(data.byte(kItemframe));
 }
 
-void *DreamGenContext::getanyad(uint8 *value1, uint8 *value2) {
+void *DreamGenContext::getAnyAd(uint8 *value1, uint8 *value2) {
 	if (data.byte(kObjecttype) == 4) {
-		DynObject *exObject = getexad(data.byte(kCommand));
+		DynObject *exObject = getExAd(data.byte(kCommand));
 		*value1 = exObject->b7;
 		*value2 = exObject->b8;
 		return exObject;
 	} else if (data.byte(kObjecttype) == 2) {
-		DynObject *freeObject = getfreead(data.byte(kCommand));
+		DynObject *freeObject = getFreeAd(data.byte(kCommand));
 		*value1 = freeObject->b7;
 		*value2 = freeObject->b8;
 		return freeObject;
 	} else {
-		SetObject *setObject = getsetad(data.byte(kCommand));
+		SetObject *setObject = getSetAd(data.byte(kCommand));
 		*value1 = setObject->b4;
 		*value2 = setObject->priority;
 		return setObject;
 	}
 }
 
-void *DreamGenContext::getanyaddir(uint8 index, uint8 flag) {
+void *DreamGenContext::getAnyAdDir(uint8 index, uint8 flag) {
 	if (flag == 4)
-		return getexad(index);
+		return getExAd(index);
 	else if (flag == 2)
-		return getfreead(index);
+		return getFreeAd(index);
 	else
-		return getsetad(index);
+		return getSetAd(index);
 }
 
-SetObject *DreamGenContext::getsetad(uint8 index) {
+SetObject *DreamGenContext::getSetAd(uint8 index) {
 	return (SetObject *)segRef(data.word(kSetdat)).ptr(0, 0) + index;
 }
 
-void DreamGenContext::dochange(uint8 index, uint8 value, uint8 type) {
+void DreamGenContext::doChange(uint8 index, uint8 value, uint8 type) {
 	if (type == 0) { //object
-		getsetad(index)->mapad[0] = value;
-	} else if (type == 1) { //freeobject
-		DynObject *freeObject = getfreead(index);
+		getSetAd(index)->mapad[0] = value;
+	} else if (type == 1) { //freeObject
+		DynObject *freeObject = getFreeAd(index);
 		if (freeObject->mapad[0] == 0xff)
 			freeObject->mapad[0] = value;
 	} else { //path
@@ -1207,7 +1205,7 @@ void DreamGenContext::dochange(uint8 index, uint8 value, uint8 type) {
 	}
 }
 
-void DreamGenContext::deletetaken() {
+void DreamGenContext::deleteTaken() {
 	const DynObject *extraObjects = (const DynObject *)segRef(data.word(kExtras)).ptr(kExdata, 0);
 	DynObject *freeObjects = (DynObject *)segRef(data.word(kFreedat)).ptr(0, 0);
 	for(size_t i = 0; i < kNumexobjects; ++i) {
@@ -1219,7 +1217,7 @@ void DreamGenContext::deletetaken() {
 	}
 }
 
-void DreamGenContext::getexpos() {
+void DreamGenContext::getExPos() {
 	es = data.word(kExtras);
 	const DynObject *objects = (const DynObject *)segRef(data.word(kExtras)).ptr(kExdata, sizeof(DynObject));
 	for (size_t i = 0; i < kNumexobjects; ++i) {
@@ -1233,75 +1231,75 @@ void DreamGenContext::getexpos() {
 	di = kExdata + kNumexobjects * sizeof(DynObject);
 }
 
-void DreamGenContext::placesetobject() {
-	placesetobject(al);
+void DreamGenContext::placeSetObject() {
+	placeSetObject(al);
 }
 
-void DreamGenContext::placesetobject(uint8 index) {
-	findormake(index, 0, 0);
-	getsetad(index)->mapad[0] = 0;
+void DreamGenContext::placeSetObject(uint8 index) {
+	findOrMake(index, 0, 0);
+	getSetAd(index)->mapad[0] = 0;
 }
 
-void DreamGenContext::removesetobject() {
-	removesetobject(al);
+void DreamGenContext::removeSetObject() {
+	removeSetObject(al);
 }
 
-void DreamGenContext::removesetobject(uint8 index) {
-	findormake(index, 0xff, 0);
-	getsetad(index)->mapad[0] = 0xff;
+void DreamGenContext::removeSetObject(uint8 index) {
+	findOrMake(index, 0xff, 0);
+	getSetAd(index)->mapad[0] = 0xff;
 }
 
-void DreamGenContext::finishedwalking() {
-	flags._z = finishedwalkingCPP();
+void DreamGenContext::finishedWalking() {
+	flags._z = finishedWalkingCPP();
 }
 
-bool DreamGenContext::finishedwalkingCPP() {
+bool DreamGenContext::finishedWalkingCPP() {
 	return (data.byte(kLinepointer) == 254) && (data.byte(kFacing) == data.byte(kTurntoface));
 }
 
-void DreamGenContext::getflagunderp() {
+void DreamGenContext::getFlagUnderP() {
 	uint8 flag, flagEx;
-	getflagunderp(&flag, &flagEx);
+	getFlagUnderP(&flag, &flagEx);
 	cl = flag;
 	ch = flagEx;
 }
 
-void DreamGenContext::getflagunderp(uint8 *flag, uint8 *flagEx) {
+void DreamGenContext::getFlagUnderP(uint8 *flag, uint8 *flagEx) {
 	uint8 type, flagX, flagY;
-	checkone(data.word(kMousex) - data.word(kMapadx), data.word(kMousey) - data.word(kMapady), flag, flagEx, &type, &flagX, &flagY);
+	checkOne(data.word(kMousex) - data.word(kMapadx), data.word(kMousey) - data.word(kMapady), flag, flagEx, &type, &flagX, &flagY);
 	cl = data.byte(kLastflag) = *flag;
 	ch = data.byte(kLastflagex) = *flagEx;
 }
 
-void DreamGenContext::walkandexamine() {
-	if (!finishedwalkingCPP())
+void DreamGenContext::walkAndExamine() {
+	if (!finishedWalkingCPP())
 		return;
 	data.byte(kCommandtype) = data.byte(kWalkexamtype);
 	data.byte(kCommand) = data.byte(kWalkexamnum);
 	data.byte(kWalkandexam) = 0;
 	if (data.byte(kCommandtype) != 5)
-		examineob();
+		examineOb();
 }
 
-void DreamGenContext::obname() {
-	obname(al, ah);
+void DreamGenContext::obName() {
+	obName(al, ah);
 }
 
-void DreamGenContext::obname(uint8 command, uint8 commandType) {
+void DreamGenContext::obName(uint8 command, uint8 commandType) {
 	if (data.byte(kReasseschanges) == 0) {
 		if ((commandType == data.byte(kCommandtype)) && (command == data.byte(kCommand))) {
 			if (data.byte(kWalkandexam) == 1) {
-				walkandexamine();
+				walkAndExamine();
 				return;
 			} else if (data.word(kMousebutton) == 0)
 				return;
 			else if ((data.byte(kCommandtype) == 3) && (data.byte(kLastflag) < 2))
 				return;
 			else if ((data.byte(kManspath) != data.byte(kPointerspath)) || (data.byte(kCommandtype) == 3)) {
-				setwalk();
+				setWalk();
 				data.byte(kReasseschanges) = 1;
 				return;
-			} else if (! finishedwalkingCPP())
+			} else if (! finishedWalkingCPP())
 				return;
 			else if (data.byte(kCommandtype) == 5) {
 				if (data.word(kWatchingtime) == 0)
@@ -1309,7 +1307,7 @@ void DreamGenContext::obname(uint8 command, uint8 commandType) {
 				return;
 			} else {
 				if (data.word(kWatchingtime) == 0)
-					examineob();
+					examineOb();
 				return;
 			}
 		}
@@ -1319,56 +1317,56 @@ void DreamGenContext::obname(uint8 command, uint8 commandType) {
 	data.byte(kCommand) = command;
 	data.byte(kCommandtype) = commandType;
 	if ((data.byte(kLinepointer) != 254) || (data.word(kWatchingtime) != 0) || (data.byte(kFacing) != data.byte(kTurntoface))) {
-		blocknametext();
+		blockNameText();
 		return;
 	} else if (data.byte(kCommandtype) != 3) {
 		if (data.byte(kManspath) != data.byte(kPointerspath)) {
-			walktotext();
+			walkToText();
 			return;
 		} else if (data.byte(kCommandtype) == 3) {
-			blocknametext();
+			blockNameText();
 			return;
 		} else if (data.byte(kCommandtype) == 5) {
-			personnametext();
+			personNameText();
 			return;
 		} else {
-			examineobtext();
+			examineObText();
 			return;
 		}
 	}
 	if (data.byte(kManspath) == data.byte(kPointerspath)) {
 		uint8 flag, flagEx, type, flagX, flagY;
-		checkone(data.byte(kRyanx) + 12, data.byte(kRyany) + 12, &flag, &flagEx, &type, &flagX, &flagY);
+		checkOne(data.byte(kRyanx) + 12, data.byte(kRyany) + 12, &flag, &flagEx, &type, &flagX, &flagY);
 		if (flag < 2) {
-			blocknametext();
+			blockNameText();
 			return;
 		}
 	}
 
-	getflagunderp();
+	getFlagUnderP();
 	if (data.byte(kLastflag) < 2) {
-		blocknametext();
+		blockNameText();
 		return;
 	} else if (data.byte(kLastflag) >= 128) {
-		blocknametext();
+		blockNameText();
 		return;
 	} else {
-		walktotext();
+		walkToText();
 		return;
 	}
 }
 
-void DreamGenContext::delpointer() {
+void DreamGenContext::delPointer() {
 	if (data.word(kOldpointerx) == 0xffff)
 		return;
 	data.word(kDelherex) = data.word(kOldpointerx);
 	data.word(kDelherey) = data.word(kOldpointery);
 	data.byte(kDelxs) = data.byte(kPointerxs);
 	data.byte(kDelys) = data.byte(kPointerys);
-	multiput(segRef(data.word(kBuffers)).ptr(kPointerback, 0), data.word(kDelherex), data.word(kDelherey), data.byte(kPointerxs), data.byte(kPointerys));
+	multiPut(segRef(data.word(kBuffers)).ptr(kPointerback, 0), data.word(kDelherex), data.word(kDelherey), data.byte(kPointerxs), data.byte(kPointerys));
 }
 
-void DreamGenContext::showblink() {
+void DreamGenContext::showBlink() {
 	if (data.byte(kManisoffscreen) == 1)
 		return;
 	++data.byte(kBlinkcount);
@@ -1386,148 +1384,148 @@ void DreamGenContext::showblink() {
 		blinkFrame = 6;
 	static const uint8 blinkTab[] = { 16,18,18,17,16,16,16 };
 	uint8 width, height;
-	showframe((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), 44, 32, blinkTab[blinkFrame], 0, &width, &height);
+	showFrame((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), 44, 32, blinkTab[blinkFrame], 0, &width, &height);
 }
 
-void DreamGenContext::dumpblink() {
+void DreamGenContext::dumpBlink() {
 	if (data.byte(kShadeson) != 0)
 		return;
 	if (data.byte(kBlinkcount) != 0)
 		return;
 	if (data.byte(kBlinkframe) >= 6)
 		return;
-	multidump(44, 32, 16, 12);
+	multiDump(44, 32, 16, 12);
 }
 
-void DreamGenContext::dumppointer() {
-	dumpblink();
-	multidump(data.word(kDelherex), data.word(kDelherey), data.byte(kDelxs), data.byte(kDelys));
+void DreamGenContext::dumpPointer() {
+	dumpBlink();
+	multiDump(data.word(kDelherex), data.word(kDelherey), data.byte(kDelxs), data.byte(kDelys));
 	if ((data.word(kOldpointerx) != data.word(kDelherex)) || (data.word(kOldpointery) != data.word(kDelherey)))
-		multidump(data.word(kOldpointerx), data.word(kOldpointery), data.byte(kPointerxs), data.byte(kPointerys));
+		multiDump(data.word(kOldpointerx), data.word(kOldpointery), data.byte(kPointerxs), data.byte(kPointerys));
 }
 
-void DreamGenContext::checkcoords() {
+void DreamGenContext::checkCoords() {
 
 	// FIXME: Move all these lists to the callers
 
 	switch ((uint16)bx) {
 	case offset_talklist: {
-		RectWithCallback talklist[] = {
-			{ 273,320,157,198,&DreamGenContext::getback1 },
-			{ 240,290,2,44,&DreamGenContext::moretalk },
+		RectWithCallback talkList[] = {
+			{ 273,320,157,198,&DreamGenContext::getBack1 },
+			{ 240,290,2,44,&DreamGenContext::moreTalk },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(talklist);
+		checkCoords(talkList);
 		break;
 	}
 	case offset_quitlist: {
-		RectWithCallback quitlist[] = {
-			{ 273,320,157,198,&DreamGenContext::getback1 },
+		RectWithCallback quitList[] = {
+			{ 273,320,157,198,&DreamGenContext::getBack1 },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(quitlist);
+		checkCoords(quitList);
 		break;
 	}
 	case offset_destlist: {
-		RectWithCallback destlist[] = {
-			{ 238,258,4,44,&DreamGenContext::nextdest },
-			{ 104,124,4,44,&DreamGenContext::lastdest },
-			{ 280,308,4,44,&DreamGenContext::lookatplace },
-			{ 104,216,138,192,&DreamGenContext::destselect },
-			{ 273,320,157,198,&DreamGenContext::getback1 },
+		RectWithCallback destList[] = {
+			{ 238,258,4,44,&DreamGenContext::nextDest },
+			{ 104,124,4,44,&DreamGenContext::lastDest },
+			{ 280,308,4,44,&DreamGenContext::lookAtPlace },
+			{ 104,216,138,192,&DreamGenContext::destSelect },
+			{ 273,320,157,198,&DreamGenContext::getBack1 },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(destlist);
+		checkCoords(destList);
 		break;
 	}
 	case offset_keypadlist: {
-		RectWithCallback keypadlist[] = {
-			{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamGenContext::buttonone },
-			{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamGenContext::buttontwo },
-			{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamGenContext::buttonthree },
-			{ kKeypadx+9,kKeypadx+30,kKeypady+23,kKeypady+40,&DreamGenContext::buttonfour },
-			{ kKeypadx+31,kKeypadx+52,kKeypady+23,kKeypady+40,&DreamGenContext::buttonfive },
-			{ kKeypadx+53,kKeypadx+74,kKeypady+23,kKeypady+40,&DreamGenContext::buttonsix },
-			{ kKeypadx+9,kKeypadx+30,kKeypady+41,kKeypady+58,&DreamGenContext::buttonseven },
-			{ kKeypadx+31,kKeypadx+52,kKeypady+41,kKeypady+58,&DreamGenContext::buttoneight },
-			{ kKeypadx+53,kKeypadx+74,kKeypady+41,kKeypady+58,&DreamGenContext::buttonnine },
-			{ kKeypadx+9,kKeypadx+30,kKeypady+59,kKeypady+73,&DreamGenContext::buttonnought },
-			{ kKeypadx+31,kKeypadx+74,kKeypady+59,kKeypady+73,&DreamGenContext::buttonenter },
-			{ kKeypadx+72,kKeypadx+86,kKeypady+80,kKeypady+94,&DreamGenContext::quitkey },
+		RectWithCallback keypadList[] = {
+			{ kKeypadx+9,kKeypadx+30,kKeypady+9,kKeypady+22,&DreamGenContext::buttonOne },
+			{ kKeypadx+31,kKeypadx+52,kKeypady+9,kKeypady+22,&DreamGenContext::buttonTwo },
+			{ kKeypadx+53,kKeypadx+74,kKeypady+9,kKeypady+22,&DreamGenContext::buttonThree },
+			{ kKeypadx+9,kKeypadx+30,kKeypady+23,kKeypady+40,&DreamGenContext::buttonFour },
+			{ kKeypadx+31,kKeypadx+52,kKeypady+23,kKeypady+40,&DreamGenContext::buttonFive },
+			{ kKeypadx+53,kKeypadx+74,kKeypady+23,kKeypady+40,&DreamGenContext::buttonSix },
+			{ kKeypadx+9,kKeypadx+30,kKeypady+41,kKeypady+58,&DreamGenContext::buttonSeven },
+			{ kKeypadx+31,kKeypadx+52,kKeypady+41,kKeypady+58,&DreamGenContext::buttonEight },
+			{ kKeypadx+53,kKeypadx+74,kKeypady+41,kKeypady+58,&DreamGenContext::buttonNine },
+			{ kKeypadx+9,kKeypadx+30,kKeypady+59,kKeypady+73,&DreamGenContext::buttonNought },
+			{ kKeypadx+31,kKeypadx+74,kKeypady+59,kKeypady+73,&DreamGenContext::buttonEnter },
+			{ kKeypadx+72,kKeypadx+86,kKeypady+80,kKeypady+94,&DreamGenContext::quitKey },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(keypadlist);
+		checkCoords(keypadList);
 		break;
 	}
 	case offset_menulist: {
-		RectWithCallback menulist[] = {
-			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamGenContext::quitkey },
+		RectWithCallback menuList[] = {
+			{ kMenux+54,kMenux+68,kMenuy+72,kMenuy+88,&DreamGenContext::quitKey },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(menulist);
+		checkCoords(menuList);
 		break;
 	}
 	case offset_symbollist: {
-		RectWithCallback symbollist[] = {
-			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamGenContext::quitsymbol },
-			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamGenContext::settopleft },
-			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamGenContext::settopright },
-			{ kSymbolx,kSymbolx+52,kSymboly+50,kSymboly+80,&DreamGenContext::setbotleft },
-			{ kSymbolx+52,kSymbolx+104,kSymboly+50,kSymboly+80,&DreamGenContext::setbotright },
+		RectWithCallback symbolList[] = {
+			{ kSymbolx+40,kSymbolx+64,kSymboly+2,kSymboly+16,&DreamGenContext::quitSymbol },
+			{ kSymbolx,kSymbolx+52,kSymboly+20,kSymboly+50,&DreamGenContext::setTopLeft },
+			{ kSymbolx+52,kSymbolx+104,kSymboly+20,kSymboly+50,&DreamGenContext::setTopRight },
+			{ kSymbolx,kSymbolx+52,kSymboly+50,kSymboly+80,&DreamGenContext::setBotLeft },
+			{ kSymbolx+52,kSymbolx+104,kSymboly+50,kSymboly+80,&DreamGenContext::setBotRight },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(symbollist);
+		checkCoords(symbolList);
 
 		break;
 	}
 	case offset_diarylist: {
-		RectWithCallback diarylist[] = {
-			{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamGenContext::diarykeyn },
-			{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamGenContext::diarykeyp },
-			{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamGenContext::quitkey },
+		RectWithCallback diaryList[] = {
+			{ kDiaryx+94,kDiaryx+110,kDiaryy+97,kDiaryy+113,&DreamGenContext::diaryKeyN },
+			{ kDiaryx+151,kDiaryx+167,kDiaryy+71,kDiaryy+87,&DreamGenContext::diaryKeyP },
+			{ kDiaryx+176,kDiaryx+192,kDiaryy+108,kDiaryy+124,&DreamGenContext::quitKey },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(diarylist);
+		checkCoords(diaryList);
 		break;
 	}
 	case offset_opslist: {
-		RectWithCallback opslist[] = {
-			{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::getbackfromops },
-			{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamGenContext::dosreturn },
-			{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamGenContext::discops },
+		RectWithCallback opsList[] = {
+			{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::getBackFromOps },
+			{ kOpsx+10,kOpsx+77,kOpsy+10,kOpsy+59,&DreamGenContext::DOSReturn },
+			{ kOpsx+128,kOpsx+190,kOpsy+16,kOpsy+100,&DreamGenContext::discOps },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(opslist);
+		checkCoords(opsList);
 		break;
 	}
 	case offset_discopslist: {
-		RectWithCallback discopslist[] = {
-			{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::loadgame },
-			{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamGenContext::savegame },
-			{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getbacktoops },
+		RectWithCallback discOpsList[] = {
+			{ kOpsx+59,kOpsx+114,kOpsy+30,kOpsy+76,&DreamGenContext::loadGame },
+			{ kOpsx+10,kOpsx+79,kOpsy+10,kOpsy+59,&DreamGenContext::saveGame },
+			{ kOpsx+176,kOpsx+192,kOpsy+60,kOpsy+76,&DreamGenContext::getBackToOps },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(discopslist);
+		checkCoords(discOpsList);
 		break;
 	}
 	case offset_decidelist: {
-		RectWithCallback decidelist[] = {
-			{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamGenContext::newgame },
-			{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamGenContext::dosreturn },
-			{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadold },
+		RectWithCallback decideList[] = {
+			{ kOpsx+69,kOpsx+124,kOpsy+30,kOpsy+76,&DreamGenContext::newGame },
+			{ kOpsx+20,kOpsx+87,kOpsy+10,kOpsy+59,&DreamGenContext::DOSReturn },
+			{ kOpsx+123,kOpsx+190,kOpsy+10,kOpsy+59,&DreamGenContext::loadOld },
 			{ 0,320,0,200,&DreamGenContext::blank },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(decidelist);
+		checkCoords(decideList);
 		break;
 	}
 	default:
@@ -1535,8 +1533,7 @@ void DreamGenContext::checkcoords() {
 	}
 }
 
-
-void DreamGenContext::checkcoords(const RectWithCallback *rectWithCallbacks) {
+void DreamGenContext::checkCoords(const RectWithCallback *rectWithCallbacks) {
 	if (data.byte(kNewlocation) != 0xff)
 		return;
 
@@ -1549,9 +1546,8 @@ void DreamGenContext::checkcoords(const RectWithCallback *rectWithCallbacks) {
 	}
 }
 
-
-void DreamGenContext::showpointer() {
-	showblink();
+void DreamGenContext::showPointer() {
+	showBlink();
 	const Frame *icons1 = ((const Frame *)segRef(data.word(kIcons1)).ptr(0, 0));
 	uint16 x = data.word(kMousex);
 	data.word(kOldpointerx) = data.word(kMousex);
@@ -1576,9 +1572,9 @@ void DreamGenContext::showpointer() {
 		uint16 yMin = (y >= height / 2) ? y - height / 2 : 0;
 		data.word(kOldpointerx) = xMin;
 		data.word(kOldpointery) = yMin;
-		multiget(segRef(data.word(kBuffers)).ptr(kPointerback, 0), xMin, yMin, width, height);
-		showframe(frames, x, y, 3 * data.byte(kItemframe) + 1, 128);
-		showframe(icons1, x, y, 3, 128);
+		multiGet(segRef(data.word(kBuffers)).ptr(kPointerback, 0), xMin, yMin, width, height);
+		showFrame(frames, x, y, 3 * data.byte(kItemframe) + 1, 128);
+		showFrame(icons1, x, y, 3, 128);
 	} else {
 		const Frame *frame = icons1 + (data.byte(kPointerframe) + 20);
 		uint8 width = frame->width;
@@ -1589,12 +1585,12 @@ void DreamGenContext::showpointer() {
 			height = 12;
 		data.byte(kPointerxs) = width;
 		data.byte(kPointerys) = height;
-		multiget(segRef(data.word(kBuffers)).ptr(kPointerback, 0), x, y, width, height);
-		showframe(icons1, x, y, data.byte(kPointerframe) + 20, 0);
+		multiGet(segRef(data.word(kBuffers)).ptr(kPointerback, 0), x, y, width, height);
+		showFrame(icons1, x, y, data.byte(kPointerframe) + 20, 0);
 	}
 }
 
-void DreamGenContext::animpointer() {
+void DreamGenContext::animPointer() {
 
 	if (data.byte(kPointermode) == 2) {
 		data.byte(kPointerframe) = 0;
@@ -1624,7 +1620,7 @@ void DreamGenContext::animpointer() {
 	if (data.byte(kPointerfirstpath) == 0)
 		return;
 	uint8 flag, flagEx;
-	getflagunderp(&flag, &flagEx);
+	getFlagUnderP(&flag, &flagEx);
 	if (flag < 2)
 		return;
 	if (flag >= 128)
@@ -1648,14 +1644,14 @@ void DreamGenContext::animpointer() {
 	data.byte(kPointerframe) = 8;
 }
 
-void DreamGenContext::printmessage() {
-	printmessage(di, bx, al, dl, (bool)(dl & 1));
+void DreamGenContext::printMessage() {
+	printMessage(di, bx, al, dl, (bool)(dl & 1));
 }
 
-void DreamGenContext::printmessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
+void DreamGenContext::printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered) {
 	uint16 offset = kTextstart + segRef(data.word(kCommandtext)).word(index * 2);
 	const uint8 *string = segRef(data.word(kCommandtext)).ptr(offset, 0);
-	printdirect(&string, x, &y, maxWidth, centered);
+	printDirect(&string, x, &y, maxWidth, centered);
 }
 
 void DreamGenContext::compare() {
@@ -1664,7 +1660,7 @@ void DreamGenContext::compare() {
 }
 
 bool DreamGenContext::compare(uint8 index, uint8 flag, const char id[4]) {
-	void *ptr = getanyaddir(index, flag);
+	void *ptr = getAnyAdDir(index, flag);
 	const char *objId = (const char *)(((const uint8 *)ptr) + 12); // whether it is a DynObject or a SetObject
 	for (size_t i = 0; i < 4; ++i) {
 		if(id[i] != objId[i] + 'A')
@@ -1673,7 +1669,7 @@ bool DreamGenContext::compare(uint8 index, uint8 flag, const char id[4]) {
 	return true;
 }
 
-bool DreamGenContext::isitdescribed(const ObjPos *pos) {
+bool DreamGenContext::isItDescribed(const ObjPos *pos) {
 	uint16 offset = segRef(data.word(kSetdesc)).word(kSettextdat + pos->index * 2);
 	uint8 result = segRef(data.word(kSetdesc)).byte(kSettext + offset);
 	return result != 0;
@@ -1687,59 +1683,59 @@ bool DreamGenContext::isCD() {
 	return (data.byte(kSpeechloaded) == 1);
 }
 
-void DreamGenContext::showicon() {
+void DreamGenContext::showIcon() {
 	if (data.byte(kReallocation) < 50) {
-		showpanel();
-		showman();
-		roomname();
-		panelicons1();
-		zoomicon();
+		showPanel();
+		showMan();
+		roomName();
+		panelIcons1();
+		zoomIcon();
 	} else {
 		Frame *tempSprites = (Frame *)segRef(data.word(kTempsprites)).ptr(0, 0);
-		showframe(tempSprites, 72, 2, 45, 0);
-		showframe(tempSprites, 72+47, 2, 46, 0);
-		showframe(tempSprites, 69-10, 21, 49, 0);
-		showframe(tempSprites, 160+88, 2, 45, 4 & 0xfe);
-		showframe(tempSprites, 160+43, 2, 46, 4 & 0xfe);
-		showframe(tempSprites, 160+101, 21, 49, 4 & 0xfe);
-		middlepanel();
+		showFrame(tempSprites, 72, 2, 45, 0);
+		showFrame(tempSprites, 72+47, 2, 46, 0);
+		showFrame(tempSprites, 69-10, 21, 49, 0);
+		showFrame(tempSprites, 160+88, 2, 45, 4 & 0xfe);
+		showFrame(tempSprites, 160+43, 2, 46, 4 & 0xfe);
+		showFrame(tempSprites, 160+101, 21, 49, 4 & 0xfe);
+		middlePanel();
 	}
 }
 
-void DreamGenContext::checkifset() {
-	flags._z = !checkifset(al, ah);
+void DreamGenContext::checkIfSet() {
+	flags._z = !checkIfSet(al, ah);
 }
 
-bool DreamGenContext::checkifset(uint8 x, uint8 y) {
+bool DreamGenContext::checkIfSet(uint8 x, uint8 y) {
 	const ObjPos *setList = (const ObjPos *)segRef(data.word(kBuffers)).ptr(kSetlist, sizeof(ObjPos) * 128);
 	for (size_t i = 0; i < 128; ++i) {
 		const ObjPos *pos = setList + 127 - i;
 		if (pos->index == 0xff || !pos->contains(x,y))
 			continue;
-		if (! pixelcheckset(pos, x, y))
+		if (! pixelCheckSet(pos, x, y))
 			continue;
-		if (! isitdescribed(pos))
+		if (! isItDescribed(pos))
 			continue;
-		obname(pos->index, 1);
+		obName(pos->index, 1);
 		return true;
 	}
 	return false;
 }
 
-void DreamGenContext::showryanpage() {
+void DreamGenContext::showRyanPage() {
 	Frame *icons1 = (Frame *)segRef(data.word(kIcons1)).ptr(0, 0);
-	showframe(icons1, kInventx + 167, kInventy - 12, 12, 0);
-	showframe(icons1, kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
+	showFrame(icons1, kInventx + 167, kInventy - 12, 12, 0);
+	showFrame(icons1, kInventx + 167 + 18 * data.byte(kRyanpage), kInventy - 12, 13 + data.byte(kRyanpage), 0);
 }
 
-void DreamGenContext::findallryan() {
-	findallryan(es.ptr(di, 60));
+void DreamGenContext::findAllRyan() {
+	findAllRyan(es.ptr(di, 60));
 }
 
-void DreamGenContext::findallryan(uint8 *inv) {
+void DreamGenContext::findAllRyan(uint8 *inv) {
 	memset(inv, 0xff, 60);
 	for (size_t i = 0; i < kNumexobjects; ++i) {
-		DynObject *extra = getexad(i);
+		DynObject *extra = getExAd(i);
 		if (extra->mapad[0] != 4)
 			continue;
 		if (extra->mapad[1] != 0xff)
@@ -1751,83 +1747,82 @@ void DreamGenContext::findallryan(uint8 *inv) {
 	}
 }
 
-void DreamGenContext::hangon() {
-	hangon(cx);
+void DreamGenContext::hangOn() {
+	hangOn(cx);
 }
 
-void DreamGenContext::hangon(uint16 frameCount) {
+void DreamGenContext::hangOn(uint16 frameCount) {
 	while (frameCount) {
-		vsync();
+		vSync();
 		--frameCount;
 		if (quitRequested())
 			break;
 	}
 }
 
-
-void DreamGenContext::hangonw() {
-	hangonw(cx);
+void DreamGenContext::hangOnW() {
+	hangOnW(cx);
 }
 
-void DreamGenContext::hangonw(uint16 frameCount) {
+void DreamGenContext::hangOnW(uint16 frameCount) {
 	while (frameCount) {
-		delpointer();
-		readmouse();
-		animpointer();
-		showpointer();
-		vsync();
-		dumppointer();
+		delPointer();
+		readMouse();
+		animPointer();
+		showPointer();
+		vSync();
+		dumpPointer();
 		--frameCount;
 		if (quitRequested())
 			break;
 	}
 }
 
-void DreamGenContext::hangonp() {
-	hangonp(cx);
+void DreamGenContext::hangOnP() {
+	hangOnP(cx);
 }
 
-void DreamGenContext::hangonp(uint16 count) {
+void DreamGenContext::hangOnP(uint16 count) {
 	data.word(kMaintimer) = 0;
 	uint8 pointerFrame = data.byte(kPointerframe);
 	uint8 pickup = data.byte(kPickup);
 	data.byte(kPointermode) = 3;
 	data.byte(kPickup) = 0;
 	data.byte(kCommandtype) = 255;
-	readmouse();
-	animpointer();
-	showpointer();
-	vsync();
-	dumppointer();
+	readMouse();
+	animPointer();
+	showPointer();
+	vSync();
+	dumpPointer();
 
 	count *= 3;
 	for (uint16 i = 0; i < count; ++i) {
-		delpointer();
-		readmouse();
-		animpointer();
-		showpointer();
-		vsync();
-		dumppointer();
+		delPointer();
+		readMouse();
+		animPointer();
+		showPointer();
+		vSync();
+		dumpPointer();
 		if (quitRequested())
 			break;
 		if (data.word(kMousebutton) != 0 && data.word(kMousebutton) != data.word(kOldbutton))
 			break;
 	}
 
-	delpointer();
+	delPointer();
 	data.byte(kPointerframe) = pointerFrame;
 	data.byte(kPickup) = pickup;
 	data.byte(kPointermode) = 0;
 }
 
-void DreamGenContext::findnextcolon() {
+void DreamGenContext::findNextColon() {
 	uint8 *initialString = es.ptr(si, 0);
 	uint8 *string = initialString;
-	al = findnextcolon(&string);
+	al = findNextColon(&string);
 	si += (string - initialString);
 }
 
-uint8 DreamGenContext::findnextcolon(uint8 **string) {
+uint8 DreamGenContext::findNextColon(uint8 **string) {
 	uint8 c;
 	do {
 		c = **string;
@@ -1836,17 +1831,17 @@ uint8 DreamGenContext::findnextcolon(uint8 **string) {
 	return c;
 }
 
-uint8 *DreamGenContext::getobtextstartCPP() {
+uint8 *DreamGenContext::getObTextStartCPP() {
 	push(es);
 	push(si);
-	getobtextstart();
+	getObTextStart();
 	uint8 *result = es.ptr(si, 0);
 	si = pop();
 	es = pop();
 	return result;
 }
 
-void DreamGenContext::zoomonoff() {
+void DreamGenContext::zoomOnOff() {
 	if (data.word(kWatchingtime) != 0) {
 		blank();
 		return;
@@ -1857,27 +1852,27 @@ void DreamGenContext::zoomonoff() {
 	}
 	if (data.byte(kCommandtype) != 222) {
 		data.byte(kCommandtype) = 222;
-		commandonly(39);
+		commandOnly(39);
 	}
 	if (data.word(kMousebutton) == data.word(kOldbutton))
 		return;
 	if ((data.word(kMousebutton) & 1) == 0)
 		return;
 	data.byte(kZoomon) ^= 1;
-	createpanel();
+	createPanel();
 	data.byte(kNewobs) = 0;
-	drawfloor();
-	printsprites();
-	reelsonscreen();
-	showicon();
-	getunderzoom();
-	undertextline();
-	commandonly(39);
-	readmouse();
-	worktoscreenm();
-}
-
-void DreamGenContext::sortoutmap() {
+	drawFloor();
+	printSprites();
+	reelsOnScreen();
+	showIcon();
+	getUnderZoom();
+	underTextLine();
+	commandOnly(39);
+	readMouse();
+	workToScreenM();
+}
+
+void DreamGenContext::sortOutMap() {
 	const uint8 *src = workspace();
 	uint8 *dst = (uint8 *)segRef(data.word(kMapdata)).ptr(0, 0);
 	for (uint16 y = 0; y < kMaplength; ++y) {
@@ -1887,57 +1882,57 @@ void DreamGenContext::sortoutmap() {
 	}
 }
 
-void DreamGenContext::showcity() {
-	clearwork();
-	showframe(tempGraphics(), 57, 32, 0, 0);
-	showframe(tempGraphics(), 120+57, 32, 1, 0);
+void DreamGenContext::showCity() {
+	clearWork();
+	showFrame(tempGraphics(), 57, 32, 0, 0);
+	showFrame(tempGraphics(), 120+57, 32, 1, 0);
 }
 
-void DreamGenContext::mainscreen() {
+void DreamGenContext::mainScreen() {
 	data.byte(kInmaparea) = 0;
 	if (data.byte(kWatchon) == 1) {
-		RectWithCallback mainlist[] = {
+		RectWithCallback mainList[] = {
 			{ 44,70,32,46,&DreamGenContext::look },
 			{ 0,50,0,180,&DreamGenContext::inventory },
-			{ 226,244,10,26,&DreamGenContext::zoomonoff },
-			{ 226,244,26,40,&DreamGenContext::saveload },
-			{ 240,260,100,124,&DreamGenContext::madmanrun },
-			{ 0,320,0,200,&DreamGenContext::identifyob },
+			{ 226,244,10,26,&DreamGenContext::zoomOnOff },
+			{ 226,244,26,40,&DreamGenContext::saveLoad },
+			{ 240,260,100,124,&DreamGenContext::madmanRun },
+			{ 0,320,0,200,&DreamGenContext::identifyOb },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(mainlist);
+		checkCoords(mainList);
 	} else {
-		RectWithCallback mainlist2[] = {
+		RectWithCallback mainList2[] = {
 			{ 44,70,32,46,&DreamGenContext::look },
 			{ 0,50,0,180,&DreamGenContext::inventory },
-			{ 226+48,244+48,10,26,&DreamGenContext::zoomonoff },
-			{ 226+48,244+48,26,40,&DreamGenContext::saveload },
-			{ 240,260,100,124,&DreamGenContext::madmanrun },
-			{ 0,320,0,200,&DreamGenContext::identifyob },
+			{ 226+48,244+48,10,26,&DreamGenContext::zoomOnOff },
+			{ 226+48,244+48,26,40,&DreamGenContext::saveLoad },
+			{ 240,260,100,124,&DreamGenContext::madmanRun },
+			{ 0,320,0,200,&DreamGenContext::identifyOb },
 			{ 0xFFFF,0,0,0,0 }
 		};
-		checkcoords(mainlist2);
+		checkCoords(mainList2);
 	}
 
 	if (data.byte(kWalkandexam) != 0)
-		walkandexamine();
+		walkAndExamine();
 }
 
-void DreamGenContext::showwatch() {
+void DreamGenContext::showWatch() {
 	if (data.byte(kWatchon)) {
-		showframe((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), 250, 1, 6, 0);
-		showtime();
+		showFrame((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), 250, 1, 6, 0);
+		showTime();
 	}
 }
 
-void DreamGenContext::dumpwatch() {
+void DreamGenContext::dumpWatch() {
 	if (data.byte(kWatchdump) != 1)
 		return;
-	multidump(256, 21, 40, 12);
+	multiDump(256, 21, 40, 12);
 	data.byte(kWatchdump) = 0;
 }
 
-void DreamGenContext::showtime() {
+void DreamGenContext::showTime() {
 	if (data.byte(kWatchon) == 0)
 		return;
 	Frame *charset = (Frame *)segRef(data.word(kCharset1)).ptr(0, 0);
@@ -1946,24 +1941,24 @@ void DreamGenContext::showtime() {
 	int minutes = data.byte(kMinutecount);
 	int hours = data.byte(kHourcount);
 
-	showframe(charset, 282+5, 21, 91*3+10 + seconds / 10, 0);
-	showframe(charset, 282+9, 21, 91*3+10 + seconds % 10, 0);
+	showFrame(charset, 282+5, 21, 91*3+10 + seconds / 10, 0);
+	showFrame(charset, 282+9, 21, 91*3+10 + seconds % 10, 0);
 
-	showframe(charset, 270+5, 21, 91*3 + minutes / 10, 0);
-	showframe(charset, 270+11, 21, 91*3 + minutes % 10, 0);
+	showFrame(charset, 270+5, 21, 91*3 + minutes / 10, 0);
+	showFrame(charset, 270+11, 21, 91*3 + minutes % 10, 0);
 
-	showframe(charset, 256+5, 21, 91*3 + hours / 10, 0);
-	showframe(charset, 256+11, 21, 91*3 + hours % 10, 0);
+	showFrame(charset, 256+5, 21, 91*3 + hours / 10, 0);
+	showFrame(charset, 256+11, 21, 91*3 + hours % 10, 0);
 
-	showframe(charset, 267+5, 21, 91*3+20, 0);
+	showFrame(charset, 267+5, 21, 91*3+20, 0);
 }
 
-void DreamGenContext::watchcount() {
+void DreamGenContext::watchCount() {
 	if (data.byte(kWatchon) == 0)
 		return;
 	++data.byte(kTimercount);
 	if (data.byte(kTimercount) == 9) {
-		showframe((Frame *)segRef(data.word(kCharset1)).ptr(0, 0), 268+4, 21, 91*3+21, 0);
+		showFrame((Frame *)segRef(data.word(kCharset1)).ptr(0, 0), 268+4, 21, 91*3+21, 0);
 		data.byte(kWatchdump) = 1;
 	} else if (data.byte(kTimercount) == 18) {
 		data.byte(kTimercount) = 0;
@@ -1978,13 +1973,13 @@ void DreamGenContext::watchcount() {
 					data.byte(kHourcount) = 0;
 			}
 		}
-		showtime();
+		showTime();
 		data.byte(kWatchdump) = 1;
 	}
 }
 
-void DreamGenContext::roomname() {
-	printmessage(88, 18, 53, 240, false);
+void DreamGenContext::roomName() {
+	printMessage(88, 18, 53, 240, false);
 	uint16 textIndex = data.byte(kRoomnum);
 	if (textIndex >= 32)
 		textIndex -= 32;
@@ -1992,18 +1987,18 @@ void DreamGenContext::roomname() {
 	uint8 maxWidth = (data.byte(kWatchon) == 1) ? 120 : 160;
 	uint16 descOffset = segRef(data.word(kRoomdesc)).word(kIntextdat + textIndex * 2);
 	const uint8 *string = segRef(data.word(kRoomdesc)).ptr(kIntext + descOffset, 0);
-	printdirect(string, 88, 25, maxWidth, false);
+	printDirect(string, 88, 25, maxWidth, false);
 	data.word(kLinespacing) = 10;
-	usecharset1();
+	useCharset1();
 }
 
-void DreamGenContext::zoomicon() {
+void DreamGenContext::zoomIcon() {
 	if (data.byte(kZoomon) == 0)
 		return;
-	showframe((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), kZoomx, kZoomy-1, 8, 0);
+	showFrame((Frame *)segRef(data.word(kIcons1)).ptr(0, 0), kZoomx, kZoomy-1, 8, 0);
 }
 
-void DreamGenContext::loadroom() {
+void DreamGenContext::loadRoom() {
 	data.byte(kRoomloaded) = 1;
 	data.word(kTimecount) = 0;
 	data.word(kMaintimer) = 0;
@@ -2013,15 +2008,15 @@ void DreamGenContext::loadroom() {
 	data.word(kTextaddressy) = 182;
 	data.byte(kTextlen) = 240;
 	data.byte(kLocation) = data.byte(kNewlocation);
-	Room *room = getroomdata(data.byte(kNewlocation));
-	startloading(room);
-	loadroomssample();
-	switchryanon();
-	drawflags();
-	getdimension();
+	Room *room = getRoomData(data.byte(kNewlocation));
+	startLoading(room);
+	loadRoomsSample();
+	switchRyanOn();
+	drawFlags();
+	getDimension();
 }
 
-void DreamGenContext::loadroomssample() {
+void DreamGenContext::loadRoomsSample() {
 	uint8 sample = data.byte(kRoomssample);
 
 	if (sample == 255 || data.byte(kCurrentsample) == sample)
@@ -2031,16 +2026,16 @@ void DreamGenContext::loadroomssample() {
 	cs.byte(kSamplename+10) = '0' + sample / 10;
 	cs.byte(kSamplename+11) = '0' + sample % 10;
 	dx = kSamplename;
-	loadsecondsample();
+	loadSecondSample();
 }
 
-void DreamGenContext::readsetdata() {
-	data.word(kCharset1) = standardload((const char *)cs.ptr(kCharacterset1, 0));
-	data.word(kIcons1) = standardload((const char *)cs.ptr(kIcongraphics0, 0));
-	data.word(kIcons2) = standardload((const char *)cs.ptr(kIcongraphics1, 0));
-	data.word(kMainsprites) = standardload((const char *)cs.ptr(kSpritename1, 0));
-	data.word(kPuzzletext) = standardload((const char *)cs.ptr(kPuzzletextname, 0));
-	data.word(kCommandtext) = standardload((const char *)cs.ptr(kCommandtextname, 0));
+void DreamGenContext::readSetData() {
+	data.word(kCharset1) = standardLoad((const char *)cs.ptr(kCharacterset1, 0));
+	data.word(kIcons1) = standardLoad((const char *)cs.ptr(kIcongraphics0, 0));
+	data.word(kIcons2) = standardLoad((const char *)cs.ptr(kIcongraphics1, 0));
+	data.word(kMainsprites) = standardLoad((const char *)cs.ptr(kSpritename1, 0));
+	data.word(kPuzzletext) = standardLoad((const char *)cs.ptr(kPuzzletextname, 0));
+	data.word(kCommandtext) = standardLoad((const char *)cs.ptr(kCommandtextname, 0));
 	ax = data.word(kCharset1);
 	data.word(kCurrentset) = ax;
 	if (data.byte(kSoundint) == 0xff)
@@ -2064,7 +2059,7 @@ Frame * DreamGenContext::tempGraphics3() {
 	return (Frame *)segRef(data.word(kTempgraphics3)).ptr(0, 0);
 }
 
-void DreamGenContext::playchannel0(uint8 index, uint8 repeat) {
+void DreamGenContext::playChannel0(uint8 index, uint8 repeat) {
 	if (data.byte(kSoundint) == 255)
 		return;
 
@@ -2087,11 +2082,11 @@ void DreamGenContext::playchannel0(uint8 index, uint8 repeat) {
 	}
 }
 
-void DreamGenContext::playchannel0() {
-	playchannel0(al, ah);
+void DreamGenContext::playChannel0() {
+	playChannel0(al, ah);
 }
 
-void DreamGenContext::playchannel1(uint8 index) {
+void DreamGenContext::playChannel1(uint8 index) {
 	if (data.byte(kSoundint) == 255)
 		return;
 	if (data.byte(kCh1playing) == 7)
@@ -2110,18 +2105,18 @@ void DreamGenContext::playchannel1(uint8 index) {
 	data.word(kCh1blockstocopy) = soundBank[index].blockCount();
 }
 
-void DreamGenContext::playchannel1() {
-	playchannel1(al);
+void DreamGenContext::playChannel1() {
+	playChannel1(al);
 }
 
-void DreamGenContext::findroominloc() {
+void DreamGenContext::findRoomInLoc() {
 	uint8 x = data.byte(kMapx) / 11;
 	uint8 y = data.byte(kMapy) / 10;
 	uint8 roomNum = y * 6 + x;
 	data.byte(kRoomnum) = roomNum;
 }
 
-void DreamGenContext::autolook() {
+void DreamGenContext::autoLook() {
 	if ((data.word(kMousex) != data.word(kOldx)) || (data.word(kMousey) != data.word(kOldy))) {
 		data.word(kLookcounter) = 1000;
 		return;
@@ -2132,7 +2127,7 @@ void DreamGenContext::autolook() {
 		return;
 	if (data.word(kWatchingtime))
 		return;
-	dolook();
+	doLook();
 }
 
 void DreamGenContext::look() {
@@ -2142,42 +2137,42 @@ void DreamGenContext::look() {
 	}
 	if (data.byte(kCommandtype) != 241) {
 		data.byte(kCommandtype) = 241;
-		commandonly(25);
+		commandOnly(25);
 	}
 	if ((data.word(kMousebutton) == 1) && (data.word(kMousebutton) != data.word(kOldbutton)))
-		dolook();
+		doLook();
 }
 
-void DreamGenContext::dolook() {
-	createpanel();
-	showicon();
-	undertextline();
-	worktoscreenm();
+void DreamGenContext::doLook() {
+	createPanel();
+	showIcon();
+	underTextLine();
+	workToScreenM();
 	data.byte(kCommandtype) = 255;
-	dumptextline();
+	dumpTextLine();
 	uint8 index = data.byte(kRoomnum) & 31;
 	uint16 offset = segRef(data.word(kRoomdesc)).word(kIntextdat + index * 2);
 	uint8 *string = segRef(data.word(kRoomdesc)).ptr(kIntext, 0) + offset;
-	findnextcolon(&string);
+	findNextColon(&string);
 	uint16 x;
 	if (data.byte(kReallocation) < 50)
 		x = 66;
 	else
 		x = 40;
-	if (printslow(string, x, 80, 241, true) != 1)
-		hangonp(400);
+	if (printSlow(string, x, 80, 241, true) != 1)
+		hangOnP(400);
 
 	data.byte(kPointermode) = 0;
 	data.byte(kCommandtype) = 0;
-	redrawmainscrn();
-	worktoscreenm();
+	redrawMainScrn();
+	workToScreenM();
 }
 
-void DreamGenContext::usecharset1() {
+void DreamGenContext::useCharset1() {
 	data.word(kCurrentset) = data.word(kCharset1);
 }
 
-void DreamGenContext::usetempcharset() {
+void DreamGenContext::useTempCharset() {
 	data.word(kCurrentset) = data.word(kTempcharset);
 }
 
@@ -2186,7 +2181,7 @@ void DreamGenContext::loadRoomData(const Room* room, bool skipDat) {
 	engine->openFile(room->name);
 	cs.word(kHandle) = 1; //only one handle
 	flags._c = false;
-	readheader();
+	readHeader();
 
 	// read segment lengths from room file header
 	int len[15];
@@ -2195,7 +2190,7 @@ void DreamGenContext::loadRoomData(const Room* room, bool skipDat) {
 
 	data.word(kBackdrop) = allocateAndLoad(len[0]);
 	clearAndLoad(data.word(kWorkspace), 0, len[1], 132*66); // 132*66 = maplen
-	sortoutmap();
+	sortOutMap();
 	data.word(kSetframes) = allocateAndLoad(len[2]);
 	if (!skipDat)
 		clearAndLoad(data.word(kSetdat), 255, len[3], kSetdatlen);
@@ -2219,25 +2214,25 @@ void DreamGenContext::loadRoomData(const Room* room, bool skipDat) {
 		engine->skipBytes(len[13]);
 	data.word(kFreedesc) = allocateAndLoad(len[14]);
 
-	closefile();
+	closeFile();
 }
 
-void DreamGenContext::restoreall() {
-	const Room *room = getroomdata(data.byte(kLocation));
+void DreamGenContext::restoreAll() {
+	const Room *room = getRoomData(data.byte(kLocation));
 	loadRoomData(room, true);
-	setallchanges();
+	setAllChanges();
 }
 
-void DreamGenContext::restorereels() {
+void DreamGenContext::restoreReels() {
 	if (data.byte(kRoomloaded) == 0)
 		return;
 
-	const Room *room = getroomdata(data.byte(kReallocation));
+	const Room *room = getRoomData(data.byte(kReallocation));
 
 	engine->openFile(room->name);
 	cs.word(kHandle) = 1; //only one handle
 	flags._c = false;
-	readheader();
+	readHeader();
 
 	// read segment lengths from room file header
 	int len[15];
@@ -2252,50 +2247,50 @@ void DreamGenContext::restorereels() {
 	data.word(kReel2) = allocateAndLoad(len[5]);
 	data.word(kReel3) = allocateAndLoad(len[6]);
 
-	closefile();
+	closeFile();
 }
 
-void DreamGenContext::loadfolder() {
-	loadintotemp("DREAMWEB.G09");
-	loadintotemp2("DREAMWEB.G10");
-	loadintotemp3("DREAMWEB.G11");
-	loadtempcharset("DREAMWEB.C02");
-	loadtemptext("DREAMWEB.T50");
+void DreamGenContext::loadFolder() {
+	loadIntoTemp("DREAMWEB.G09");
+	loadIntoTemp2("DREAMWEB.G10");
+	loadIntoTemp3("DREAMWEB.G11");
+	loadTempCharset("DREAMWEB.C02");
+	loadTempText("DREAMWEB.T50");
 }
 
-void DreamGenContext::showfolder() {
+void DreamGenContext::showFolder() {
 	data.byte(kCommandtype) = 255;
 	if (data.byte(kFolderpage)) {
-		usetempcharset();
-		createpanel2();
-		showframe(tempGraphics(), 0, 0, 0, 0);
-		showframe(tempGraphics(), 143, 0, 1, 0);
-		showframe(tempGraphics(), 0, 92, 2, 0);
-		showframe(tempGraphics(), 143, 92, 3, 0);
-		folderexit();
+		useTempCharset();
+		createPanel2();
+		showFrame(tempGraphics(), 0, 0, 0, 0);
+		showFrame(tempGraphics(), 143, 0, 1, 0);
+		showFrame(tempGraphics(), 0, 92, 2, 0);
+		showFrame(tempGraphics(), 143, 92, 3, 0);
+		folderExit();
 		if (data.byte(kFolderpage) != 1)
-			showleftpage();
+			showLeftPage();
 		if (data.byte(kFolderpage) != 12)
-			showrightpage();
-		usecharset1();
-		undertextline();
+			showRightPage();
+		useCharset1();
+		underTextLine();
 	} else {
-		createpanel2();
-		showframe(tempGraphics3(), 143-28, 0, 0, 0);
-		showframe(tempGraphics3(), 143-28, 92, 1, 0);
-		folderexit();
-		undertextline();
+		createPanel2();
+		showFrame(tempGraphics3(), 143-28, 0, 0, 0);
+		showFrame(tempGraphics3(), 143-28, 92, 1, 0);
+		folderExit();
+		underTextLine();
 	}
 }
 
-void DreamGenContext::showleftpage() {
-	showframe(tempGraphics2(), 0, 12, 3, 0);
+void DreamGenContext::showLeftPage() {
+	showFrame(tempGraphics2(), 0, 12, 3, 0);
 	uint16 y = 12+5;
 	for (size_t i = 0; i < 9; ++i) {
-		showframe(tempGraphics2(), 0, y, 4, 0);
+		showFrame(tempGraphics2(), 0, y, 4, 0);
 		y += 16;
 	}
-	showframe(tempGraphics2(), 0, y, 5, 0);
+	showFrame(tempGraphics2(), 0, y, 5, 0);
 	data.word(kLinespacing) = 8;
 	data.word(kCharshift) = 91;
 	data.byte(kKerning) = 1;
@@ -2305,7 +2300,7 @@ void DreamGenContext::showleftpage() {
 	for (size_t i = 0; i < 2; ++i) {
 		uint8 lastChar;
 		do {
-			lastChar = printdirect(&string, 2, &y, 140, false);
+			lastChar = printDirect(&string, 2, &y, 140, false);
 			y += data.word(kLinespacing);
 		} while (lastChar != '\0');
 	}
@@ -2321,15 +2316,15 @@ void DreamGenContext::showleftpage() {
 	}
 }
 
-void DreamGenContext::showrightpage() {
-	showframe(tempGraphics2(), 143, 12, 0, 0);
+void DreamGenContext::showRightPage() {
+	showFrame(tempGraphics2(), 143, 12, 0, 0);
 	uint16 y = 12+37;
 	for (size_t i = 0; i < 7; ++i) {
-		showframe(tempGraphics2(), 143, y, 1, 0);
+		showFrame(tempGraphics2(), 143, y, 1, 0);
 		y += 16;
 	}
 
-	showframe(tempGraphics2(), 143, y, 2, 0);
+	showFrame(tempGraphics2(), 143, y, 2, 0);
 	data.word(kLinespacing) = 8;
 	data.byte(kKerning) = 1;
 	uint8 pageIndex = data.byte(kFolderpage) - 1;
@@ -2338,7 +2333,7 @@ void DreamGenContext::showrightpage() {
 	for (size_t i = 0; i < 2; ++i) {
 		uint8 lastChar;
 		do {
-			lastChar = printdirect(&string, 152, &y, 140, false);
+			lastChar = printDirect(&string, 152, &y, 140, false);
 			y += data.word(kLinespacing);
 		} while (lastChar != '\0');
 	}
@@ -2346,21 +2341,20 @@ void DreamGenContext::showrightpage() {
 	data.word(kLinespacing) = 10;
 }
 
-
-uint8 DreamGenContext::getlocation(uint8 index) {
+uint8 DreamGenContext::getLocation(uint8 index) {
 	return data.byte(kRoomscango + index);
 }
 
-void DreamGenContext::getlocation() {
-	al = getlocation(al);
+void DreamGenContext::getLocation() {
+	al = getLocation(al);
 }
 
-void DreamGenContext::setlocation(uint8 index) {
+void DreamGenContext::setLocation(uint8 index) {
 	data.byte(kRoomscango + index) = 1;
 }
 
-void DreamGenContext::setlocation() {
-	setlocation(al);
+void DreamGenContext::setLocation() {
+	setLocation(al);
 }
 
 const uint8 *DreamGenContext::getTextInFile1(uint16 index) {
@@ -2370,126 +2364,126 @@ const uint8 *DreamGenContext::getTextInFile1(uint16 index) {
 }
 
 void DreamGenContext::checkFolderCoords() {
-	RectWithCallback folderlist[] = {
-		{ 280,320,160,200,&DreamGenContext::quitkey },
-		{ 143,300,6,194,&DreamGenContext::nextfolder },
-		{ 0,143,6,194,&DreamGenContext::lastfolder },
-		{ 0,320,0,200,&DreamGenContext::blank },
-		{ 0xFFFF,0,0,0,0 }
+	RectWithCallback folderList[] = {
+		{ 280,320,160,200, &DreamGenContext::quitKey },
+		{ 143,300,6,194, &DreamGenContext::nextFolder },
+		{ 0,143,6,194, &DreamGenContext::lastFolder },
+		{ 0,320,0,200, &DreamGenContext::blank },
+		{ 0xFFFF,0,0,0, 0 }
 	};
-	checkcoords(folderlist);
+	checkCoords(folderList);
 }
 
-void DreamGenContext::nextfolder() {
+void DreamGenContext::nextFolder() {
 	if (data.byte(kFolderpage) == 12) {
 		blank();
 		return;
 	}
 	if (data.byte(kCommandtype) != 201) {
 		data.byte(kCommandtype) = 201;
-		commandonly(16);
+		commandOnly(16);
 	}
 	if ((data.word(kMousebutton) == 1) && (data.word(kMousebutton) != data.word(kOldbutton))) {
 		++data.byte(kFolderpage);
-		folderhints();
-		delpointer();
-		showfolder();
+		folderHints();
+		delPointer();
+		showFolder();
 		data.word(kMousebutton) = 0;
 		checkFolderCoords();
-		worktoscreenm();
+		workToScreenM();
 	}
 }
 
-void DreamGenContext::lastfolder() {
+void DreamGenContext::lastFolder() {
 	if (data.byte(kFolderpage) == 0) {
 		blank();
 		return;
 	}
 	if (data.byte(kCommandtype) != 202) {
 		data.byte(kCommandtype) = 202;
-		commandonly(17);
+		commandOnly(17);
 	}
 
 	if ((data.word(kMousebutton) == 1) && (data.word(kMousebutton) != data.word(kOldbutton))) {
 		--data.byte(kFolderpage);
-		delpointer();
-		showfolder();
+		delPointer();
+		showFolder();
 		data.word(kMousebutton) = 0;
 		checkFolderCoords();
-		worktoscreenm();
+		workToScreenM();
 	}
 }
 
-void DreamGenContext::folderhints() {
+void DreamGenContext::folderHints() {
 	if (data.byte(kFolderpage) == 5) {
-		if ((data.byte(kAidedead) != 1) && (getlocation(13) != 1)) {
-			setlocation(13);
-			showfolder();
+		if ((data.byte(kAidedead) != 1) && (getLocation(13) != 1)) {
+			setLocation(13);
+			showFolder();
 			const uint8 *string = getTextInFile1(30);
-			printdirect(string, 0, 86, 141, true);
-			worktoscreenm();
-			hangonp(200);
+			printDirect(string, 0, 86, 141, true);
+			workToScreenM();
+			hangOnP(200);
 		}
 	} else if (data.byte(kFolderpage) == 9) {
-		if (getlocation(7) != 1) {
-			setlocation(7);
-			showfolder();
+		if (getLocation(7) != 1) {
+			setLocation(7);
+			showFolder();
 			const uint8 *string = getTextInFile1(31);
-			printdirect(string, 0, 86, 141, true);
-			worktoscreenm();
-			hangonp(200);
+			printDirect(string, 0, 86, 141, true);
+			workToScreenM();
+			hangOnP(200);
 		}
 	}
 }
 
-void DreamGenContext::folderexit() {
-	showframe(tempGraphics2(), 296, 178, 6, 0);
+void DreamGenContext::folderExit() {
+	showFrame(tempGraphics2(), 296, 178, 6, 0);
 }
 
-void DreamGenContext::loadtraveltext() {
-	data.word(kTraveltext) = standardload("DREAMWEB.T81");
+void DreamGenContext::loadTravelText() {
+	data.word(kTraveltext) = standardLoad("DREAMWEB.T81");
 }
 
-void DreamGenContext::loadtemptext() {
-	loadtemptext((const char *)cs.ptr(dx, 0));
+void DreamGenContext::loadTempText() {
+	loadTempText((const char *)cs.ptr(dx, 0));
 }
 
-void DreamGenContext::loadtemptext(const char *fileName) {
-	data.word(kTextfile1) = standardload(fileName);
+void DreamGenContext::loadTempText(const char *fileName) {
+	data.word(kTextfile1) = standardLoad(fileName);
 }
 
-void DreamGenContext::drawfloor() {
-	eraseoldobs();
-	drawflags();
-	calcmapad();
-	doblocks();
-	showallobs();
-	showallfree();
-	showallex();
-	paneltomap();
-	initrain();
+void DreamGenContext::drawFloor() {
+	eraseOldObs();
+	drawFlags();
+	calcMapAd();
+	doBlocks();
+	showAllObs();
+	showAllFree();
+	showAllEx();
+	panelToMap();
+	initRain();
 	data.byte(kNewobs) = 0;
 }
 
-void DreamGenContext::allocatebuffers() {
-	data.word(kExtras) = allocatemem(kLengthofextra/16);
-	data.word(kMapdata) = allocatemem(kLengthofmap/16);
-	data.word(kBuffers) = allocatemem(kLengthofbuffer/16);
-	data.word(kFreedat) = allocatemem(kFreedatlen/16);
-	data.word(kSetdat) = allocatemem(kSetdatlen/16);
-	data.word(kMapstore) = allocatemem(kLenofmapstore/16);
-	allocatework();
-	data.word(kSounddata) = allocatemem(2048/16);
-	data.word(kSounddata2) = allocatemem(2048/16);
-}
-
-void DreamGenContext::worktoscreenm() {
-	animpointer();
-	readmouse();
-	showpointer();
-	vsync();
-	worktoscreen();
-	delpointer();
+void DreamGenContext::allocateBuffers() {
+	data.word(kExtras) = allocateMem(kLengthofextra/16);
+	data.word(kMapdata) = allocateMem(kLengthofmap/16);
+	data.word(kBuffers) = allocateMem(kLengthofbuffer/16);
+	data.word(kFreedat) = allocateMem(kFreedatlen/16);
+	data.word(kSetdat) = allocateMem(kSetdatlen/16);
+	data.word(kMapstore) = allocateMem(kLenofmapstore/16);
+	allocateWork();
+	data.word(kSounddata) = allocateMem(2048/16);
+	data.word(kSounddata2) = allocateMem(2048/16);
+}
+
+void DreamGenContext::workToScreenM() {
+	animPointer();
+	readMouse();
+	showPointer();
+	vSync();
+	workToScreen();
+	delPointer();
 }
 
 } /*namespace dreamgen */
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 974b61dc00..60231c4e6e 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -19,366 +19,366 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  *
  */
-	void screenupdate();
+	void screenUpdate();
 	bool quitRequested();
 	void startup();
 	void startup1();
-	void switchryanon();
-	void switchryanoff();
-	uint16 allocatemem(uint16 paragraphs);
-	void deallocatemem(uint16 segment);
+	void switchRyanOn();
+	void switchRyanOff();
+	uint16 allocateMem(uint16 paragraphs);
+	void deallocateMem(uint16 segment);
 	uint8 *workspace();
 	uint8 *textUnder();
-	void allocatework();
-	void clearwork();
-	void standardload();
-	uint16 standardload(const char *fileName); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
-	void loadintotemp();
-	void loadintotemp2();
-	void loadintotemp3();
-	void loadintotemp(const char *fileName);
-	void loadintotemp2(const char *fileName);
-	void loadintotemp3(const char *fileName);
-	void loadtempcharset();
-	void loadtempcharset(const char *fileName);
+	void allocateWork();
+	void clearWork();
+	void standardLoad();
+	uint16 standardLoad(const char *fileName); // Returns a segment handle which needs to be freed with deallocatemem for symmetry
+	void loadIntoTemp();
+	void loadIntoTemp2();
+	void loadIntoTemp3();
+	void loadIntoTemp(const char *fileName);
+	void loadIntoTemp2(const char *fileName);
+	void loadIntoTemp3(const char *fileName);
+	void loadTempCharset();
+	void loadTempCharset(const char *fileName);
 	Frame *tempCharset();
-	void saveload();
-	void printcurs();
-	void delcurs();
-	void hangoncurs(uint16 frameCount);
-	void hangoncurs();
-	void multidump();
-	void multidump(uint16 x, uint16 y, uint8 width, uint8 height);
-	void frameoutv(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
-	void frameoutnm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void frameoutbh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void frameoutfx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
-	void worktoscreen();
+	void saveLoad();
+	void printCurs();
+	void delCurs();
+	void hangOnCurs(uint16 frameCount);
+	void hangOnCurs();
+	void multiDump();
+	void multiDump(uint16 x, uint16 y, uint8 width, uint8 height);
+	void frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y);
+	void frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y);
+	void workToScreen();
 	void workToScreenCPP();
-	void multiget();
-	void multiget(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
-	void convertkey();
+	void multiGet();
+	void multiGet(uint8 *dst, uint16 x, uint16 y, uint8 width, uint8 height);
+	void convertKey();
 	void cls();
-	void printsprites();
-	void quickquit();
-	void readoneblock();
-	void printundermon();
-	void seecommandtail();
-	void randomnumber();
-	void quickquit2();
-	uint8 getnextword(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
-	void printboth(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
-	void printchar();
-	void printchar(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
-	void printchar(const Frame* charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
-	void printdirect();
-	uint8 printdirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered);
-	uint8 printdirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
-	void printmessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
-	void printmessage();
-	void usetimedtext();
-	void dumptimedtext();
-	void setuptimedtemp();
-	void setuptimedtemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
-	void getundertimed();
-	void putundertimed();
-	uint8 printslow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
-	void printslow();
-	void dumptextline();
-	void getnumber();
-	uint8 getnumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
-	uint8 kernchars(uint8 firstChar, uint8 secondChar, uint8 width);
-	void oldtonames();
-	void namestoold();
-	void loadpalfromiff();
-	void getroomdata();
-	Room *getroomdata(uint8 room);
-	void readheader();
-	void fillspace();
-	void startloading(const Room *room);
-	Sprite *spritetable();
-	void showframe();
-	void showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
-	void showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
-	void printasprite(const Sprite *sprite);
+	void printSprites();
+	void quickQuit();
+	void readOneBlock();
+	void printUnderMon();
+	void seeCommandTail();
+	void randomNumber();
+	void quickQuit2();
+	uint8 getNextWord(const Frame *charSet, const uint8 *string, uint8 *totalWidth, uint8 *charCount);
+	void printBoth(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar);
+	void printChar();
+	void printChar(const Frame* charSet, uint16 *x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
+	void printChar(const Frame* charSet, uint16 x, uint16 y, uint8 c, uint8 nextChar, uint8 *width, uint8 *height);
+	void printDirect();
+	uint8 printDirect(const uint8** string, uint16 x, uint16 *y, uint8 maxWidth, bool centered);
+	uint8 printDirect(const uint8* string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
+	void printMessage(uint16 x, uint16 y, uint8 index, uint8 maxWidth, bool centered);
+	void printMessage();
+	void useTimedText();
+	void dumpTimedText();
+	void setupTimedTemp();
+	void setupTimedTemp(uint8 textIndex, uint8 voiceIndex, uint8 x, uint8 y, uint16 countToTimed, uint16 timeCount);
+	void getUnderTimed();
+	void putUnderTimed();
+	uint8 printSlow(const uint8 *string, uint16 x, uint16 y, uint8 maxWidth, bool centered);
+	void printSlow();
+	void dumpTextLine();
+	void getNumber();
+	uint8 getNumber(const Frame *charSet, const uint8 *string, uint16 maxWidth, bool centered, uint16 *offset);
+	uint8 kernChars(uint8 firstChar, uint8 secondChar, uint8 width);
+	void oldToNames();
+	void namesToOld();
+	void loadPalFromIFF();
+	void getRoomData();
+	Room *getRoomData(uint8 room);
+	void readHeader();
+	void fillSpace();
+	void startLoading(const Room *room);
+	Sprite *spriteTable();
+	void showFrame();
+	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height);
+	void showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag);
+	void printASprite(const Sprite *sprite);
 	void width160();
-	void multiput(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
-	void multiput();
-	void eraseoldobs();
-	void clearsprites();
-	Sprite *makesprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi);
-	void spriteupdate();
-	void initman();
-	void mainman(Sprite *sprite);
-	void facerightway();
+	void multiPut(const uint8 *src, uint16 x, uint16 y, uint8 width, uint8 height);
+	void multiPut();
+	void eraseOldObs();
+	void clearSprites();
+	Sprite *makeSprite(uint8 x, uint8 y, uint16 updateCallback, uint16 frameData, uint16 somethingInDi);
+	void spriteUpdate();
+	void initMan();
+	void mainMan(Sprite *sprite);
+	void faceRightWay();
 	void walking(Sprite *sprite);
-	void autosetwalk();
-	void checkdest(const RoomPaths *roomsPaths);
-	void aboutturn(Sprite *sprite);
-	void backobject(Sprite *sprite);
+	void autoSetWalk();
+	void checkDest(const RoomPaths *roomsPaths);
+	void aboutTurn(Sprite *sprite);
+	void backObject(Sprite *sprite);
 	void constant(Sprite *sprite, SetObject *objData);
 	void steady(Sprite *sprite, SetObject *objData);
 	void random(Sprite *sprite, SetObject *objData);
-	void dodoor(Sprite *sprite, SetObject *objData, Common::Rect check);
+	void doDoor(Sprite *sprite, SetObject *objData, Common::Rect check);
 	void doorway(Sprite *sprite, SetObject *objData);
-	void widedoor(Sprite *sprite, SetObject *objData);
-	void lockeddoorway(Sprite *sprite, SetObject *objData);
-	void liftsprite(Sprite *sprite, SetObject *objData);
-	Frame *findsource();
-	void showgamereel();
-	void showgamereel(ReelRoutine *routine);
-	void showreelframe(Reel *reel);
-	const Frame *getreelframeax(uint16 frame);
-	void turnpathon(uint8 param);
-	void turnpathoff(uint8 param);
-	void turnpathon();
-	void turnpathoff();
-	void turnanypathon(uint8 param, uint8 room);
-	void turnanypathoff(uint8 param, uint8 room);
-	void turnanypathon();
-	void turnanypathoff();
-	RoomPaths *getroomspaths();
-	void makebackob(SetObject *objData);
-	void modifychar();
-	void lockmon();
-	void cancelch0();
-	void cancelch1();
-	void plotreel();
-	Reel *getreelstart();
-	void dealwithspecial(uint8 firstParam, uint8 secondParam);
+	void wideDoor(Sprite *sprite, SetObject *objData);
+	void lockedDoorway(Sprite *sprite, SetObject *objData);
+	void liftSprite(Sprite *sprite, SetObject *objData);
+	Frame *findSource();
+	void showGameReel();
+	void showGameReel(ReelRoutine *routine);
+	void showReelFrame(Reel *reel);
+	const Frame *getReelFrameAX(uint16 frame);
+	void turnPathOn(uint8 param);
+	void turnPathOff(uint8 param);
+	void turnPathOn();
+	void turnPathOff();
+	void turnAnyPathOn(uint8 param, uint8 room);
+	void turnAnyPathOff(uint8 param, uint8 room);
+	void turnAnyPathOn();
+	void turnAnyPathOff();
+	RoomPaths *getRoomsPaths();
+	void makeBackOb(SetObject *objData);
+	void modifyChar();
+	void lockMon();
+	void cancelCh0();
+	void cancelCh1();
+	void plotReel();
+	Reel *getReelStart();
+	void dealWithSpecial(uint8 firstParam, uint8 secondParam);
 	void zoom();
 	void crosshair();
-	void showrain();
-	void deltextline();
-	void commandonly();
-	void commandonly(uint8 command);
-	void doblocks();
-	void checkifperson();
-	bool checkifperson(uint8 x, uint8 y);
-	void checkiffree();
-	bool checkiffree(uint8 x, uint8 y);
-	void checkifex();
-	bool checkifex(uint8 x, uint8 y);
-	const uint8 *findobname(uint8 type, uint8 index);
-	void copyname();
-	void copyname(uint8 type, uint8 index, uint8 *dst);
-	void commandwithob();
-	void commandwithob(uint8 command, uint8 type, uint8 index);
-	void showpanel();
-	void updatepeople();
-	void madmantext();
-	void madmode();
-	void movemap(uint8 param);
-	bool addalong(const uint8 *mapFlags);
-	bool addlength(const uint8 *mapFlags);
-	void getdimension();
-	void getdimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
-	void getmapad();
-	void calcmapad();
-	uint8 getmapad(const uint8 *setData);
-	uint8 getxad(const uint8 *setData, uint8 *result);
-	uint8 getyad(const uint8 *setData, uint8 *result);
-	void calcfrframe();
-	void calcfrframe(uint8* width, uint8* height);
-	void finalframe();
-	void finalframe(uint16 *x, uint16 *y);
-	void showallobs();
-	void blocknametext();
-	void walktotext();
-	void personnametext();
-	void findxyfrompath();
-	void findormake();
-	void findormake(uint8 index, uint8 value, uint8 type);
-	DynObject *getfreead(uint8 index);
-	DynObject *getexad(uint8 index);
-	DynObject *geteitheradCPP();
-	SetObject *getsetad(uint8 index);
-	void *getanyad(uint8 *value1, uint8 *value2);
-	void *getanyaddir(uint8 index, uint8 flag);
-	void setallchanges();
-	void dochange(uint8 index, uint8 value, uint8 type);
-	void deletetaken();
+	void showRain();
+	void delTextLine();
+	void commandOnly();
+	void commandOnly(uint8 command);
+	void doBlocks();
+	void checkIfPerson();
+	bool checkIfPerson(uint8 x, uint8 y);
+	void checkIfFree();
+	bool checkIfFree(uint8 x, uint8 y);
+	void checkIfEx();
+	bool checkIfEx(uint8 x, uint8 y);
+	const uint8 *findObName(uint8 type, uint8 index);
+	void copyName();
+	void copyName(uint8 type, uint8 index, uint8 *dst);
+	void commandWithOb();
+	void commandWithOb(uint8 command, uint8 type, uint8 index);
+	void showPanel();
+	void updatePeople();
+	void madmanText();
+	void madMode();
+	void moveMap(uint8 param);
+	bool addAlong(const uint8 *mapFlags);
+	bool addLength(const uint8 *mapFlags);
+	void getDimension();
+	void getDimension(uint8 *mapXstart, uint8 *mapYstart, uint8 *mapXsize, uint8 *mapYsize);
+	void getMapAd();
+	void calcMapAd();
+	uint8 getMapAd(const uint8 *setData);
+	uint8 getXAd(const uint8 *setData, uint8 *result);
+	uint8 getYAd(const uint8 *setData, uint8 *result);
+	void calcFrFrame();
+	void calcFrFrame(uint8* width, uint8* height);
+	void finalFrame();
+	void finalFrame(uint16 *x, uint16 *y);
+	void showAllObs();
+	void blockNameText();
+	void walkToText();
+	void personNameText();
+	void findXYFromPath();
+	void findOrMake();
+	void findOrMake(uint8 index, uint8 value, uint8 type);
+	DynObject *getFreeAd(uint8 index);
+	DynObject *getExAd(uint8 index);
+	DynObject *getEitherAdCPP();
+	SetObject *getSetAd(uint8 index);
+	void *getAnyAd(uint8 *value1, uint8 *value2);
+	void *getAnyAdDir(uint8 index, uint8 flag);
+	void setAllChanges();
+	void doChange(uint8 index, uint8 value, uint8 type);
+	void deleteTaken();
 	bool isCD();
-	void placesetobject();
-	void placesetobject(uint8 index);
-	void removesetobject();
-	void removesetobject(uint8 index);
-	void showallfree();
-	void showallex();
-	bool finishedwalkingCPP();
-	void finishedwalking();
-	void checkone();
-	void checkone(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
-	void getflagunderp();
-	void getflagunderp(uint8 *flag, uint8 *flagEx);
-	void walkandexamine();
-	void obname();
-	void obname(uint8 command, uint8 commandType);
-	void delpointer();
-	void showblink();
-	void dumpblink();
-	void dumppointer();
-	void showpointer();
-	void animpointer();
-	void checkcoords();
-	void checkcoords(const RectWithCallback *rectWithCallbacks);
-	void readmouse();
+	void placeSetObject();
+	void placeSetObject(uint8 index);
+	void removeSetObject();
+	void removeSetObject(uint8 index);
+	void showAllFree();
+	void showAllEx();
+	bool finishedWalkingCPP();
+	void finishedWalking();
+	void checkOne();
+	void checkOne(uint8 x, uint8 y, uint8 *flag, uint8 *flagEx, uint8 *type, uint8 *flagX, uint8 *flagY);
+	void getFlagUnderP();
+	void getFlagUnderP(uint8 *flag, uint8 *flagEx);
+	void walkAndExamine();
+	void obName();
+	void obName(uint8 command, uint8 commandType);
+	void delPointer();
+	void showBlink();
+	void dumpBlink();
+	void dumpPointer();
+	void showPointer();
+	void animPointer();
+	void checkCoords();
+	void checkCoords(const RectWithCallback *rectWithCallbacks);
+	void readMouse();
 	uint16 readMouseState();
-	uint16 waitframes();
-	void drawflags();
-	void addtopeoplelist();
-	void addtopeoplelist(ReelRoutine *routine);
-	void getexpos();
-	void paneltomap();
-	void maptopanel();
-	void dumpmap();
-	void obpicture();
-	void transferinv();
-	void obicons();
+	uint16 waitFrames();
+	void drawFlags();
+	void addToPeopleList();
+	void addToPeopleList(ReelRoutine *routine);
+	void getExPos();
+	void panelToMap();
+	void mapToPanel();
+	void dumpMap();
+	void obPicture();
+	void transferInv();
+	void obIcons();
 	void compare();
 	bool compare(uint8 index, uint8 flag, const char id[4]);
-	bool pixelcheckset(const ObjPos *pos, uint8 x, uint8 y);
-	bool isitdescribed(const ObjPos *objPos);
-	void checkifset();
-	bool checkifset(uint8 x, uint8 y);
-	void checkifpathison();
-	bool checkifpathison(uint8 index);
-	void isitworn();
-	bool isitworn(const DynObject *object);
-	void wornerror();
-	void makeworn();
-	void makeworn(DynObject *object);
-	void obtoinv();
-	void obtoinv(uint8 index, uint8 flag, uint16 x, uint16 y);
-	void showryanpage();
-	void findallryan();
-	void findallryan(uint8 *inv);
-	void fillryan();
-	void useroutine();
-	void hangon();
-	void hangon(uint16 frameCount);
-	void hangonw();
-	void hangonw(uint16 frameCount);
-	void hangonp();
-	void hangonp(uint16 count);
-	void showicon();
-	uint8 findnextcolon(uint8 **string);
-	void findnextcolon();
-	uint8 *getobtextstartCPP();
-	void usetext(const uint8 *string);
-	void usetext();
-	void getblockofpixel();
-	uint8 getblockofpixel(uint8 x, uint8 y);
+	bool pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y);
+	bool isItDescribed(const ObjPos *objPos);
+	void checkIfSet();
+	bool checkIfSet(uint8 x, uint8 y);
+	void checkIfPathIsOn();
+	bool checkIfPathIsOn(uint8 index);
+	void isItWorn();
+	bool isItWorn(const DynObject *object);
+	void wornError();
+	void makeWorn();
+	void makeWorn(DynObject *object);
+	void obToInv();
+	void obToInv(uint8 index, uint8 flag, uint16 x, uint16 y);
+	void showRyanPage();
+	void findAllRyan();
+	void findAllRyan(uint8 *inv);
+	void fillRyan();
+	void useRoutine();
+	void hangOn();
+	void hangOn(uint16 frameCount);
+	void hangOnW();
+	void hangOnW(uint16 frameCount);
+	void hangOnP();
+	void hangOnP(uint16 count);
+	void showIcon();
+	uint8 findNextColon(uint8 **string);
+	void findNextColon();
+	uint8 *getObTextStartCPP();
+	void useText(const uint8 *string);
+	void useText();
+	void getBlockOfPixel();
+	uint8 getBlockOfPixel(uint8 x, uint8 y);
 	void bresenhams();
-	void examineobtext();
-	void sortoutmap();
-	void showcity();
-	uint16 getpersframe(uint8 index);
-	void convicons();
-	void examineob(bool examineAgain = true);
-	void showwatch();
-	void dumpwatch();
-	void showtime();
-	void roomname();
-	void transfertext();
-	void initrain();
-	Rain *splitintolines(uint8 x, uint8 y, Rain *rain);
+	void examineObText();
+	void sortOutMap();
+	void showCity();
+	uint16 getPersFrame(uint8 index);
+	void convIcons();
+	void examineOb(bool examineAgain = true);
+	void showWatch();
+	void dumpWatch();
+	void showTime();
+	void roomName();
+	void transferText();
+	void initRain();
+	Rain *splitIntoLines(uint8 x, uint8 y, Rain *rain);
 	uint8 *mainPalette();
 	uint8 *startPalette();
 	uint8 *endPalette();
-	void clearstartpal();
-	void clearendpal();
-	void paltostartpal();
-	void endpaltostart();
-	void startpaltoend();
-	void paltoendpal();
-	void fadecalculation();
-	void watchcount();
-	void zoomicon();
-	void loadroom();
-	void getundermenu();
-	void putundermenu();
-	void textformonk();
-	void textforend();
-	void readsetdata();
-	void loadroomssample();
-	void fadeupyellows();
-	void fadeupmonfirst();
-	void printlogo();
-	void usemon();
-	void scrollmonitor();
-	void showcurrentfile();
+	void clearStartPal();
+	void clearEndPal();
+	void palToStartPal();
+	void endPalToStart();
+	void startPalToEnd();
+	void palToEndPal();
+	void fadeCalculation();
+	void watchCount();
+	void zoomIcon();
+	void loadRoom();
+	void getUnderMenu();
+	void putUnderMenu();
+	void textForMonk();
+	void textForEnd();
+	void readSetData();
+	void loadRoomsSample();
+	void fadeupYellows();
+	void fadeupMonFirst();
+	void printLogo();
+	void useMon();
+	void scrollMonitor();
+	void showCurrentFile();
 	void input();
-	void monprint();
-	const char *monprint(const char *string);
+	void monPrint();
+	const char *monPrint(const char *string);
 	Frame *tempGraphics();
 	Frame *tempGraphics2();
 	Frame *tempGraphics3();
-	void accesslighton();
-	void accesslightoff();
-	void randomaccess(uint16 count);
-	void randomaccess();
-	void monmessage(uint8 index);
-	void monmessage();
-	void neterror();
-	void turnonpower();
-	void powerlighton();
-	void powerlightoff();
-	void playchannel0();
-	void playchannel0(uint8 index, uint8 repeat);
-	void playchannel1();
-	void playchannel1(uint8 index);
-	void showmainops();
-	void showdiscops();
-	void createpanel();
-	void createpanel2();
-	void findroominloc();
-	void reelsonscreen();
+	void accessLightOn();
+	void accessLightOff();
+	void randomAccess(uint16 count);
+	void randomAccess();
+	void monMessage(uint8 index);
+	void monMessage();
+	void netError();
+	void turnOnPower();
+	void powerLightOn();
+	void powerLightOff();
+	void playChannel0();
+	void playChannel0(uint8 index, uint8 repeat);
+	void playChannel1();
+	void playChannel1(uint8 index);
+	void showMainOps();
+	void showDiscOps();
+	void createPanel();
+	void createPanel2();
+	void findRoomInLoc();
+	void reelsOnScreen();
 	void reconstruct();
 	void look();
-	void autolook();
-	void dolook();
-	void usetempcharset();
-	void usecharset1();
-	void getbackfromob();
-	void showfirstuse();
-	void showseconduse();
-	void actualsave();
-	void actualload();
-	void loadposition(unsigned int slot);
-	void saveposition(unsigned int slot, const uint8 *descbuf);
-	void openforsave(unsigned int slot);
-	void openforload(unsigned int slot);
+	void autoLook();
+	void doLook();
+	void useTempCharset();
+	void useCharset1();
+	void getBackFromOb();
+	void showFirstUse();
+	void showSecondUse();
+	void actualSave();
+	void actualLoad();
+	void loadPosition(unsigned int slot);
+	void savePosition(unsigned int slot, const uint8 *descbuf);
+	void openForSave(unsigned int slot);
+	void openForLoad(unsigned int slot);
 	uint16 allocateAndLoad(unsigned int size);
 	void clearAndLoad(uint16 seg, uint8 c, unsigned int size, unsigned int maxSize);
 	void loadRoomData(const Room* room, bool skipDat);
-	void restoreall();
-	void restorereels();
-	void viewfolder();
+	void restoreAll();
+	void restoreReels();
+	void viewFolder();
 	void checkFolderCoords();
-	void loadfolder();
-	void showfolder();
-	void showleftpage();
-	void showrightpage();
-	void nextfolder();
-	void lastfolder();
-	void folderhints();
-	void folderexit();
-	uint8 getlocation(uint8 index);
-	void getlocation();
-	void setlocation(uint8 index);
-	void setlocation();
+	void loadFolder();
+	void showFolder();
+	void showLeftPage();
+	void showRightPage();
+	void nextFolder();
+	void lastFolder();
+	void folderHints();
+	void folderExit();
+	uint8 getLocation(uint8 index);
+	void getLocation();
+	void setLocation(uint8 index);
+	void setLocation();
 	const uint8 *getTextInFile1(uint16 index);
-	void loadtemptext();
-	void loadtemptext(const char *fileName);
-	void loadtraveltext();
-	void drawfloor();
-	void allocatebuffers();
-	void worktoscreenm();
-	bool checkspeed(ReelRoutine *routine);
-	void checkspeed();
-	void sparkydrip(ReelRoutine &routine);
-	void othersmoker(ReelRoutine &routine);
+	void loadTempText();
+	void loadTempText(const char *fileName);
+	void loadTravelText();
+	void drawFloor();
+	void allocateBuffers();
+	void workToScreenM();
+	bool checkSpeed(ReelRoutine *routine);
+	void checkSpeed();
+	void sparkyDrip(ReelRoutine &routine);
+	void otherSmoker(ReelRoutine &routine);
 	void gamer(ReelRoutine &routine);
 	void eden(ReelRoutine &routine);
 	void sparky(ReelRoutine &routine);
diff --git a/engines/dreamweb/talk.cpp b/engines/dreamweb/talk.cpp
index 78b296afe6..55178cb150 100644
--- a/engines/dreamweb/talk.cpp
+++ b/engines/dreamweb/talk.cpp
@@ -24,16 +24,16 @@
 
 namespace DreamGen {
 
-uint16 DreamGenContext::getpersframe(uint8 index) {
+uint16 DreamGenContext::getPersFrame(uint8 index) {
 	return segRef(data.word(kPeople)).word(kPersonframes + index * 2);
 }
 
-void DreamGenContext::convicons() {
+void DreamGenContext::convIcons() {
 	uint8 index = data.byte(kCharacter) & 127;
-	data.word(kCurrentframe) = getpersframe(index);
-	Frame *frame = findsource();
+	data.word(kCurrentframe) = getPersFrame(index);
+	Frame *frame = findSource();
 	uint16 frameNumber = (data.word(kCurrentframe) - data.word(kTakeoff)) & 0xff;
-	showframe(frame, 234, 2, frameNumber, 0);
+	showFrame(frame, 234, 2, frameNumber, 0);
 }
 
 } /*namespace dreamgen */
diff --git a/engines/dreamweb/use.cpp b/engines/dreamweb/use.cpp
index b64797e0cd..fa11967ffc 100644
--- a/engines/dreamweb/use.cpp
+++ b/engines/dreamweb/use.cpp
@@ -35,90 +35,90 @@ struct UseListEntry {
 	const char *id;
 };
 
-void DreamGenContext::useroutine() {
+void DreamGenContext::useRoutine() {
 
 	static const UseListEntry kUseList[] = {
-		{ &DreamGenContext::usemon,            "NETW" },
-		{ &DreamGenContext::useelevator1,      "ELVA" },
-		{ &DreamGenContext::useelevator2,      "ELVB" },
-		{ &DreamGenContext::useelevator3,      "ELVC" },
-		{ &DreamGenContext::useelevator4,      "ELVE" },
-		{ &DreamGenContext::useelevator5,      "ELVF" },
-		{ &DreamGenContext::usechurchgate,     "CGAT" },
-		{ &DreamGenContext::usestereo,         "REMO" },
-		{ &DreamGenContext::usebuttona,        "BUTA" },
-		{ &DreamGenContext::usewinch,          "CBOX" },
-		{ &DreamGenContext::uselighter,        "LITE" },
-		{ &DreamGenContext::useplate,          "PLAT" },
-		{ &DreamGenContext::usecontrol,        "LIFT" },
-		{ &DreamGenContext::usewire,           "WIRE" },
-		{ &DreamGenContext::usehandle,         "HNDL" },
-		{ &DreamGenContext::usehatch,          "HACH" },
-		{ &DreamGenContext::useelvdoor,        "DOOR" },
-		{ &DreamGenContext::usecashcard,       "CSHR" },
-		{ &DreamGenContext::usegun,            "GUNA" },
-		{ &DreamGenContext::usecardreader1,    "CRAA" },
-		{ &DreamGenContext::usecardreader2,    "CRBB" },
-		{ &DreamGenContext::usecardreader3,    "CRCC" },
-		{ &DreamGenContext::sitdowninbar,      "SEAT" },
-		{ &DreamGenContext::usemenu,           "MENU" },
-		{ &DreamGenContext::usecooker,         "COOK" },
-		{ &DreamGenContext::callhotellift,     "ELCA" },
-		{ &DreamGenContext::calledenslift,     "EDCA" },
-		{ &DreamGenContext::calledensdlift,    "DDCA" },
-		{ &DreamGenContext::usealtar,          "ALTR" },
-		{ &DreamGenContext::openhoteldoor,     "LOKA" },
-		{ &DreamGenContext::openhoteldoor2,    "LOKB" },
-		{ &DreamGenContext::openlouis,         "ENTA" },
-		{ &DreamGenContext::openryan,          "ENTB" },
-		{ &DreamGenContext::openpoolboss,      "ENTE" },
-		{ &DreamGenContext::openyourneighbour, "ENTC" },
-		{ &DreamGenContext::openeden,          "ENTD" },
-		{ &DreamGenContext::opensarters,       "ENTH" },
-		{ &DreamGenContext::wearwatch,         "WWAT" },
-		{ &DreamGenContext::usepoolreader,     "POOL" },
-		{ &DreamGenContext::wearshades,        "WSHD" },
-		{ &DreamGenContext::grafittidoor,      "GRAF" },
-		{ &DreamGenContext::trapdoor,          "TRAP" },
-		{ &DreamGenContext::edenscdplayer,     "CDPE" },
-		{ &DreamGenContext::opentvdoor,        "DLOK" },
-		{ &DreamGenContext::usehole,           "HOLE" },
-		{ &DreamGenContext::usedryer,          "DRYR" },
-		{ &DreamGenContext::usechurchhole,     "HOLY" },
-		{ &DreamGenContext::usewall,           "WALL" },
-		{ &DreamGenContext::usediary,          "BOOK" },
-		{ &DreamGenContext::useaxe,            "AXED" },
-		{ &DreamGenContext::useshield,         "SHLD" },
-		{ &DreamGenContext::userailing,        "BCNY" },
-		{ &DreamGenContext::usecoveredbox,     "LIDC" },
-		{ &DreamGenContext::useclearbox,       "LIDU" },
-		{ &DreamGenContext::useopenbox,        "LIDO" },
-		{ &DreamGenContext::usepipe,           "PIPE" },
-		{ &DreamGenContext::usebalcony,        "BALC" },
-		{ &DreamGenContext::usewindow,         "WIND" },
-		{ &DreamGenContext::viewfolder,        "PAPR" },
-		{ &DreamGenContext::usetrainer,        "UWTA" },
-		{ &DreamGenContext::usetrainer,        "UWTB" },
-		{ &DreamGenContext::entersymbol,       "STAT" },
-		{ &DreamGenContext::opentomb,          "TLID" },
-		{ &DreamGenContext::useslab,           "SLAB" },
-		{ &DreamGenContext::usecart,           "CART" },
-		{ &DreamGenContext::usefullcart,       "FCAR" },
-		{ &DreamGenContext::slabdoora,         "SLBA" },
-		{ &DreamGenContext::slabdoorb,         "SLBB" },
-		{ &DreamGenContext::slabdoorc,         "SLBC" },
-		{ &DreamGenContext::slabdoord,         "SLBD" },
-		{ &DreamGenContext::slabdoore,         "SLBE" },
-		{ &DreamGenContext::slabdoorf,         "SLBF" },
-		{ &DreamGenContext::useplinth,         "PLIN" },
-		{ &DreamGenContext::useladder,         "LADD" },
-		{ &DreamGenContext::useladderb,        "LADB" },
+		{ &DreamGenContext::useMon,            "NETW" },
+		{ &DreamGenContext::useElevator1,      "ELVA" },
+		{ &DreamGenContext::useElevator2,      "ELVB" },
+		{ &DreamGenContext::useElevator3,      "ELVC" },
+		{ &DreamGenContext::useElevator4,      "ELVE" },
+		{ &DreamGenContext::useElevator5,      "ELVF" },
+		{ &DreamGenContext::useChurchGate,     "CGAT" },
+		{ &DreamGenContext::useStereo,         "REMO" },
+		{ &DreamGenContext::useButtonA,        "BUTA" },
+		{ &DreamGenContext::useWinch,          "CBOX" },
+		{ &DreamGenContext::useLighter,        "LITE" },
+		{ &DreamGenContext::usePlate,          "PLAT" },
+		{ &DreamGenContext::useControl,        "LIFT" },
+		{ &DreamGenContext::useWire,           "WIRE" },
+		{ &DreamGenContext::useHandle,         "HNDL" },
+		{ &DreamGenContext::useHatch,          "HACH" },
+		{ &DreamGenContext::useElvDoor,        "DOOR" },
+		{ &DreamGenContext::useCashCard,       "CSHR" },
+		{ &DreamGenContext::useGun,            "GUNA" },
+		{ &DreamGenContext::useCardReader1,    "CRAA" },
+		{ &DreamGenContext::useCardReader2,    "CRBB" },
+		{ &DreamGenContext::useCardReader3,    "CRCC" },
+		{ &DreamGenContext::sitDownInBar,      "SEAT" },
+		{ &DreamGenContext::useMenu,           "MENU" },
+		{ &DreamGenContext::useCooker,         "COOK" },
+		{ &DreamGenContext::callHotelLift,     "ELCA" },
+		{ &DreamGenContext::callEdensLift,     "EDCA" },
+		{ &DreamGenContext::callEdensDLift,    "DDCA" },
+		{ &DreamGenContext::useAltar,          "ALTR" },
+		{ &DreamGenContext::openHotelDoor,     "LOKA" },
+		{ &DreamGenContext::openHotelDoor2,    "LOKB" },
+		{ &DreamGenContext::openLouis,         "ENTA" },
+		{ &DreamGenContext::openRyan,          "ENTB" },
+		{ &DreamGenContext::openPoolBoss,      "ENTE" },
+		{ &DreamGenContext::openYourNeighbour, "ENTC" },
+		{ &DreamGenContext::openEden,          "ENTD" },
+		{ &DreamGenContext::openSarters,       "ENTH" },
+		{ &DreamGenContext::wearWatch,         "WWAT" },
+		{ &DreamGenContext::usePoolReader,     "POOL" },
+		{ &DreamGenContext::wearShades,        "WSHD" },
+		{ &DreamGenContext::grafittiDoor,      "GRAF" },
+		{ &DreamGenContext::trapDoor,          "TRAP" },
+		{ &DreamGenContext::edensCDPlayer,     "CDPE" },
+		{ &DreamGenContext::openTVDoor,        "DLOK" },
+		{ &DreamGenContext::useHole,           "HOLE" },
+		{ &DreamGenContext::useDryer,          "DRYR" },
+		{ &DreamGenContext::useChurchHole,     "HOLY" },
+		{ &DreamGenContext::useWall,           "WALL" },
+		{ &DreamGenContext::useDiary,          "BOOK" },
+		{ &DreamGenContext::useAxe,            "AXED" },
+		{ &DreamGenContext::useShield,         "SHLD" },
+		{ &DreamGenContext::useRailing,        "BCNY" },
+		{ &DreamGenContext::useCoveredBox,     "LIDC" },
+		{ &DreamGenContext::useClearBox,       "LIDU" },
+		{ &DreamGenContext::useOpenBox,        "LIDO" },
+		{ &DreamGenContext::usePipe,           "PIPE" },
+		{ &DreamGenContext::useBalcony,        "BALC" },
+		{ &DreamGenContext::useWindow,         "WIND" },
+		{ &DreamGenContext::viewFolder,        "PAPR" },
+		{ &DreamGenContext::useTrainer,        "UWTA" },
+		{ &DreamGenContext::useTrainer,        "UWTB" },
+		{ &DreamGenContext::enterSymbol,       "STAT" },
+		{ &DreamGenContext::openTomb,          "TLID" },
+		{ &DreamGenContext::useSLab,           "SLAB" },
+		{ &DreamGenContext::useCart,           "CART" },
+		{ &DreamGenContext::useFullCart,       "FCAR" },
+		{ &DreamGenContext::sLabDoorA,         "SLBA" },
+		{ &DreamGenContext::sLabDoorB,         "SLBB" },
+		{ &DreamGenContext::sLabDoorC,         "SLBC" },
+		{ &DreamGenContext::sLabDoorD,         "SLBD" },
+		{ &DreamGenContext::sLabDoorE,         "SLBE" },
+		{ &DreamGenContext::sLabDoorF,         "SLBF" },
+		{ &DreamGenContext::usePlinth,         "PLIN" },
+		{ &DreamGenContext::useLadder,         "LADD" },
+		{ &DreamGenContext::useLadderB,        "LADB" },
 		{ &DreamGenContext::chewy,             "GUMA" },
-		{ &DreamGenContext::wheelsound,        "SQEE" },
-		{ &DreamGenContext::runtap,            "TAPP" },
-		{ &DreamGenContext::playguitar,        "GUIT" },
-		{ &DreamGenContext::hotelcontrol,      "CONT" },
-		{ &DreamGenContext::hotelbell,         "BELL" },
+		{ &DreamGenContext::wheelSound,        "SQEE" },
+		{ &DreamGenContext::runTap,            "TAPP" },
+		{ &DreamGenContext::playGuitar,        "GUIT" },
+		{ &DreamGenContext::hotelControl,      "CONT" },
+		{ &DreamGenContext::hotelBell,         "BELL" },
 	};
 
 	if (data.byte(kReallocation) >= 50) {
@@ -127,7 +127,7 @@ void DreamGenContext::useroutine() {
 		data.byte(kPointerpower) = 0;
 	}
 
-	getanyad();
+	getAnyAd();
 	const uint8 *id = es.ptr(bx + 12, 4);
 
 	for (size_t i = 0; i < sizeof(kUseList)/sizeof(UseListEntry); ++i) {
@@ -138,89 +138,89 @@ void DreamGenContext::useroutine() {
 		}
 	}
 
-	delpointer();
-	uint8 *obText = getobtextstartCPP();
-	if (findnextcolon(&obText) != 0) {
-		if (findnextcolon(&obText) != 0) {
+	delPointer();
+	uint8 *obText = getObTextStartCPP();
+	if (findNextColon(&obText) != 0) {
+		if (findNextColon(&obText) != 0) {
 			if (*obText != 0) {
-				usetext(obText);
-				hangonp(400);
-				putbackobstuff();
+				useText(obText);
+				hangOnP(400);
+				putBackObStuff();
 				return;
 			}
 		}
 	}
 
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	obicons();
-	printmessage(33, 100, 63, 241, true);
-	worktoscreenm();
-	hangonp(50);
-	putbackobstuff();
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	obIcons();
+	printMessage(33, 100, 63, 241, true);
+	workToScreenM();
+	hangOnP(50);
+	putBackObStuff();
 	data.byte(kCommandtype) = 255;
 }
 
-void DreamGenContext::usetext() {
-	usetext(es.ptr(si, 0));
+void DreamGenContext::useText() {
+	useText(es.ptr(si, 0));
 }
 
-void DreamGenContext::usetext(const uint8 *string) {
-	createpanel();
-	showpanel();
-	showman();
-	showexit();
-	obicons();
-	printdirect(string, 36, 104, 241, true);
-	worktoscreenm();
+void DreamGenContext::useText(const uint8 *string) {
+	createPanel();
+	showPanel();
+	showMan();
+	showExit();
+	obIcons();
+	printDirect(string, 36, 104, 241, true);
+	workToScreenM();
 }
 
-void DreamGenContext::showfirstuse() {
-	uint8 *obText = getobtextstartCPP();
-	findnextcolon(&obText);
-	findnextcolon(&obText);
-	usetext(obText);
-	hangonp(400);
+void DreamGenContext::showFirstUse() {
+	uint8 *obText = getObTextStartCPP();
+	findNextColon(&obText);
+	findNextColon(&obText);
+	useText(obText);
+	hangOnP(400);
 }
 
-void DreamGenContext::showseconduse() {
-	uint8 *obText = getobtextstartCPP();
-	findnextcolon(&obText);
-	findnextcolon(&obText);
-	findnextcolon(&obText);
-	usetext(obText);
-	hangonp(400);
+void DreamGenContext::showSecondUse() {
+	uint8 *obText = getObTextStartCPP();
+	findNextColon(&obText);
+	findNextColon(&obText);
+	findNextColon(&obText);
+	useText(obText);
+	hangOnP(400);
 }
 
-void DreamGenContext::viewfolder() {
+void DreamGenContext::viewFolder() {
 	data.byte(kManisoffscreen) = 1;
-	getridofall();
-	loadfolder();
+	getRidOfAll();
+	loadFolder();
 	data.byte(kFolderpage) = 0;
-	showfolder();
-	worktoscreenm();
+	showFolder();
+	workToScreenM();
 	data.byte(kGetback) = 0;
 	do {
 		if (quitRequested())
 			break;
-		delpointer();
-		readmouse();
-		showpointer();
-		vsync();
-		dumppointer();
-		dumptextline();
+		delPointer();
+		readMouse();
+		showPointer();
+		vSync();
+		dumpPointer();
+		dumpTextLine();
 		checkFolderCoords();
 	} while (data.byte(kGetback) == 0);
 	data.byte(kManisoffscreen) = 0;
-	getridoftemp();
-	getridoftemp2();
-	getridoftemp3();
-	getridoftempcharset();
-	restoreall();
-	redrawmainscrn();
-	worktoscreenm();
+	getRidOfTemp();
+	getRidOfTemp2();
+	getRidOfTemp3();
+	getRidOfTempCharset();
+	restoreAll();
+	redrawMainScrn();
+	workToScreenM();
 }
 
 } /*namespace dreamgen */
diff --git a/engines/dreamweb/vgafades.cpp b/engines/dreamweb/vgafades.cpp
index c4c473f040..f0ed36620d 100644
--- a/engines/dreamweb/vgafades.cpp
+++ b/engines/dreamweb/vgafades.cpp
@@ -36,31 +36,31 @@ uint8 *DreamGenContext::endPalette() {
 	return segRef(data.word(kBuffers)).ptr(kEndpal, 256*3);
 }
 
-void DreamGenContext::clearstartpal() {
+void DreamGenContext::clearStartPal() {
 	memset(startPalette(), 0, 256*3);
 }
 
-void DreamGenContext::clearendpal() {
+void DreamGenContext::clearEndPal() {
 	memset(endPalette(), 0, 256*3);
 }
 
-void DreamGenContext::paltostartpal() {
+void DreamGenContext::palToStartPal() {
 	memcpy(startPalette(), mainPalette(), 256*3);
 }
 
-void DreamGenContext::endpaltostart() {
+void DreamGenContext::endPalToStart() {
 	memcpy(startPalette(), endPalette(), 256*3);
 }
 
-void DreamGenContext::startpaltoend() {
+void DreamGenContext::startPalToEnd() {
 	memcpy(endPalette(), startPalette(), 256*3);
 }
 
-void DreamGenContext::paltoendpal() {
+void DreamGenContext::palToEndPal() {
 	memcpy(endPalette(), mainPalette(), 256*3);
 }
 
-void DreamGenContext::fadecalculation() {
+void DreamGenContext::fadeCalculation() {
 	if (data.byte(kFadecount) == 0) {
 		data.byte(kFadedirection) = 0;
 		return;
@@ -83,29 +83,29 @@ void DreamGenContext::fadecalculation() {
 	--data.byte(kFadecount);
 }
 
-void DreamGenContext::fadeupyellows() {
-	paltoendpal();
+void DreamGenContext::fadeupYellows() {
+	palToEndPal();
 	memset(endPalette() + 231*3, 0, 8*3);
 	memset(endPalette() + 246*3, 0, 1*3);
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
-	hangon(128);
+	hangOn(128);
 }
 
-void DreamGenContext::fadeupmonfirst() {
-	paltostartpal();
-	paltoendpal();
+void DreamGenContext::fadeupMonFirst() {
+	palToStartPal();
+	palToEndPal();
 	memset(startPalette() + 231*3, 0, 8*3);
 	memset(startPalette() + 246*3, 0, 1*3);
 	data.byte(kFadedirection) = 1;
 	data.byte(kFadecount) = 63;
 	data.byte(kColourpos) = 0;
 	data.byte(kNumtofade) = 128;
-	hangon(64);
-	playchannel1(26);
-	hangon(64);
+	hangOn(64);
+	playChannel1(26);
+	hangOn(64);
 }
 
 } /*namespace dreamgen */
diff --git a/engines/dreamweb/vgagrafx.cpp b/engines/dreamweb/vgagrafx.cpp
index 658f45ed04..aee8417f70 100644
--- a/engines/dreamweb/vgagrafx.cpp
+++ b/engines/dreamweb/vgagrafx.cpp
@@ -31,18 +31,18 @@ uint8 *DreamGenContext::workspace() {
 	return result;
 }
 
-void DreamGenContext::allocatework() {
-	data.word(kWorkspace) = allocatemem(0x1000);
+void DreamGenContext::allocateWork() {
+	data.word(kWorkspace) = allocateMem(0x1000);
 }
 
-void DreamGenContext::multiget() {
-	multiget(ds.ptr(si, 0), di, bx, cl, ch);
+void DreamGenContext::multiGet() {
+	multiGet(ds.ptr(si, 0), di, bx, cl, ch);
 	si += cl * ch;
 	di += bx * kScreenwidth + kScreenwidth * ch;
 	cx = 0;
 }
 
-void DreamGenContext::multiget(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
+void DreamGenContext::multiGet(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
 	const uint8 *src = workspace() + x + y * kScreenwidth;
@@ -50,7 +50,7 @@ void DreamGenContext::multiget(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h)
 		h = 200 - y;
 	if (x + w > 320)
 		w = 320 - x;
-	//debug(1, "multiget %u,%u %ux%u -> segment: %04x->%04x", x, y, w, h, (uint16)ds, (uint16)es);
+	//debug(1, "multiGet %u,%u %ux%u -> segment: %04x->%04x", x, y, w, h, (uint16)ds, (uint16)es);
 	for(unsigned l = 0; l < h; ++l) {
 		const uint8 *src_p = src + kScreenwidth * l;
 		uint8 *dst_p = dst + w * l;
@@ -58,14 +58,14 @@ void DreamGenContext::multiget(uint8 *dst, uint16 x, uint16 y, uint8 w, uint8 h)
 	}
 }
 
-void DreamGenContext::multiput() {
-	multiput(ds.ptr(si, 0), di, bx, cl, ch);
+void DreamGenContext::multiPut() {
+	multiPut(ds.ptr(si, 0), di, bx, cl, ch);
 	si += cl * ch;
 	di += bx * kScreenwidth + kScreenwidth * ch;
 	cx = 0;
 }
 
-void DreamGenContext::multiput(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h) {
+void DreamGenContext::multiPut(const uint8 *src, uint16 x, uint16 y, uint8 w, uint8 h) {
 	assert(x < 320);
 	assert(y < 200);
 	uint8 *dst = workspace() + x + y * kScreenwidth;
@@ -73,7 +73,7 @@ void DreamGenContext::multiput(const uint8 *src, uint16 x, uint16 y, uint8 w, ui
 		h = 200 - y;
 	if (x + w > 320)
 		w = 320 - x;
-	//debug(1, "multiput %ux%u -> segment: %04x->%04x", w, h, (uint16)ds, (uint16)es);
+	//debug(1, "multiPut %ux%u -> segment: %04x->%04x", w, h, (uint16)ds, (uint16)es);
 	for(unsigned l = 0; l < h; ++l) {
 		const uint8 *src_p = src + w * l;
 		uint8 *dst_p = dst + kScreenwidth * l;
@@ -81,14 +81,14 @@ void DreamGenContext::multiput(const uint8 *src, uint16 x, uint16 y, uint8 w, ui
 	}
 }
 
-void DreamGenContext::multidump(uint16 x, uint16 y, uint8 width, uint8 height) {
+void DreamGenContext::multiDump(uint16 x, uint16 y, uint8 width, uint8 height) {
 	unsigned offset = x + y * kScreenwidth;
-	//debug(1, "multidump %ux%u(segment: %04x) -> %d,%d(address: %d)", w, h, (uint16)ds, x, y, offset);
+	//debug(1, "multiDump %ux%u(segment: %04x) -> %d,%d(address: %d)", w, h, (uint16)ds, x, y, offset);
 	engine->blit(workspace() + offset, kScreenwidth, x, y, width, height);
 }
 
-void DreamGenContext::multidump() {
-	multidump(di, bx, cl, ch);
+void DreamGenContext::multiDump() {
+	multiDump(di, bx, cl, ch);
 	unsigned offset = di + bx * kScreenwidth;
 	si = di = offset + ch * kScreenwidth;
 	cx = 0;
@@ -98,14 +98,14 @@ void DreamGenContext::workToScreenCPP() {
 	engine->blit(workspace(), 320, 0, 0, 320, 200);
 }
 
-void DreamGenContext::worktoscreen() {
+void DreamGenContext::workToScreen() {
 	workToScreenCPP();
 	uint size = 320 * 200;
 	di = si = size;
 	cx = 0;
 }
 
-void DreamGenContext::printundermon() {
+void DreamGenContext::printUnderMon() {
 	engine->printUnderMonitor();
 }
 
@@ -113,7 +113,7 @@ void DreamGenContext::cls() {
 	engine->cls();
 }
 
-void DreamGenContext::frameoutnm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
+void DreamGenContext::frameOutNm(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
 	dst += pitch * y + x;
 
 	for (uint16 j = 0; j < height; ++j) {
@@ -123,7 +123,7 @@ void DreamGenContext::frameoutnm(uint8 *dst, const uint8 *src, uint16 pitch, uin
 	}
 }
 
-void DreamGenContext::frameoutbh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
+void DreamGenContext::frameOutBh(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
 	uint16 stride = pitch - width;
 	dst += y * pitch + x;
 
@@ -139,7 +139,7 @@ void DreamGenContext::frameoutbh(uint8 *dst, const uint8 *src, uint16 pitch, uin
 	}
 }
 
-void DreamGenContext::frameoutfx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
+void DreamGenContext::frameOutFx(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, uint16 x, uint16 y) {
 	uint16 stride = pitch - width;
 	dst += y * pitch + x;
 	dst -= width;
@@ -156,7 +156,7 @@ void DreamGenContext::frameoutfx(uint8 *dst, const uint8 *src, uint16 pitch, uin
 	}
 }
 
-void DreamGenContext::doshake() {
+void DreamGenContext::doShake() {
 	uint8 &counter = data.byte(kShakecounter);
 	if (counter == 48)
 		return;
@@ -185,7 +185,7 @@ void DreamGenContext::doshake() {
 	engine->setShakePos(offset >= 0 ? offset : -offset);
 }
 
-void DreamGenContext::vsync() {
+void DreamGenContext::vSync() {
 	push(ax);
 	push(bx);
 	push(cx);
@@ -205,8 +205,8 @@ void DreamGenContext::vsync() {
 	ax = pop();
 }
 
-void DreamGenContext::setmode() {
-	vsync();
+void DreamGenContext::setMode() {
+	vSync();
 	initGraphics(320, 200, false);
 }
 
@@ -219,7 +219,7 @@ static Common::String getFilename(Context &context) {
 	return name;
 }
 
-void DreamGenContext::showpcx() {
+void DreamGenContext::showPCX() {
 	Common::String name = getFilename(*this);
 	Common::File pcxFile;
 
@@ -228,7 +228,7 @@ void DreamGenContext::showpcx() {
 		return;
 	}
 
-	uint8 *maingamepal;
+	uint8 *mainGamePal;
 	int i, j;
 
 	// Read the 16-color palette into the 'maingamepal' buffer. Note that
@@ -236,12 +236,12 @@ void DreamGenContext::showpcx() {
 
 	pcxFile.seek(16, SEEK_SET);
 	es = data.word(kBuffers);
-	maingamepal = es.ptr(kMaingamepal, 768);
-	pcxFile.read(maingamepal, 48);
+	mainGamePal = es.ptr(kMaingamepal, 768);
+	pcxFile.read(mainGamePal, 48);
 
-	memset(maingamepal + 48, 0xff, 720);
+	memset(mainGamePal + 48, 0xff, 720);
 	for (i = 0; i < 48; i++) {
-		maingamepal[i] >>= 2;
+		mainGamePal[i] >>= 2;
 	}
 
 	// Decode the image data.
@@ -289,7 +289,7 @@ void DreamGenContext::showpcx() {
 	pcxFile.close();
 }
 
-void DreamGenContext::frameoutv(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y) {
+void DreamGenContext::frameOutV(uint8 *dst, const uint8 *src, uint16 pitch, uint16 width, uint16 height, int16 x, int16 y) {
 	// NB : These resilience checks were not in the original engine, but did they result in undefined behaviour
 	// or was something broken during porting to C++?
 	assert(pitch == 320);
@@ -331,12 +331,12 @@ void DreamGenContext::frameoutv(uint8 *dst, const uint8 *src, uint16 pitch, uint
 	}
 }
 
-void DreamGenContext::showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
+void DreamGenContext::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag) {
 	uint8 width, height;
-	showframe(frameData, x, y, frameNumber, effectsFlag, &width, &height);
+	showFrame(frameData, x, y, frameNumber, effectsFlag, &width, &height);
 }
 
-void DreamGenContext::showframe(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
+void DreamGenContext::showFrame(const Frame *frameData, uint16 x, uint16 y, uint16 frameNumber, uint8 effectsFlag, uint8 *width, uint8 *height) {
 	const Frame *frame = frameData + frameNumber;
 	if ((frame->width == 0) && (frame->height == 0)) {
 		*width = 0;
@@ -344,12 +344,12 @@ void DreamGenContext::showframe(const Frame *frameData, uint16 x, uint16 y, uint
 		return;
 	}
 
-//notblankshow:
+//notBlankShow:
 	if ((effectsFlag & 128) == 0) {
 		x += frame->x;
 		y += frame->y;
 	}
-//skipoffsets:
+//skipOffsets:
 
 	*width = frame->width;
 	*height = frame->height;
@@ -360,45 +360,45 @@ void DreamGenContext::showframe(const Frame *frameData, uint16 x, uint16 y, uint
 			x -= *width / 2;
 			y -= *height / 2;
 		}
-		if (effectsFlag & 64) { //diffdest
-			frameoutfx(es.ptr(0, dx * *height), pSrc, dx, *width, *height, x, y);
+		if (effectsFlag & 64) { //diffDest
+			frameOutFx(es.ptr(0, dx * *height), pSrc, dx, *width, *height, x, y);
 			return;
 		}
-		if (effectsFlag & 8) { //printlist
+		if (effectsFlag & 8) { //printList
 			/*
 			push(ax);
 			al = x - data.word(kMapadx);
 			ah = y - data.word(kMapady);
-			//addtoprintlist(); // NB: Commented in the original asm
+			//addToPrintList(); // NB: Commented in the original asm
 			ax = pop();
 			*/
 		}
-		if (effectsFlag & 4) { //flippedx
-			frameoutfx(workspace(), pSrc, 320, *width, *height, x, y);
+		if (effectsFlag & 4) { //flippedX
+			frameOutFx(workspace(), pSrc, 320, *width, *height, x, y);
 			return;
 		}
-		if (effectsFlag & 2) { //nomask
-			frameoutnm(workspace(), pSrc, 320, *width, *height, x, y);
+		if (effectsFlag & 2) { //noMask
+			frameOutNm(workspace(), pSrc, 320, *width, *height, x, y);
 			return;
 		}
 		if (effectsFlag & 32) {
-			frameoutbh(workspace(), pSrc, 320, *width, *height, x, y);
+			frameOutBh(workspace(), pSrc, 320, *width, *height, x, y);
 			return;
 		}
 	}
-//noeffects:
-	frameoutv(workspace(), pSrc, 320, *width, *height, x, y);
+//noEffects:
+	frameOutV(workspace(), pSrc, 320, *width, *height, x, y);
 	return;
 }
 
-void DreamGenContext::showframe() {
+void DreamGenContext::showFrame() {
 	uint8 width, height;
-	showframe((Frame *)ds.ptr(0, 0), di, bx, ax & 0x1ff, ah & 0xfe, &width, &height);
+	showFrame((Frame *)ds.ptr(0, 0), di, bx, ax & 0x1ff, ah & 0xfe, &width, &height);
 	cl = width;
 	ch = height;
 }
 
-void DreamGenContext::clearwork() {
+void DreamGenContext::clearWork() {
 	memset(workspace(), 0, 320*200);
 }
 
@@ -408,7 +408,7 @@ void DreamGenContext::zoom() {
 	if (data.byte(kZoomon) != 1)
 		return;
 	if (data.byte(kCommandtype) >= 199) {
-		putunderzoom();
+		putUnderZoom();
 		return;
 	}
 	uint16 srcOffset = (data.word(kOldpointery) - 9) * 320 + (data.word(kOldpointerx) - 11);
@@ -430,19 +430,19 @@ void DreamGenContext::zoom() {
 	data.byte(kDidzoom) = 1;
 }
 
-void DreamGenContext::paneltomap() {
-	multiget(segRef(data.word(kMapstore)).ptr(0, 0), data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+void DreamGenContext::panelToMap() {
+	multiGet(segRef(data.word(kMapstore)).ptr(0, 0), data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
 }
 
-void DreamGenContext::maptopanel() {
-	multiput(segRef(data.word(kMapstore)).ptr(0, 0), data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+void DreamGenContext::mapToPanel() {
+	multiPut(segRef(data.word(kMapstore)).ptr(0, 0), data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
 }
 
-void DreamGenContext::dumpmap() {
-	multidump(data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
+void DreamGenContext::dumpMap() {
+	multiDump(data.word(kMapxstart) + data.word(kMapadx), data.word(kMapystart) + data.word(kMapady), data.byte(kMapxsize), data.byte(kMapysize));
 }
 
-void DreamGenContext::transferinv() {
+void DreamGenContext::transferInv() {
 	const Frame *freeFrames = (const Frame *)segRef(data.word(kFreeframes)).ptr(kFrframedata, 0);
 	const Frame *freeFrame = freeFrames + (3 * data.byte(kItemtotran) + 1);
 	Frame *exFrames = (Frame *)segRef(data.word(kExtras)).ptr(kExframedata, 0);
@@ -459,23 +459,23 @@ void DreamGenContext::transferinv() {
 	data.word(kExframepos) += byteCount;
 }
 
-bool DreamGenContext::pixelcheckset(const ObjPos *pos, uint8 x, uint8 y) {
+bool DreamGenContext::pixelCheckSet(const ObjPos *pos, uint8 x, uint8 y) {
 	x -= pos->xMin;
 	y -= pos->yMin;
-	SetObject *setObject = getsetad(pos->index);
+	SetObject *setObject = getSetAd(pos->index);
 	Frame *frame = (Frame *)segRef(data.word(kSetframes)).ptr(kFramedata, 0) + setObject->index;
 	const uint8 *ptr = segRef(data.word(kSetframes)).ptr(kFrames, 0) + frame->ptr() + y * frame->width + x;
 	return *ptr != 0;
 }
 
-void DreamGenContext::loadpalfromiff() {
+void DreamGenContext::loadPalFromIFF() {
 	dx = kPalettescreen;
-	openfile();
+	openFile();
 	cx = 2000;
 	ds = data.word(kMapstore);
 	dx = 0;
-	readfromfile();
-	closefile();
+	readFromFile();
+	closeFile();
 
 	const uint8 *src = segRef(data.word(kMapstore)).ptr(0x30, 0);
 	uint8 *dst = mainPalette();
@@ -492,19 +492,19 @@ void DreamGenContext::loadpalfromiff() {
 	}
 }
 
-void DreamGenContext::createpanel() {
+void DreamGenContext::createPanel() {
 	Frame *icons = (Frame *)segRef(data.word(kIcons2)).ptr(0, 0);
-	showframe(icons, 0, 8, 0, 2);
-	showframe(icons, 160, 8, 0, 2);
-	showframe(icons, 0, 104, 0, 2);
-	showframe(icons, 160, 104, 0, 2);
+	showFrame(icons, 0, 8, 0, 2);
+	showFrame(icons, 160, 8, 0, 2);
+	showFrame(icons, 0, 104, 0, 2);
+	showFrame(icons, 160, 104, 0, 2);
 }
 
-void DreamGenContext::createpanel2() {
-	createpanel();
+void DreamGenContext::createPanel2() {
+	createPanel();
 	Frame *icons = (Frame *)segRef(data.word(kIcons2)).ptr(0, 0);
-	showframe(icons, 0, 0, 5, 2);
-	showframe(icons, 160, 0, 5, 2);
+	showFrame(icons, 0, 0, 5, 2);
+	showFrame(icons, 160, 0, 5, 2);
 }
 
 } /*namespace dreamgen */
author	Bertrand Augereau	2011-12-01 12:35:14 -0800
committer	Bertrand Augereau	2011-12-01 12:35:14 -0800
commit	ec8d8207202d74ebb78ec52720bf8ae70ae2afd4 (patch)
tree	9e8b535ba79d699c408631419dd80965e6eb40c9
parent	24c355e04fe7fb536bbfd72bdb998b4dbf265148 (diff)
parent	349cbc527f33858b6275daaa8f770cd6f7fcd42d (diff)
download	scummvm-rg350-ec8d8207202d74ebb78ec52720bf8ae70ae2afd4.tar.gz scummvm-rg350-ec8d8207202d74ebb78ec52720bf8ae70ae2afd4.tar.bz2 scummvm-rg350-ec8d8207202d74ebb78ec52720bf8ae70ae2afd4.zip