Rename remaining OSystem methods to match our coding guidelines

svn-id: r15332

27 files changed, 340 insertions, 340 deletions

diff --git a/backends/PalmOS/Src/cd_default.cpp b/backends/PalmOS/Src/cd_default.cpp
index f630850de3..9185a0b880 100644
--- a/backends/PalmOS/Src/cd_default.cpp
+++ b/backends/PalmOS/Src/cd_default.cpp
@@ -38,13 +38,13 @@ void DefaultCDPlayer::release() {
 }
 
 bool DefaultCDPlayer::poll() {
-	return (_defLoops != 0 && _sys->get_msecs() < _defTrackEndFrame);
+	return (_defLoops != 0 && _sys->getMillis() < _defTrackEndFrame);
 }
 
 void DefaultCDPlayer::update() {
 
-	// stop replay upon request of stop_cdrom()
-	if (_defStopTime != 0 && _sys->get_msecs() >= _defStopTime) {
+	// stop replay upon request of stopCD()
+	if (_defStopTime != 0 && _sys->getMillis() >= _defStopTime) {
 		_defLoops = 0;
 		_defStopTime = 0;
 		_defTrackEndFrame = 0;
@@ -52,7 +52,7 @@ void DefaultCDPlayer::update() {
 	}
 
 	// not fully played
-	if (_sys->get_msecs() < _defTrackEndFrame)
+	if (_sys->getMillis() < _defTrackEndFrame)
 		return;
 		
 	if (_defLoops == 0)
@@ -64,12 +64,12 @@ void DefaultCDPlayer::update() {
 
 	// loop if needed
 	if (_defLoops != 0) {
-		_defTrackEndFrame = _sys->get_msecs() + _defTrackLength;
+		_defTrackEndFrame = _sys->getMillis() + _defTrackLength;
 	}
 }
 
 void DefaultCDPlayer::stop() {	/* Stop CD Audio in 1/10th of a second */
-	_defStopTime = _sys->get_msecs() + 100;
+	_defStopTime = _sys->getMillis() + 100;
 	_defLoops = 0;
 	return;
 }
@@ -98,5 +98,5 @@ void DefaultCDPlayer::play(int track, int num_loops, int start_frame, int durati
 	}
 				
 	// try to play the track
-	_defTrackEndFrame = _sys->get_msecs() + _defTrackLength;
+	_defTrackEndFrame = _sys->getMillis() + _defTrackLength;
 }
diff --git a/backends/PalmOS/Src/cd_msa.cpp b/backends/PalmOS/Src/cd_msa.cpp
index 8879ce8cf1..478d5f9e21 100644
--- a/backends/PalmOS/Src/cd_msa.cpp
+++ b/backends/PalmOS/Src/cd_msa.cpp
@@ -127,8 +127,8 @@ void MsaCDPlayer::update() {
 	MsaPBStatus pb;
 	MsaGetPBStatus(_msaRefNum, &pb);
 
-	// stop replay upon request of stop_cdrom()
-	if (_msaStopTime != 0 && _sys->get_msecs() >= _msaStopTime) {
+	// stop replay upon request of stopCD()
+	if (_msaStopTime != 0 && _sys->getMillis() >= _msaStopTime) {
 		MsaStop(_msaRefNum, true);
 		_msaLoops = 0;
 		_msaStopTime = 0;
@@ -174,7 +174,7 @@ void MsaCDPlayer::stop() {	/* Stop CD Audio in 1/10th of a second */
 	if (!_isInitialized)
 		return;
 
-	_msaStopTime = _sys->get_msecs() + 100;
+	_msaStopTime = _sys->getMillis() + 100;
 	_msaLoops = 0;
 	return;
 }
diff --git a/backends/PalmOS/Src/cd_pockettunes.cpp b/backends/PalmOS/Src/cd_pockettunes.cpp
index eca7624622..5993312b12 100644
--- a/backends/PalmOS/Src/cd_pockettunes.cpp
+++ b/backends/PalmOS/Src/cd_pockettunes.cpp
@@ -136,8 +136,8 @@ bool PckTunesCDPlayer::poll() {
 
 void PckTunesCDPlayer::update() {
 
-	// stop replay upon request of stop_cdrom()
-	if (_pckStopTime != 0 && _sys->get_msecs() >= _pckStopTime) {
+	// stop replay upon request of stopCD()
+	if (_pckStopTime != 0 && _sys->getMillis() >= _pckStopTime) {
 		PocketTunesStop();
 		_pckLoops = 0;
 		_pckStopTime = 0;
@@ -146,7 +146,7 @@ void PckTunesCDPlayer::update() {
 	}
 
 	// not fully played
-//	if (_sys->get_msecs() < _pckTrackEndFrame)
+//	if (_sys->getMillis() < _pckTrackEndFrame)
 //		return;
 	if (getPosition(_pckTrackEndFrame) < _pckTrackEndFrame)
 		return;
@@ -174,7 +174,7 @@ void PckTunesCDPlayer::update() {
 }
 
 void PckTunesCDPlayer::stop() {	/* Stop CD Audio in 1/10th of a second */
-	_pckStopTime = _sys->get_msecs() + 100;
+	_pckStopTime = _sys->getMillis() + 100;
 	_pckLoops = 0;
 	return;
 }
diff --git a/backends/PalmOS/Src/palm.cpp b/backends/PalmOS/Src/palm.cpp
index 704d887d9d..5c3209a745 100644
--- a/backends/PalmOS/Src/palm.cpp
+++ b/backends/PalmOS/Src/palm.cpp
@@ -42,21 +42,21 @@ OSystem *OSystem_PALMOS::create() {
 	return new OSystem_PALMOS();
 }
 
-uint32 OSystem_PALMOS::get_msecs() {
+uint32 OSystem_PALMOS::getMillis() {
 	uint32 ticks = TimGetTicks();
 	ticks *= (1000/SysTicksPerSecond());
 	return ticks;
 
 }
 
-void OSystem_PALMOS::delay_msecs(uint msecs) {
-	UInt32 current = get_msecs();
+void OSystem_PALMOS::delayMillis(uint msecs) {
+	UInt32 current = getMillis();
 	UInt32 last = current + msecs;
 
 	do {
 		timer_handler(current);
 		sound_handler();
-		current = get_msecs();
+		current = getMillis();
 	} while (current < last);
 }
 
@@ -100,7 +100,7 @@ void OSystem_PALMOS::timer_handler(UInt32 current_msecs) {
 void OSystem_PALMOS::setTimerCallback(TimerProc callback, int timer) {
 	if (callback != NULL) {
 		_timer.duration = timer;
-		_timer.nextExpiry = get_msecs() + timer;
+		_timer.nextExpiry = getMillis() + timer;
 		_timer.callback = callback;
 		_timer.active = true;
 	} else {
diff --git a/backends/PalmOS/Src/palm.h b/backends/PalmOS/Src/palm.h
index e2ff05f4e9..88c7d2a2a3 100644
--- a/backends/PalmOS/Src/palm.h
+++ b/backends/PalmOS/Src/palm.h
@@ -92,19 +92,19 @@ public:
 	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor);
 
 	// Shaking is used in SCUMM. Set current shake position.
-	void set_shake_pos(int shake_pos);
+	void setShakePos(int shake_pos);
 		
 	// Get the number of milliseconds since the program was started.
-	uint32 get_msecs();
+	uint32 getMillis();
 	
 	// Delay for a specified amount of milliseconds
-	void delay_msecs(uint msecs);
+	void delayMillis(uint msecs);
 	
 	// Get the next event.
 	// Returns true if an event was retrieved.	
-	bool poll_event(Event *event);
+	bool pollEvent(Event &event);
 	
-	void SimulateArrowKeys(Event *event, Int8 iHoriz, Int8 iVert);
+	void SimulateArrowKeys(Event &event, Int8 iHoriz, Int8 iVert);
 
 	/** @name Sound */
 	//@{
@@ -126,16 +126,16 @@ public:
 
 	// Poll cdrom status
 	// Returns true if cd audio is playing
-	bool poll_cdrom();
+	bool pollCD();
 
 	// Play cdrom audio track
-	void play_cdrom(int track, int num_loops, int start_frame, int duration);
+	void playCD(int track, int num_loops, int start_frame, int duration);
 
 	// Stop cdrom audio track
-	void stop_cdrom();
+	void stopCD();
 
 	// Update cdrom audio status
-	void update_cdrom();
+	void updateCD();
 
 	// Add a callback timer
 	void setTimerCallback(TimerProc callback, int timer);
@@ -162,7 +162,7 @@ public:
 	void ColorToRGB(byte color, uint8 &r, uint8 &g, uint8 &b);
 
 	// Savefile management
-	SaveFileManager *get_savefile_manager();
+	SaveFileManager *getSavefileManager();
 
 	static OSystem *create();
 
diff --git a/backends/PalmOS/Src/palmevt.cpp b/backends/PalmOS/Src/palmevt.cpp
index 80a6c33701..c8eee736f6 100644
--- a/backends/PalmOS/Src/palmevt.cpp
+++ b/backends/PalmOS/Src/palmevt.cpp
@@ -32,7 +32,7 @@
 
 #define EXITDELAY (500) // delay to exit : calc button : double tap 1/500 sec
 
-void OSystem_PALMOS::SimulateArrowKeys(Event *event, Int8 iHoriz, Int8 iVert) {
+void OSystem_PALMOS::SimulateArrowKeys(Event &event, Int8 iHoriz, Int8 iVert) {
 	Int16 x = _mouseCurState.x;
 	Int16 y = _mouseCurState.y;
 	Int16 slow;
@@ -56,9 +56,9 @@ void OSystem_PALMOS::SimulateArrowKeys(Event *event, Int8 iHoriz, Int8 iVert) {
 	y = (y < 0				) ? 0					: y;
 	y = (y >= _screenHeight	) ? _screenHeight - 1	: y;
 
-	event->event_code = EVENT_MOUSEMOVE;
-	event->mouse.x = x;
-	event->mouse.y = y;
+	event.event_code = EVENT_MOUSEMOVE;
+	event.mouse.x = x;
+	event.mouse.y = y;
 	set_mouse_pos(x, y);
 }
 
@@ -104,7 +104,7 @@ void OSystem_PALMOS::getCoordinates(EventPtr event, Coord *x, Coord *y) {
 	}
 }
 
-bool OSystem_PALMOS::poll_event(Event *event) {
+bool OSystem_PALMOS::pollEvent(Event &event) {
 	EventType ev;
 	Boolean handled;
 	UInt32 keyCurrentState;
@@ -112,7 +112,7 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 
 	battery_handler();
 	sound_handler();
-	timer_handler(get_msecs());
+	timer_handler(getMillis());
 
 	for(;;) {
 		EvtGetEvent(&ev, evtNoWait);
@@ -126,9 +126,9 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 			Int8 sy = 0;
 
 			if (keyCurrentState & _keyMouse.bitButLeft) {
-				event->event_code = EVENT_LBUTTONDOWN;
-				event->mouse.x = _mouseCurState.x;
-				event->mouse.y = _mouseCurState.y;
+				event.event_code = EVENT_LBUTTONDOWN;
+				event.mouse.x = _mouseCurState.x;
+				event.mouse.y = _mouseCurState.y;
 				_lastKeyPressed = kLastKeyNone;
 				return true;
 			}
@@ -145,7 +145,7 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 			
 			SimulateArrowKeys(event, sx, sy);
 			updateScreen();
-			update_cdrom();
+			updateCD();
 			_lastKeyPressed = kLastKeyMouse;
 			return true;
 
@@ -155,7 +155,7 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 
 		if (ev.eType == nilEvent) {
 			// force CD update, useful when the game is paused in some cases
-			update_cdrom();
+			updateCD();
 			return false;
 		}
 
@@ -165,10 +165,10 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 				// ESC key
 				case vchrLaunch:
 					_lastKeyPressed = kLastKeyNone;
-					event->event_code = EVENT_KEYDOWN;
-					event->kbd.keycode = 27;
-					event->kbd.ascii = 27;
-					event->kbd.flags = 0;
+					event.event_code = EVENT_KEYDOWN;
+					event.kbd.keycode = 27;
+					event.kbd.ascii = 27;
+					event.kbd.flags = 0;
 					return true;
 				
 				// F5 = menu
@@ -176,18 +176,18 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 				case vchrMenu:
 				case vchrThumbWheelBack:	// Tapwave back button
 					_lastKeyPressed = kLastKeyNone;
-					event->event_code = EVENT_KEYDOWN;
-					event->kbd.keycode = 319;
-					event->kbd.ascii = 319;
-					event->kbd.flags = 0;
+					event.event_code = EVENT_KEYDOWN;
+					event.kbd.keycode = 319;
+					event.kbd.ascii = 319;
+					event.kbd.flags = 0;
 					return true;
 
 				case vchrCalc:
 					if (_lastKeyPressed & kLastKeyCalc)
-						if ((get_msecs() - _exit_delay) <= (EXITDELAY))
-							event->event_code = EVENT_QUIT;
+						if ((getMillis() - _exit_delay) <= (EXITDELAY))
+							event.event_code = EVENT_QUIT;
 
-					_exit_delay = get_msecs();
+					_exit_delay = getMillis();
 					_lastKeyPressed = kLastKeyCalc;
 					return true;
 
@@ -197,9 +197,9 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 #ifndef DISABLE_TAPWAVE
 				case vchrActionRight:
 #endif
-					event->event_code = EVENT_RBUTTONDOWN;
-					event->mouse.x = _mouseCurState.x;
-					event->mouse.y = _mouseCurState.y;
+					event.event_code = EVENT_RBUTTONDOWN;
+					event.mouse.x = _mouseCurState.x;
+					event.mouse.y = _mouseCurState.y;
 					_lastKeyPressed = kLastKeyNone;
 					return true;
 
@@ -213,11 +213,11 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 
 				// wheel
 				case vchrJogUp:
-					event->event_code = EVENT_WHEELUP;
+					event.event_code = EVENT_WHEELUP;
 					return true;
 
 				case vchrJogDown:
-					event->event_code = EVENT_WHEELDOWN;
+					event.event_code = EVENT_WHEELDOWN;
 					return true;
 
 
@@ -260,19 +260,19 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 					// ESC key
 					case vchrHard2:
 						_lastKeyPressed = kLastKeyNone;
-						event->event_code = EVENT_KEYDOWN;
-						event->kbd.keycode = 27;
-						event->kbd.ascii = 27;
-						event->kbd.flags = 0;
+						event.event_code = EVENT_KEYDOWN;
+						event.kbd.keycode = 27;
+						event.kbd.ascii = 27;
+						event.kbd.flags = 0;
 						return true;
 					
 					// F5 = menu
 					case vchrHard3:
 						_lastKeyPressed = kLastKeyNone;
-						event->event_code = EVENT_KEYDOWN;
-						event->kbd.keycode = 319;
-						event->kbd.ascii = 319;
-						event->kbd.flags = 0;
+						event.event_code = EVENT_KEYDOWN;
+						event.kbd.keycode = 319;
+						event.kbd.ascii = 319;
+						event.kbd.flags = 0;
 						return true;
 				}
 			}
@@ -321,7 +321,7 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 						b = 0;
 					
 					} else if  ((keycode == 'z' && b == KBD_CTRL) || (b == KBD_ALT && keycode == 'x')) {
-						event->event_code = EVENT_QUIT;
+						event.event_code = EVENT_QUIT;
 						return true;
 
 					} else if (keycode == 'n' && b == KBD_CTRL) {
@@ -344,10 +344,10 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 #endif
 					}
 					
-					event->event_code = EVENT_KEYDOWN;
-					event->kbd.keycode = keycode;
-					event->kbd.ascii = keycode; //(keycode>='a' && keycode<='z' && (event->kbd.flags & KBD_SHIFT) ? keycode &~ 0x20 : keycode);
-					event->kbd.flags = b;
+					event.event_code = EVENT_KEYDOWN;
+					event.kbd.keycode = keycode;
+					event.kbd.ascii = keycode; //(keycode>='a' && keycode<='z' && (event.kbd.flags & KBD_SHIFT) ? keycode &~ 0x20 : keycode);
+					event.kbd.flags = b;
 					
 					if (_lastKeyModifier) {
 						_lastKeyModifier = MD_NONE;
@@ -363,14 +363,14 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 			if (y > _screenHeight || y < 0 || x > _screenWidth || x < 0)
 				return true;
 
-			if (_lastEvent != penMoveEvent && (abs(y - event->mouse.y) <= 2 || abs(x - event->mouse.x) <= 2)) // move only if
+			if (_lastEvent != penMoveEvent && (abs(y - event.mouse.y) <= 2 || abs(x - event.mouse.x) <= 2)) // move only if
 				return true;
 
 			_lastEvent = penMoveEvent;
-			event->event_code = EVENT_MOUSEMOVE;
-			event->mouse.x = x;
-			event->mouse.y = y;
-			set_mouse_pos(event->mouse.x, event->mouse.y);
+			event.event_code = EVENT_MOUSEMOVE;
+			event.mouse.x = x;
+			event.mouse.y = y;
+			set_mouse_pos(event.mouse.x, event.mouse.y);
 			return true;
 
 		case penDownEvent:
@@ -387,10 +387,10 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 					_lastEvent = keyDownEvent;
 					_lastKeyPressed = kLastKeyNone;
 					
-					event->event_code = EVENT_KEYDOWN;
-					event->kbd.keycode = key;
-					event->kbd.ascii = key;
-					event->kbd.flags = 0;
+					event.event_code = EVENT_KEYDOWN;
+					event.kbd.keycode = key;
+					event.kbd.ascii = key;
+					event.kbd.flags = 0;
 					return true;
 				}
 			}
@@ -399,22 +399,22 @@ bool OSystem_PALMOS::poll_event(Event *event) {
 			if (y > _screenHeight || y < 0 || x > _screenWidth || x < 0)
 				return true;
 
-			event->event_code = EVENT_LBUTTONDOWN;
-			event->mouse.x = x;
-			event->mouse.y = y;
-			set_mouse_pos(event->mouse.x, event->mouse.y);
+			event.event_code = EVENT_LBUTTONDOWN;
+			event.mouse.x = x;
+			event.mouse.y = y;
+			set_mouse_pos(event.mouse.x, event.mouse.y);
 			return true;
 
 		case penUpEvent:
 			getCoordinates(&ev, &x, &y);
-			event->event_code = EVENT_LBUTTONUP;
+			event.event_code = EVENT_LBUTTONUP;
 
 			if (y > _screenHeight || y < 0 || x > _screenWidth || x < 0)
 				return true;
 
-			event->mouse.x = x;
-			event->mouse.y = y;
-			set_mouse_pos(event->mouse.x, event->mouse.y);
+			event.mouse.x = x;
+			event.mouse.y = y;
+			set_mouse_pos(event.mouse.x, event.mouse.y);
 			return true;
 
 		default:
diff --git a/backends/PalmOS/Src/palmrdr.cpp b/backends/PalmOS/Src/palmrdr.cpp
index c8a002c1ce..41a86524f7 100644
--- a/backends/PalmOS/Src/palmrdr.cpp
+++ b/backends/PalmOS/Src/palmrdr.cpp
@@ -41,7 +41,7 @@ void OSystem_PALMOS::rumblePack(Boolean active) {
 }
 
 
-void OSystem_PALMOS::set_shake_pos(int shake_pos) {
+void OSystem_PALMOS::setShakePos(int shake_pos) {
 	_new_shake_pos = shake_pos;
 
 	if (shake_pos == 0)
diff --git a/backends/PalmOS/Src/palmsave.cpp b/backends/PalmOS/Src/palmsave.cpp
index c3e2825f29..291b4d9204 100644
--- a/backends/PalmOS/Src/palmsave.cpp
+++ b/backends/PalmOS/Src/palmsave.cpp
@@ -192,6 +192,6 @@ SaveFile *PalmSaveFileManager::makeSaveFile(const char *filename, bool saveOrLoa
 }
 
 // OSystem
-SaveFileManager *OSystem_PALMOS::get_savefile_manager() {
+SaveFileManager *OSystem_PALMOS::getSavefileManager() {
 	return new PalmSaveFileManager();
 }
diff --git a/backends/PalmOS/Src/palmsnd.cpp b/backends/PalmOS/Src/palmsnd.cpp
index e05203cdd6..fd433fe5b0 100644
--- a/backends/PalmOS/Src/palmsnd.cpp
+++ b/backends/PalmOS/Src/palmsnd.cpp
@@ -157,28 +157,28 @@ bool OSystem_PALMOS::openCD(int drive) {
 	return false;
 }
 
-void OSystem_PALMOS::stop_cdrom() {
+void OSystem_PALMOS::stopCD() {
 	if (!_cdPlayer)
 		return;
 
 	_cdPlayer->stop();
 }
 
-void OSystem_PALMOS::play_cdrom(int track, int num_loops, int start_frame, int duration) {
+void OSystem_PALMOS::playCD(int track, int num_loops, int start_frame, int duration) {
 	if (!_cdPlayer)
 		return;
 
 	_cdPlayer->play(track, num_loops, start_frame, duration);
 }
 
-bool OSystem_PALMOS::poll_cdrom() {
+bool OSystem_PALMOS::pollCD() {
 	if (!_cdPlayer)
 		return false;
 	
 	return _cdPlayer->poll();
 }
 
-void OSystem_PALMOS::update_cdrom() {
+void OSystem_PALMOS::updateCD() {
 	if (!_cdPlayer)
 		return;
 
diff --git a/backends/dc/dc.h b/backends/dc/dc.h
index 3f40f8667d..5d580d4318 100644
--- a/backends/dc/dc.h
+++ b/backends/dc/dc.h
@@ -87,17 +87,17 @@ class OSystem_Dreamcast : public OSystem {
   void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor);
   
   // Shaking is used in SCUMM. Set current shake position.
-  void set_shake_pos(int shake_pos);
+  void setShakePos(int shake_pos);
 
   // Get the number of milliseconds since the program was started.
-  uint32 get_msecs();
+  uint32 getMillis();
   
   // Delay for a specified amount of milliseconds
-  void delay_msecs(uint msecs);
+  void delayMillis(uint msecs);
   
   // Get the next event.
   // Returns true if an event was retrieved.	
-  bool poll_event(Event *event);
+  bool pollEvent(Event &event);
   
   // Set function that generates samples 
   bool setSoundCallback(SoundProc proc, void *param);
@@ -112,16 +112,16 @@ class OSystem_Dreamcast : public OSystem {
 
   // Poll cdrom status
   // Returns true if cd audio is playing
-  bool poll_cdrom();
+  bool pollCD();
 
   // Play cdrom audio track
-  void play_cdrom(int track, int num_loops, int start_frame, int duration);
+  void playCD(int track, int num_loops, int start_frame, int duration);
   
   // Stop cdrom audio track
-  void stop_cdrom();
+  void stopCD();
 
   // Update cdrom audio status
-  void update_cdrom();
+  void updateCD();
 
   // Quit
   void quit();
@@ -147,7 +147,7 @@ class OSystem_Dreamcast : public OSystem {
   void setWindowCaption(const char *caption);
 
   // Savefile handling
-  SaveFileManager *get_savefile_manager();
+  SaveFileManager *getSavefileManager();
 
 
   static OSystem *create();
diff --git a/backends/dc/dcmain.cpp b/backends/dc/dcmain.cpp
index 73d71a29f9..6700bdeb68 100644
--- a/backends/dc/dcmain.cpp
+++ b/backends/dc/dcmain.cpp
@@ -78,7 +78,7 @@ static bool find_track(int track, int &first_sec, int &last_sec)
   return false;
 }
 
-void OSystem_Dreamcast::play_cdrom(int track, int num_loops, int start_frame, int duration)
+void OSystem_Dreamcast::playCD(int track, int num_loops, int start_frame, int duration)
 {
   int first_sec, last_sec;
 #if 1
@@ -95,18 +95,18 @@ void OSystem_Dreamcast::play_cdrom(int track, int num_loops, int start_frame, in
   play_cdda_sectors(first_sec, last_sec, num_loops);
 }
 
-void OSystem_Dreamcast::stop_cdrom()
+void OSystem_Dreamcast::stopCD()
 {
   stop_cdda();
 }
 
-bool OSystem_Dreamcast::poll_cdrom()
+bool OSystem_Dreamcast::pollCD()
 {
   extern int getCdState();
   return getCdState() == 3;
 }
 
-void OSystem_Dreamcast::update_cdrom()
+void OSystem_Dreamcast::updateCD()
 {
   // Dummy.  The CD drive takes care of itself.
 }
diff --git a/backends/dc/display.cpp b/backends/dc/display.cpp
index 2e46967dea..6e221941dc 100644
--- a/backends/dc/display.cpp
+++ b/backends/dc/display.cpp
@@ -238,7 +238,7 @@ void OSystem_Dreamcast::setMouseCursor(const byte *buf, uint w, uint h,
   memcpy(_ms_buf, buf, w * h);
 }
 
-void OSystem_Dreamcast::set_shake_pos(int shake_pos)
+void OSystem_Dreamcast::setShakePos(int shake_pos)
 {
   _current_shake_pos = shake_pos;
 }
diff --git a/backends/dc/input.cpp b/backends/dc/input.cpp
index ad0164991b..a202411f51 100644
--- a/backends/dc/input.cpp
+++ b/backends/dc/input.cpp
@@ -170,7 +170,7 @@ int handleInput(struct mapledev *pad, int &mouse_x, int &mouse_y,
   return 0;
 }
 
-bool OSystem_Dreamcast::poll_event(Event *event)
+bool OSystem_Dreamcast::pollEvent(Event &event)
 {
   unsigned int t = Timer();
 
@@ -189,29 +189,29 @@ bool OSystem_Dreamcast::poll_event(Event *event)
   setimask(15);
   checkSound();
   int e = handleInput(locked_get_pads(), _ms_cur_x, _ms_cur_y,
-		      event->kbd.flags, (_softkbd_on? &_softkbd : NULL));
+		      event.kbd.flags, (_softkbd_on? &_softkbd : NULL));
   setimask(mask);
   if (_ms_cur_x<0) _ms_cur_x=0;
   if (_ms_cur_x>=_screen_w) _ms_cur_x=_screen_w-1;
   if (_ms_cur_y<0) _ms_cur_y=0;
   if (_ms_cur_y>=_screen_h) _ms_cur_y=_screen_h-1;
-  event->mouse.x = _ms_cur_x;
-  event->mouse.y = _ms_cur_y;
+  event.mouse.x = _ms_cur_x;
+  event.mouse.y = _ms_cur_y;
   if (_overlay_visible) {
-    event->mouse.x -= _overlay_x;
-    event->mouse.y -= _overlay_y;
+    event.mouse.x -= _overlay_x;
+    event.mouse.y -= _overlay_y;
   }
-  event->kbd.ascii = event->kbd.keycode = 0;
+  event.kbd.ascii = event.kbd.keycode = 0;
   if(e<0) {
-    event->event_code = (EventCode)-e;
+    event.event_code = (EventCode)-e;
     return true;
   } else if(e>0) {
     bool processed = false, down = !(e&(1<<30));
     e &= ~(1<<30);
     if(e < 1000) {
-      event->event_code = (down? EVENT_KEYDOWN : EVENT_KEYUP);
-      event->kbd.keycode = e;
-      event->kbd.ascii = (e>='a' && e<='z' && (event->kbd.flags & KBD_SHIFT)?
+      event.event_code = (down? EVENT_KEYDOWN : EVENT_KEYUP);
+      event.kbd.keycode = e;
+      event.kbd.ascii = (e>='a' && e<='z' && (event.kbd.flags & KBD_SHIFT)?
 			  e &~ 0x20 : e);
       processed = true;
     } else if(down) {
@@ -221,12 +221,12 @@ bool OSystem_Dreamcast::poll_event(Event *event)
     }
     return processed;
   } else if(_ms_cur_x != _ms_old_x || _ms_cur_y != _ms_old_y) {
-    event->event_code = EVENT_MOUSEMOVE;
+    event.event_code = EVENT_MOUSEMOVE;
     _ms_old_x = _ms_cur_x;
     _ms_old_y = _ms_cur_y;
     return true;
   } else {
-    event->event_code = (EventCode)0;
+    event.event_code = (EventCode)0;
     return false;
   }
 }
diff --git a/backends/dc/time.cpp b/backends/dc/time.cpp
index 2771fc33c2..fd1ceaedd0 100644
--- a/backends/dc/time.cpp
+++ b/backends/dc/time.cpp
@@ -27,7 +27,7 @@
 #include "dc.h"
 
 
-uint32 OSystem_Dreamcast::get_msecs()
+uint32 OSystem_Dreamcast::getMillis()
 {
   static uint32 msecs=0;
   static unsigned int t0=0;
@@ -43,14 +43,14 @@ uint32 OSystem_Dreamcast::get_msecs()
   return msecs += dm;
 }
 
-void OSystem_Dreamcast::delay_msecs(uint msecs)
+void OSystem_Dreamcast::delayMillis(uint msecs)
 {
-  get_msecs();
+  getMillis();
   unsigned int t, start = Timer();
   int time = (((unsigned int)msecs)*100000U)>>11;
   while(((int)((t = Timer())-start))<time)
     checkSound();
-  get_msecs();
+  getMillis();
 }
 
 void OSystem_Dreamcast::setTimerCallback(TimerProc callback, int timer)
diff --git a/backends/dc/vmsave.cpp b/backends/dc/vmsave.cpp
index 210177730f..0e9d87c18d 100644
--- a/backends/dc/vmsave.cpp
+++ b/backends/dc/vmsave.cpp
@@ -341,7 +341,7 @@ void VMSaveManager::list_savefiles(const char *prefix, const char *directory,
     tryList(prefix, marks, num, i);
 }
 
-SaveFileManager *OSystem_Dreamcast::get_savefile_manager()
+SaveFileManager *OSystem_Dreamcast::getSavefileManager()
 {
   return new VMSaveManager();
 }
diff --git a/backends/gp32/gp32.cpp b/backends/gp32/gp32.cpp
index 3451aa69e0..b7b6770ad1 100644
--- a/backends/gp32/gp32.cpp
+++ b/backends/gp32/gp32.cpp
@@ -812,17 +812,17 @@ void OSystem_GP32::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x
 }
 	
 // Shaking is used in SCUMM. Set current shake position.
-void OSystem_GP32::set_shake_pos(int shake_pos) { 
+void OSystem_GP32::setShakePos(int shake_pos) { 
 	_newShakePos = shake_pos;
 }
 		
 // Get the number of milliseconds since the program was started.
-uint32 OSystem_GP32::get_msecs() { 
+uint32 OSystem_GP32::getMillis() { 
 	return GpTickCountGet(); 
 }
 	
 // Delay for a specified amount of milliseconds
-void OSystem_GP32::delay_msecs(uint msecs) { 
+void OSystem_GP32::delayMillis(uint msecs) { 
 	int n = GpTickCountGet();
 	while ( ( GpTickCountGet() - n ) < msecs) ;
 }
@@ -830,7 +830,7 @@ void OSystem_GP32::delay_msecs(uint msecs) {
 // Get the next event.
 // Returns true if an event was retrieved.	
 
-bool OSystem_GP32::poll_event(Event *event) { 	// fixme: make more user-friendly :)
+bool OSystem_GP32::pollEvent(Event &event) { 	// fixme: make more user-friendly :)
 
 	#define EVENT_COUNT	2 // >=1
 	#define MOUSE_MIPS	1 // bg updates wrong if >1 ??
@@ -842,7 +842,7 @@ bool OSystem_GP32::poll_event(Event *event) { 	// fixme: make more user-friendly
 	if (key == GPC_VK_NONE) {
 		if (lastevent==EVENT_LBUTTONDOWN) {
 			lastevent=0;
-			event->event_code = EVENT_LBUTTONUP;
+			event.event_code = EVENT_LBUTTONUP;
 			return true;
 		}
 		return false;
@@ -855,7 +855,7 @@ bool OSystem_GP32::poll_event(Event *event) { 	// fixme: make more user-friendly
 	oldkey=key;
 	eventcount=EVENT_COUNT;
 
-	event->event_code = EVENT_KEYDOWN;
+	event.event_code = EVENT_KEYDOWN;
 
 	if (key & GPC_VK_FL && key & GPC_VK_FR) { // L+R = save state
 		printf("Saving game, please wait...");
@@ -888,27 +888,27 @@ bool OSystem_GP32::poll_event(Event *event) { 	// fixme: make more user-friendly
 	}
 
 	if (key & GPC_VK_START) { // START = menu
-		event->kbd.keycode = 319;
-		event->kbd.ascii = 319;
+		event.kbd.keycode = 319;
+		event.kbd.ascii = 319;
 		return true;			
 	}
 
 	if (key & GPC_VK_SELECT) { // SELECT == escape/skip
 		if (_overlay_visible) 
 			do key=GpKeyGet(); while (key != GPC_VK_NONE) ; // prevent 2xESC
-		event->kbd.keycode = 27;
-		event->kbd.ascii = 27;		
+		event.kbd.keycode = 27;
+		event.kbd.ascii = 27;		
 		return true;
 	}		
 
 	if (key & GPC_VK_FA) {
 		lastevent=EVENT_LBUTTONDOWN;
-		event->event_code = EVENT_LBUTTONDOWN;
+		event.event_code = EVENT_LBUTTONDOWN;
 		return true;
 	}
 	if (key & GPC_VK_FB) {
 		lastevent=EVENT_RBUTTONDOWN;
-		event->event_code = EVENT_RBUTTONDOWN;
+		event.event_code = EVENT_RBUTTONDOWN;
 		return true;
 	}
 
@@ -932,14 +932,14 @@ bool OSystem_GP32::poll_event(Event *event) { 	// fixme: make more user-friendly
 		if (my>199) my=199;
 	}
 
-	event->event_code = EVENT_MOUSEMOVE;
-	km.x = event->mouse.x = mx;
-	km.y = event->mouse.y = my;
+	event.event_code = EVENT_MOUSEMOVE;
+	km.x = event.mouse.x = mx;
+	km.y = event.mouse.y = my;
 
-	event->mouse.x /= _scaleFactor;
-	event->mouse.y /= _scaleFactor;	
+	event.mouse.x /= _scaleFactor;
+	event.mouse.y /= _scaleFactor;	
 
-	set_mouse_pos(event->mouse.x, event->mouse.y);
+	set_mouse_pos(event.mouse.x, event.mouse.y);
 }
 
 // Set the function to be invoked whenever samples need to be generated
@@ -1026,16 +1026,16 @@ uint32 OSystem_GP32::property(int param, Property *value) {
 		
 // Poll cdrom status
 // Returns true if cd audio is playing
-bool OSystem_GP32::poll_cdrom() { return false; }
+bool OSystem_GP32::pollCD() { return false; }
 
 // Play cdrom audio track
-void OSystem_GP32::play_cdrom(int track, int num_loops, int start_frame, int duration) { }
+void OSystem_GP32::playCD(int track, int num_loops, int start_frame, int duration) { }
 
 // Stop cdrom audio track
-void OSystem_GP32::stop_cdrom() { }
+void OSystem_GP32::stopCD() { }
 
 // Update cdrom audio status
-void OSystem_GP32::update_cdrom() { }
+void OSystem_GP32::updateCD() { }
 
 // Add a new callback timer
 void OSystem_GP32::setTimerCallback(TimerProc callback, int timer) { }
diff --git a/backends/gp32/gp32.h b/backends/gp32/gp32.h
index fbb0253773..1e8ff60ee8 100644
--- a/backends/gp32/gp32.h
+++ b/backends/gp32/gp32.h
@@ -61,17 +61,17 @@ public:
 	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor);
 	
 	// Shaking is used in SCUMM. Set current shake position.
-	void set_shake_pos(int shake_pos);
+	void setShakePos(int shake_pos);
 		
 	// Get the number of milliseconds since the program was started.
-	uint32 get_msecs();
+	uint32 getMillis();
 	
 	// Delay for a specified amount of milliseconds
-	void delay_msecs(uint msecs);
+	void delayMillis(uint msecs);
 	
 	// Get the next event.
 	// Returns true if an event was retrieved.	
-	bool poll_event(Event *event);
+	bool pollEvent(Event &event);
 
 	// Set the function to be invoked whenever samples need to be generated
 	// Format is the sample type format.
@@ -84,16 +84,16 @@ public:
 		
 	// Poll cdrom status
 	// Returns true if cd audio is playing
-	bool poll_cdrom();
+	bool pollCD();
 
 	// Play cdrom audio track
-	void play_cdrom(int track, int num_loops, int start_frame, int duration);
+	void playCD(int track, int num_loops, int start_frame, int duration);
 
 	// Stop cdrom audio track
-	void stop_cdrom();
+	void stopCD();
 
 	// Update cdrom audio status
-	void update_cdrom();
+	void updateCD();
 
 	// Add a new callback timer
 	void setTimerCallback(TimerProc callback, int timer);
diff --git a/backends/morphos/morphos.cpp b/backends/morphos/morphos.cpp
index 0691963468..1b4e16be5a 100644
--- a/backends/morphos/morphos.cpp
+++ b/backends/morphos/morphos.cpp
@@ -307,14 +307,14 @@ bool OSystem_MorphOS::OpenATimer(MsgPort **port, IORequest **req, ULONG unit, bo
 	return *req != NULL;
 }
 
-uint32 OSystem_MorphOS::get_msecs()
+uint32 OSystem_MorphOS::getMillis()
 {
 	int ticks = clock();
 	ticks *= (1000/CLOCKS_PER_SEC);
 	return ticks;
 }
 
-void OSystem_MorphOS::delay_msecs(uint msecs)
+void OSystem_MorphOS::delayMillis(uint msecs)
 {
 /*	  TimerIORequest->tr_node.io_Command = TR_ADDREQUEST;
 	TimerIORequest->tr_time.tv_secs = 0;
@@ -456,7 +456,7 @@ uint32 OSystem_MorphOS::property(int param, Property *value)
 	return 0;
 }
 
-void OSystem_MorphOS::play_cdrom(int track, int num_loops, int start_frame, int duration)
+void OSystem_MorphOS::playCD(int track, int num_loops, int start_frame, int duration)
 {
 	if (CDrive && start_frame >= 0)
 	{
@@ -472,13 +472,13 @@ void OSystem_MorphOS::play_cdrom(int track, int num_loops, int start_frame, int
 	}
 }
 
-void OSystem_MorphOS::stop_cdrom()
+void OSystem_MorphOS::stopCD()
 {
 	if (CDrive)
 		CDDA_Stop(CDrive);
 }
 
-bool OSystem_MorphOS::poll_cdrom()
+bool OSystem_MorphOS::pollCD()
 {
 	ULONG status;
 
@@ -489,7 +489,7 @@ bool OSystem_MorphOS::poll_cdrom()
 	return status == CDDA_Status_Busy;
 }
 
-void OSystem_MorphOS::update_cdrom()
+void OSystem_MorphOS::updateCD()
 {
 }
 
@@ -798,7 +798,7 @@ void OSystem_MorphOS::SwitchScalerTo(SCALERTYPE newScaler)
 	}
 }
 
-bool OSystem_MorphOS::poll_event(Event *event)
+bool OSystem_MorphOS::pollEvent(Event &event)
 {
 	IntuiMessage *ScummMsg;
 
@@ -823,9 +823,9 @@ bool OSystem_MorphOS::poll_event(Event *event)
 					qual |= KBD_SHIFT;
 				if (ScummMsg->Qualifier & IEQUALIFIER_CONTROL)
 					qual |= KBD_CTRL;
-				event->kbd.flags = qual;
+				event.kbd.flags = qual;
 
-				event->event_code = (ScummMsg->Code & IECODE_UP_PREFIX) ? EVENT_KEYUP : EVENT_KEYDOWN;
+				event.event_code = (ScummMsg->Code & IECODE_UP_PREFIX) ? EVENT_KEYUP : EVENT_KEYDOWN;
 				ScummMsg->Code &= ~IECODE_UP_PREFIX;
 
 				if (ScummMsg->Code >= RAWKEY_F1 && ScummMsg->Code <= RAWKEY_F10)
@@ -833,29 +833,29 @@ bool OSystem_MorphOS::poll_event(Event *event)
 					/*
 					 * Function key
 					 */
-					event->kbd.ascii = (ScummMsg->Code-RAWKEY_F1)+315;
-					event->kbd.keycode = 0;
+					event.kbd.ascii = (ScummMsg->Code-RAWKEY_F1)+315;
+					event.kbd.keycode = 0;
 				}
 				else if (ScummMsg->Code == RAWKEY_F11 || ScummMsg->Code == RAWKEY_F12)
 				{
 					/*
 					 * Function key on PC keyboard
 					 */
-					event->kbd.ascii = (ScummMsg->Code == RAWKEY_F11) ? 325 : 326;
-					event->kbd.keycode = 0;
+					event.kbd.ascii = (ScummMsg->Code == RAWKEY_F11) ? 325 : 326;
+					event.kbd.keycode = 0;
 				}
 				else if (ScummMsg->Code == NM_WHEEL_UP || ScummMsg->Code == NM_WHEEL_DOWN)
 				{
 					/*
 					 * Wheelmouse event
 					 */
-					event->event_code = (ScummMsg->Code == NM_WHEEL_UP) ? EVENT_WHEELUP : EVENT_WHEELDOWN;
+					event.event_code = (ScummMsg->Code == NM_WHEEL_UP) ? EVENT_WHEELUP : EVENT_WHEELDOWN;
 				}
 				else if (MapRawKey(&FakedIEvent, &charbuf, 1, NULL) == 1)
 				{
 					if (qual == KBD_CTRL && charbuf == 'z')
 					{
-						event->event_code = EVENT_QUIT;
+						event.event_code = EVENT_QUIT;
 						break;
 					}
 					else if (qual == KBD_ALT)
@@ -870,7 +870,7 @@ bool OSystem_MorphOS::poll_event(Event *event)
 						}
 						else if (charbuf == 'x')
 						{
-							event->event_code = EVENT_QUIT;
+							event.event_code = EVENT_QUIT;
 							break;
 						}
 						else if (charbuf == 0x0d)
@@ -881,8 +881,8 @@ bool OSystem_MorphOS::poll_event(Event *event)
 						}
 					}
 
-					event->kbd.ascii = charbuf;
-					event->kbd.keycode = charbuf;
+					event.kbd.ascii = charbuf;
+					event.kbd.keycode = charbuf;
 				}
 				break;
 			}
@@ -915,10 +915,10 @@ bool OSystem_MorphOS::poll_event(Event *event)
 				else if (FullScreenMode)
 					newy = newy <? (ScummScrHeight >> ScummScale)-2;
 
-				event->event_code = EVENT_MOUSEMOVE;
-				event->mouse.x = newx;
-				event->mouse.y = newy;
-				set_mouse_pos(event->mouse.x, event->mouse.y);
+				event.event_code = EVENT_MOUSEMOVE;
+				event.mouse.x = newx;
+				event.mouse.y = newy;
+				set_mouse_pos(event.mouse.x, event.mouse.y);
 				break;
 			}
 
@@ -932,32 +932,32 @@ bool OSystem_MorphOS::poll_event(Event *event)
 				switch (ScummMsg->Code)
 				{
 					case SELECTDOWN:
-						event->event_code = EVENT_LBUTTONDOWN;
+						event.event_code = EVENT_LBUTTONDOWN;
 						break;
 
 					case SELECTUP:
-						event->event_code = EVENT_LBUTTONUP;
+						event.event_code = EVENT_LBUTTONUP;
 						break;
 
 					case MENUDOWN:
-						event->event_code = EVENT_RBUTTONDOWN;
+						event.event_code = EVENT_RBUTTONDOWN;
 						break;
 
 					case MENUUP:
-						event->event_code = EVENT_RBUTTONUP;
+						event.event_code = EVENT_RBUTTONUP;
 						break;
 
 					default:
 						ReplyMsg((Message *)ScummMsg);
 						return false;
 				}
-				event->mouse.x = newx;
-				event->mouse.y = newy;
+				event.mouse.x = newx;
+				event.mouse.y = newy;
 				break;
 			}
 
 			case IDCMP_CLOSEWINDOW:
-				event->event_code = EVENT_QUIT;
+				event.event_code = EVENT_QUIT;
 				break;
 		}
 
@@ -1007,7 +1007,7 @@ void OSystem_MorphOS::warpMouse(int x, int y)
 	}
 }
 
-void OSystem_MorphOS::set_shake_pos(int shake_pos)
+void OSystem_MorphOS::setShakePos(int shake_pos)
 {
 	ScummShakePos = shake_pos;
 	AddUpdateRect(0, 0, ScummBufferWidth, ScummBufferHeight);
diff --git a/backends/morphos/morphos.h b/backends/morphos/morphos.h
index 0279bc3517..30c7c04edf 100644
--- a/backends/morphos/morphos.h
+++ b/backends/morphos/morphos.h
@@ -66,7 +66,7 @@ class OSystem_MorphOS : public OSystem
 		virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor);
 
 		// Shaking is used in SCUMM. Set current shake position.
-		virtual void set_shake_pos(int shake_pos);
+		virtual void setShakePos(int shake_pos);
 
 		// Overlay
 		virtual void showOverlay();
@@ -78,10 +78,10 @@ class OSystem_MorphOS : public OSystem
 		virtual int16 getWidth();
 
 		// Get the number of milliseconds since the program was started.
-		virtual uint32 get_msecs();
+		virtual uint32 getMillis();
 
 		// Delay for a specified amount of milliseconds
-		virtual void delay_msecs(uint msecs);
+		virtual void delayMillis(uint msecs);
 
 		// Add a new callback timer
 		virtual void setTimerCallback(TimerProc callback, int timer);
@@ -94,7 +94,7 @@ class OSystem_MorphOS : public OSystem
 
 		// Get the next event.
 		// Returns true if an event was retrieved.
-		virtual bool poll_event(Event *event);
+		virtual bool pollEvent(Event &event);
 
 		// Moves mouse pointer to specified position
 		virtual void warpMouse(int x, int y);
@@ -108,16 +108,16 @@ class OSystem_MorphOS : public OSystem
 
 		// Poll cdrom status
 		// Returns true if cd audio is playing
-		virtual bool poll_cdrom();
+		virtual bool pollCD();
 
 		// Play cdrom audio track
-		virtual void play_cdrom(int track, int num_loops, int start_frame, int duration);
+		virtual void playCD(int track, int num_loops, int start_frame, int duration);
 
 		// Stop cdrom audio track
-		virtual void stop_cdrom();
+		virtual void stopCD();
 
 		// Update cdrom audio status
-		virtual void update_cdrom();
+		virtual void updateCD();
 
 		// Quit
 		virtual void quit();
diff --git a/backends/null/null.cpp b/backends/null/null.cpp
index ff23217483..5e9e3290d4 100644
--- a/backends/null/null.cpp
+++ b/backends/null/null.cpp
@@ -52,7 +52,7 @@ public:
 	virtual void setPalette(const byte *colors, uint start, uint num);
 	virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 	virtual void updateScreen();
-	virtual void set_shake_pos(int shakeOffset);
+	virtual void setShakePos(int shakeOffset);
 
 	virtual void showOverlay();
 	virtual void hideOverlay();
@@ -70,9 +70,9 @@ public:
 	virtual void warpMouse(int x, int y);
 	virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255);
 
-	virtual bool poll_event(Event *event);
-	virtual uint32 get_msecs();
-	virtual void delay_msecs(uint msecs);
+	virtual bool pollEvent(Event &event);
+	virtual uint32 getMillis();
+	virtual void delayMillis(uint msecs);
 
 	virtual void setTimerCallback(TimerProc callback, int interval);
 
@@ -86,11 +86,11 @@ public:
 	virtual int getOutputSampleRate() const;
 
 	virtual bool openCD(int drive);
-	virtual bool poll_cdrom();
+	virtual bool pollCD();
 
-	virtual void play_cdrom(int track, int num_loops, int start_frame, int duration);
-	virtual void stop_cdrom();
-	virtual void update_cdrom();
+	virtual void playCD(int track, int num_loops, int start_frame, int duration);
+	virtual void stopCD();
+	virtual void updateCD();
 
 	virtual void quit();
 
@@ -98,7 +98,7 @@ public:
 
 	virtual void displayMessageOnOSD(const char *msg);
 
-	virtual SaveFileManager *get_savefile_manager();
+	virtual SaveFileManager *getSavefileManager();
 
 };
 
@@ -180,7 +180,7 @@ void OSystem_NULL::updateScreen()
 {
 }
 
-void OSystem_NULL::set_shake_pos(int shakeOffset)
+void OSystem_NULL::setShakePos(int shakeOffset)
 {
 }
 
@@ -236,17 +236,17 @@ void OSystem_NULL::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX,
 {
 }
 
-bool OSystem_NULL::poll_event(Event *event)
+bool OSystem_NULL::pollEvent(Event &event)
 {
 	return false;
 }
 
-uint32 OSystem_NULL::get_msecs()
+uint32 OSystem_NULL::getMillis()
 {
 	return 0;
 }
 
-void OSystem_NULL::delay_msecs(uint msecs)
+void OSystem_NULL::delayMillis(uint msecs)
 {	
 }
 
@@ -290,20 +290,20 @@ bool OSystem_NULL::openCD(int drive)
 	return true;
 }
 
-bool OSystem_NULL::poll_cdrom()
+bool OSystem_NULL::pollCD()
 {
 	return true;
 }
 
-void OSystem_NULL::play_cdrom(int track, int num_loops, int start_frame, int duration)
+void OSystem_NULL::playCD(int track, int num_loops, int start_frame, int duration)
 {
 }
 
-void OSystem_NULL::stop_cdrom()
+void OSystem_NULL::stopCD()
 {
 }
 
-void OSystem_NULL::update_cdrom()
+void OSystem_NULL::updateCD()
 {
 }
 
@@ -319,7 +319,7 @@ void OSystem_NULL::displayMessageOnOSD(const char *msg)
 {
 }
 
-SaveFileManager* OSystem_NULL::get_savefile_manager()
+SaveFileManager* OSystem_NULL::getSavefileManager()
 {
 	return NULL;
 }
diff --git a/backends/sdl/events.cpp b/backends/sdl/events.cpp
index e017b2dc77..48686908a7 100644
--- a/backends/sdl/events.cpp
+++ b/backends/sdl/events.cpp
@@ -88,7 +88,7 @@ void OSystem_SDL::fillMouseEvent(Event &event, int x, int y) {
 }
 
 void OSystem_SDL::kbd_mouse() {
-	uint32 curTime = get_msecs();
+	uint32 curTime = getMillis();
 	if (curTime >= km.last_time + km.delay_time) {
 		km.last_time = curTime;
 		if (km.x_down_count == 1) {
@@ -156,7 +156,7 @@ void OSystem_SDL::kbd_mouse() {
 	}
 }
 
-bool OSystem_SDL::poll_event(Event *event) {
+bool OSystem_SDL::pollEvent(Event &event) {
 	SDL_Event ev;
 	int axis;
 	byte b = 0;
@@ -166,7 +166,7 @@ bool OSystem_SDL::poll_event(Event *event) {
 	// If the screen mode changed, send an EVENT_SCREEN_CHANGED
 	if (_modeChanged) {
 		_modeChanged = false;
-		event->event_code = EVENT_SCREEN_CHANGED;
+		event.event_code = EVENT_SCREEN_CHANGED;
 		return true;
 	}
 
@@ -188,7 +188,7 @@ bool OSystem_SDL::poll_event(Event *event) {
 			if (ev.key.keysym.mod & KMOD_ALT)
 				b |= KBD_ALT;
 #endif
-			event->kbd.flags = b;
+			event.kbd.flags = b;
 
 			// Alt-Return and Alt-Enter toggle full screen mode				
 			if (b == KBD_ALT && (ev.key.keysym.sym == SDLK_RETURN
@@ -233,19 +233,19 @@ bool OSystem_SDL::poll_event(Event *event) {
 #ifdef MACOSX
 			// On Macintosh', Cmd-Q quits
 			if ((ev.key.keysym.mod & KMOD_META) && ev.key.keysym.sym == 'q') {
-				event->event_code = EVENT_QUIT;
+				event.event_code = EVENT_QUIT;
 				return true;
 			}
 #elif defined(UNIX)
 			// On other unices, Control-Q quits
 			if ((ev.key.keysym.mod & KMOD_CTRL) && ev.key.keysym.sym == 'q') {
-				event->event_code = EVENT_QUIT;
+				event.event_code = EVENT_QUIT;
 				return true;
 			}
 #else
 			// Ctrl-z and Alt-X quit
 			if ((b == KBD_CTRL && ev.key.keysym.sym == 'z') || (b == KBD_ALT && ev.key.keysym.sym == 'x')) {
-				event->event_code = EVENT_QUIT;
+				event.event_code = EVENT_QUIT;
 				return true;
 			}
 #endif
@@ -351,28 +351,28 @@ bool OSystem_SDL::poll_event(Event *event) {
 #ifdef LINUPY
 			// On Yopy map the End button to quit
 			if ((ev.key.keysym.sym==293)) {
-				event->event_code = EVENT_QUIT;
+				event.event_code = EVENT_QUIT;
 				return true;
 			}
 			// Map menu key to f5 (scumm menu)
 			if (ev.key.keysym.sym==306) {
-				event->event_code = EVENT_KEYDOWN;
-				event->kbd.keycode = SDLK_F5;
-				event->kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+				event.event_code = EVENT_KEYDOWN;
+				event.kbd.keycode = SDLK_F5;
+				event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 				return true;
 			}
 			// Map action key to action
 			if (ev.key.keysym.sym==291) {
-				event->event_code = EVENT_KEYDOWN;
-				event->kbd.keycode = SDLK_TAB;
-				event->kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0);
+				event.event_code = EVENT_KEYDOWN;
+				event.kbd.keycode = SDLK_TAB;
+				event.kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0);
 				return true;
 			}
 			// Map OK key to skip cinematic
 			if (ev.key.keysym.sym==292) {
-				event->event_code = EVENT_KEYDOWN;
-				event->kbd.keycode = SDLK_ESCAPE;
-				event->kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
+				event.event_code = EVENT_KEYDOWN;
+				event.kbd.keycode = SDLK_ESCAPE;
+				event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
 				return true;
 			}
 #endif
@@ -380,41 +380,41 @@ bool OSystem_SDL::poll_event(Event *event) {
 #ifdef QTOPIA
 			// quit on fn+backspace on zaurus
 			if (ev.key.keysym.sym == 127) {
-				event->event_code = EVENT_QUIT;
+				event.event_code = EVENT_QUIT;
 				return true;
 			}
 
 			// map menu key (f11) to f5 (scumm menu)
 			if (ev.key.keysym.sym == SDLK_F11) {
-				event->event_code = EVENT_KEYDOWN;
-				event->kbd.keycode = SDLK_F5;
-				event->kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+				event.event_code = EVENT_KEYDOWN;
+				event.kbd.keycode = SDLK_F5;
+				event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 			}
 			// map center (space) to tab (default action )
 			// I wanted to map the calendar button but the calendar comes up
 			//
 			else if (ev.key.keysym.sym == SDLK_SPACE) {
-				event->event_code = EVENT_KEYDOWN;
-				event->kbd.keycode = SDLK_TAB;
-				event->kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0);
+				event.event_code = EVENT_KEYDOWN;
+				event.kbd.keycode = SDLK_TAB;
+				event.kbd.ascii = mapKey(SDLK_TAB, ev.key.keysym.mod, 0);
 			}
 			// since we stole space (pause) above we'll rebind it to the tab key on the keyboard
 			else if (ev.key.keysym.sym == SDLK_TAB) {
-				event->event_code = EVENT_KEYDOWN;
-				event->kbd.keycode = SDLK_SPACE;
-				event->kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
+				event.event_code = EVENT_KEYDOWN;
+				event.kbd.keycode = SDLK_SPACE;
+				event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 			} else {
 			// let the events fall through if we didn't change them, this may not be the best way to
 			// set it up, but i'm not sure how sdl would like it if we let if fall through then redid it though.
 			// and yes i have an huge terminal size so i dont wrap soon enough.
-				event->event_code = EVENT_KEYDOWN;
-				event->kbd.keycode = ev.key.keysym.sym;
-				event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
+				event.event_code = EVENT_KEYDOWN;
+				event.kbd.keycode = ev.key.keysym.sym;
+				event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
 			}
 #else
-			event->event_code = EVENT_KEYDOWN;
-			event->kbd.keycode = ev.key.keysym.sym;
-			event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
+			event.event_code = EVENT_KEYDOWN;
+			event.kbd.keycode = ev.key.keysym.sym;
+			event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
 #endif
 			
 			switch(ev.key.keysym.sym) {
@@ -441,9 +441,9 @@ bool OSystem_SDL::poll_event(Event *event) {
 			return true;
 	
 		case SDL_KEYUP:
-			event->event_code = EVENT_KEYUP;
-			event->kbd.keycode = ev.key.keysym.sym;
-			event->kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
+			event.event_code = EVENT_KEYUP;
+			event.kbd.keycode = ev.key.keysym.sym;
+			event.kbd.ascii = mapKey(ev.key.keysym.sym, ev.key.keysym.mod, ev.key.keysym.unicode);
 
 			switch(ev.key.keysym.sym) {
 			case SDLK_LEFT:
@@ -476,64 +476,64 @@ bool OSystem_SDL::poll_event(Event *event) {
 			return true;
 
 		case SDL_MOUSEMOTION:
-			event->event_code = EVENT_MOUSEMOVE;
-			fillMouseEvent(*event, ev.motion.x, ev.motion.y);
+			event.event_code = EVENT_MOUSEMOVE;
+			fillMouseEvent(event, ev.motion.x, ev.motion.y);
 			
-			set_mouse_pos(event->mouse.x, event->mouse.y);
+			set_mouse_pos(event.mouse.x, event.mouse.y);
 			return true;
 
 		case SDL_MOUSEBUTTONDOWN:
 			if (ev.button.button == SDL_BUTTON_LEFT)
-				event->event_code = EVENT_LBUTTONDOWN;
+				event.event_code = EVENT_LBUTTONDOWN;
 			else if (ev.button.button == SDL_BUTTON_RIGHT)
-				event->event_code = EVENT_RBUTTONDOWN;
+				event.event_code = EVENT_RBUTTONDOWN;
 #if defined(SDL_BUTTON_WHEELUP) && defined(SDL_BUTTON_WHEELDOWN)
 			else if (ev.button.button == SDL_BUTTON_WHEELUP)
-				event->event_code = EVENT_WHEELUP;
+				event.event_code = EVENT_WHEELUP;
 			else if (ev.button.button == SDL_BUTTON_WHEELDOWN)
-				event->event_code = EVENT_WHEELDOWN;
+				event.event_code = EVENT_WHEELDOWN;
 #endif
 			else
 				break;
 
-			fillMouseEvent(*event, ev.button.x, ev.button.y);
+			fillMouseEvent(event, ev.button.x, ev.button.y);
 
 			return true;
 
 		case SDL_MOUSEBUTTONUP:
 			if (ev.button.button == SDL_BUTTON_LEFT)
-				event->event_code = EVENT_LBUTTONUP;
+				event.event_code = EVENT_LBUTTONUP;
 			else if (ev.button.button == SDL_BUTTON_RIGHT)
-				event->event_code = EVENT_RBUTTONUP;
+				event.event_code = EVENT_RBUTTONUP;
 			else
 				break;
-			fillMouseEvent(*event, ev.button.x, ev.button.y);
+			fillMouseEvent(event, ev.button.x, ev.button.y);
 
 			return true;
 
 		case SDL_JOYBUTTONDOWN:
 			if (ev.jbutton.button == JOY_BUT_LMOUSE) {
-				event->event_code = EVENT_LBUTTONDOWN;
+				event.event_code = EVENT_LBUTTONDOWN;
 			} else if (ev.jbutton.button == JOY_BUT_RMOUSE) {
-				event->event_code = EVENT_RBUTTONDOWN;
+				event.event_code = EVENT_RBUTTONDOWN;
 			} else {
-				event->event_code = EVENT_KEYDOWN;
+				event.event_code = EVENT_KEYDOWN;
 				switch (ev.jbutton.button) {
 					case JOY_BUT_ESCAPE:
-						event->kbd.keycode = SDLK_ESCAPE;
-						event->kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
+						event.kbd.keycode = SDLK_ESCAPE;
+						event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
 						break;
 					case JOY_BUT_PERIOD:
-						event->kbd.keycode = SDLK_PERIOD;
-						event->kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
+						event.kbd.keycode = SDLK_PERIOD;
+						event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
 						break;
 					case JOY_BUT_SPACE:
-						event->kbd.keycode = SDLK_SPACE;
-						event->kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
+						event.kbd.keycode = SDLK_SPACE;
+						event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 						break;
 					case JOY_BUT_F5:
-						event->kbd.keycode = SDLK_F5;
-						event->kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+						event.kbd.keycode = SDLK_F5;
+						event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 						break; 
 				}
 			}
@@ -541,27 +541,27 @@ bool OSystem_SDL::poll_event(Event *event) {
 
 		case SDL_JOYBUTTONUP:
 			if (ev.jbutton.button == JOY_BUT_LMOUSE) {
-				event->event_code = EVENT_LBUTTONUP;
+				event.event_code = EVENT_LBUTTONUP;
 			} else if (ev.jbutton.button == JOY_BUT_RMOUSE) {
-				event->event_code = EVENT_RBUTTONUP;
+				event.event_code = EVENT_RBUTTONUP;
 			} else {
-				event->event_code = EVENT_KEYUP;
+				event.event_code = EVENT_KEYUP;
 				switch (ev.jbutton.button) {
 					case JOY_BUT_ESCAPE:
-						event->kbd.keycode = SDLK_ESCAPE;
-						event->kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
+						event.kbd.keycode = SDLK_ESCAPE;
+						event.kbd.ascii = mapKey(SDLK_ESCAPE, ev.key.keysym.mod, 0);
 						break;
 					case JOY_BUT_PERIOD:
-						event->kbd.keycode = SDLK_PERIOD;
-						event->kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
+						event.kbd.keycode = SDLK_PERIOD;
+						event.kbd.ascii = mapKey(SDLK_PERIOD, ev.key.keysym.mod, 0);
 						break;
 					case JOY_BUT_SPACE:
-						event->kbd.keycode = SDLK_SPACE;
-						event->kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
+						event.kbd.keycode = SDLK_SPACE;
+						event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 						break;
 					case JOY_BUT_F5:
-						event->kbd.keycode = SDLK_F5;
-						event->kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+						event.kbd.keycode = SDLK_F5;
+						event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
 						break;
 				} 
 			}
@@ -571,10 +571,10 @@ bool OSystem_SDL::poll_event(Event *event) {
 			axis = ev.jaxis.value;
 			if ( axis > JOY_DEADZONE) {
 				axis -= JOY_DEADZONE;
-				event->event_code = EVENT_MOUSEMOVE;
+				event.event_code = EVENT_MOUSEMOVE;
 			} else if ( axis < -JOY_DEADZONE ) {
 				axis += JOY_DEADZONE;
-				event->event_code = EVENT_MOUSEMOVE;
+				event.event_code = EVENT_MOUSEMOVE;
 			} else
 				axis = 0;
 
@@ -610,7 +610,7 @@ bool OSystem_SDL::poll_event(Event *event) {
 #endif
 			}
 			
-			fillMouseEvent(*event, km.x, km.y);
+			fillMouseEvent(event, km.x, km.y);
 
 			return true;
 
@@ -619,7 +619,7 @@ bool OSystem_SDL::poll_event(Event *event) {
 			break;
 
 		case SDL_QUIT:
-			event->event_code = EVENT_QUIT;
+			event.event_code = EVENT_QUIT;
 			return true;
 		}
 	}
diff --git a/backends/sdl/graphics.cpp b/backends/sdl/graphics.cpp
index 89958d6440..af817ddd78 100644
--- a/backends/sdl/graphics.cpp
+++ b/backends/sdl/graphics.cpp
@@ -720,7 +720,7 @@ void OSystem_SDL::setPalette(const byte *colors, uint start, uint num) {
 		_paletteDirtyEnd = start + num;
 }
 
-void OSystem_SDL::set_shake_pos(int shake_pos) {
+void OSystem_SDL::setShakePos(int shake_pos) {
 	_newShakePos = shake_pos;
 }
 
diff --git a/backends/sdl/sdl-common.h b/backends/sdl/sdl-common.h
index 3c1e600eaa..6ccaf26a07 100644
--- a/backends/sdl/sdl-common.h
+++ b/backends/sdl/sdl-common.h
@@ -67,17 +67,17 @@ public:
 	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor);
 
 	// Shaking is used in SCUMM. Set current shake position.
-	void set_shake_pos(int shake_pos);
+	void setShakePos(int shake_pos);
 
 	// Get the number of milliseconds since the program was started.
-	uint32 get_msecs();
+	uint32 getMillis();
 
 	// Delay for a specified amount of milliseconds
-	void delay_msecs(uint msecs);
+	void delayMillis(uint msecs);
 
 	// Get the next event.
 	// Returns true if an event was retrieved.	
-	bool poll_event(Event *event);
+	bool pollEvent(Event &event);
 
 	// Set function that generates samples 
 	bool setSoundCallback(SoundProc proc, void *param);
@@ -86,16 +86,16 @@ public:
 
 	// Poll CD status
 	// Returns true if cd audio is playing
-	bool poll_cdrom();
+	bool pollCD();
 
 	// Play CD audio track
-	void play_cdrom(int track, int num_loops, int start_frame, int duration);
+	void playCD(int track, int num_loops, int start_frame, int duration);
 
 	// Stop CD audio track
-	void stop_cdrom();
+	void stopCD();
 
 	// Update CD audio status
-	void update_cdrom();
+	void updateCD();
 
 	// Quit
 	void quit();
diff --git a/backends/sdl/sdl.cpp b/backends/sdl/sdl.cpp
index c7292ad554..f6ad91b452 100644
--- a/backends/sdl/sdl.cpp
+++ b/backends/sdl/sdl.cpp
@@ -128,11 +128,11 @@ OSystem_SDL::~OSystem_SDL() {
 	SDL_Quit();
 }
 
-uint32 OSystem_SDL::get_msecs() {
+uint32 OSystem_SDL::getMillis() {
 	return SDL_GetTicks();	
 }
 
-void OSystem_SDL::delay_msecs(uint msecs) {
+void OSystem_SDL::delayMillis(uint msecs) {
 	SDL_Delay(msecs);
 }
 
@@ -343,12 +343,12 @@ bool OSystem_SDL::openCD(int drive) {
 	return (_cdrom != NULL);
 }
 
-void OSystem_SDL::stop_cdrom() {	/* Stop CD Audio in 1/10th of a second */
+void OSystem_SDL::stopCD() {	/* Stop CD Audio in 1/10th of a second */
 	cd_stop_time = SDL_GetTicks() + 100;
 	cd_num_loops = 0;
 }
 
-void OSystem_SDL::play_cdrom(int track, int num_loops, int start_frame, int duration) {
+void OSystem_SDL::playCD(int track, int num_loops, int start_frame, int duration) {
 	if (!num_loops && !start_frame)
 		return;
 
@@ -372,14 +372,14 @@ void OSystem_SDL::play_cdrom(int track, int num_loops, int start_frame, int dura
 	cd_end_time = SDL_GetTicks() + _cdrom->track[track].length * 1000 / CD_FPS;
 }
 
-bool OSystem_SDL::poll_cdrom() {
+bool OSystem_SDL::pollCD() {
 	if (!_cdrom)
 		return false;
 
 	return (cd_num_loops != 0 && (SDL_GetTicks() < cd_end_time || SDL_CDStatus(_cdrom) != CD_STOPPED));
 }
 
-void OSystem_SDL::update_cdrom() {
+void OSystem_SDL::updateCD() {
 	if (!_cdrom)
 		return;
 
diff --git a/backends/wince/wince-sdl.cpp b/backends/wince/wince-sdl.cpp
index f2c2e3a4ca..b6fa512773 100644
--- a/backends/wince/wince-sdl.cpp
+++ b/backends/wince/wince-sdl.cpp
@@ -1290,7 +1290,7 @@ void OSystem_WINCE3::add_dirty_rect(int x, int y, int w, int h) {
 // FIXME
 // See if some SDL mapping can be useful for HPCs
 
-bool OSystem_WINCE3::poll_event(Event *event) {
+bool OSystem_WINCE3::pollEvent(Event &event) {
 	SDL_Event ev;
 	byte b = 0;
 	Event temp_event;
diff --git a/backends/wince/wince-sdl.h b/backends/wince/wince-sdl.h
index 53b546a708..5f2813295e 100644
--- a/backends/wince/wince-sdl.h
+++ b/backends/wince/wince-sdl.h
@@ -46,7 +46,7 @@ public:
 	void initSize(uint w, uint h);
 
 	// Overloaded from SDL_Common (toolbar handling)
-	bool poll_event(Event *event);
+	bool pollEvent(Event &event);
 	// Overloaded from SDL_Common (toolbar handling)
 	void draw_mouse();
 	// Overloaded from SDL_Common (mouse and new scaler handling)
diff --git a/backends/x11/x11.cpp b/backends/x11/x11.cpp
index cbf4e90555..2fa8398e29 100644
--- a/backends/x11/x11.cpp
+++ b/backends/x11/x11.cpp
@@ -108,17 +108,17 @@ public:
 	void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor);
 
 	// Shaking is used in SCUMM. Set current shake position.
-	void set_shake_pos(int shake_pos);
+	void setShakePos(int shake_pos);
 
 	// Get the number of milliseconds since the program was started.
-	uint32 get_msecs();
+	uint32 getMillis();
 
 	// Delay for a specified amount of milliseconds
-	void delay_msecs(uint msecs);
+	void delayMillis(uint msecs);
 
 	// Get the next event.
 	// Returns true if an event was retrieved.  
-	bool poll_event(Event *event);
+	bool pollEvent(Event &event);
 
 	// Set function that generates samples 
 	bool setSoundCallback(SoundProc proc, void *param);
@@ -133,16 +133,16 @@ public:
 
 	// Poll cdrom status
 	// Returns true if cd audio is playing
-	bool poll_cdrom();
+	bool pollCD();
 
 	// Play cdrom audio track
-	void play_cdrom(int track, int num_loops, int start_frame, int duration);
+	void playCD(int track, int num_loops, int start_frame, int duration);
 
 	// Stop cdrom audio track
-	void stop_cdrom();
+	void stopCD();
 
 	// Update cdrom audio status
-	void update_cdrom();
+	void updateCD();
 
 	// Quit
 	void quit();
@@ -462,7 +462,7 @@ int OSystem_X11::getGraphicsMode() const {
 }
 
 
-uint32 OSystem_X11::get_msecs() {
+uint32 OSystem_X11::getMillis() {
 	struct timeval current_time;
 	gettimeofday(&current_time, NULL);
 	return (uint32)(((current_time.tv_sec - start_time.tv_sec) * 1000) +
@@ -789,7 +789,7 @@ void OSystem_X11::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x,
 	_mouse_state_changed = true;
 }
 
-void OSystem_X11::set_shake_pos(int shake_pos) {
+void OSystem_X11::setShakePos(int shake_pos) {
 	if (new_shake_pos != shake_pos) {
 		if (_mouse_state_changed == false) {
 			undraw_mouse();
@@ -807,26 +807,26 @@ bool OSystem_X11::openCD(int drive) {
 	return false;
 }
 
-bool OSystem_X11::poll_cdrom() {
+bool OSystem_X11::pollCD() {
 	return false;
 }
 
-void OSystem_X11::play_cdrom(int track, int num_loops, int start_frame, int duration) {
+void OSystem_X11::playCD(int track, int num_loops, int start_frame, int duration) {
 }
 
-void OSystem_X11::stop_cdrom() {
+void OSystem_X11::stopCD() {
 }
 
-void OSystem_X11::update_cdrom() {
+void OSystem_X11::updateCD() {
 }
 
-void OSystem_X11::delay_msecs(uint msecs) {
+void OSystem_X11::delayMillis(uint msecs) {
 	usleep(msecs * 1000);
 }
 
-bool OSystem_X11::poll_event(Event *scumm_event) {
+bool OSystem_X11::pollEvent(Event &scumm_event) {
 	/* First, handle timers */
-	uint32 current_msecs = get_msecs();
+	uint32 current_msecs = getMillis();
 
 	if (_timer_active && (current_msecs >= _timer_next_expiry)) {
 		_timer_duration = _timer_callback(_timer_duration);
@@ -923,10 +923,10 @@ bool OSystem_X11::poll_event(Event *scumm_event) {
 					}
 				}
 				if (keycode != -1) {
-					scumm_event->event_code = EVENT_KEYDOWN;
-					scumm_event->kbd.keycode = keycode;
-					scumm_event->kbd.ascii = (ascii != -1 ? ascii : keycode);
-					scumm_event->kbd.flags = mode;
+					scumm_event.event_code = EVENT_KEYDOWN;
+					scumm_event.kbd.keycode = keycode;
+					scumm_event.kbd.ascii = (ascii != -1 ? ascii : keycode);
+					scumm_event.kbd.flags = mode;
 					return true;
 				}
 		}
@@ -965,10 +965,10 @@ bool OSystem_X11::poll_event(Event *scumm_event) {
 					}
 				}
 				if (keycode != -1) {
-					scumm_event->event_code = EVENT_KEYUP;
-					scumm_event->kbd.keycode = keycode;
-					scumm_event->kbd.ascii = (ascii != -1 ? ascii : keycode);
-					scumm_event->kbd.flags = mode;
+					scumm_event.event_code = EVENT_KEYUP;
+					scumm_event.kbd.keycode = keycode;
+					scumm_event.kbd.ascii = (ascii != -1 ? ascii : keycode);
+					scumm_event.kbd.flags = mode;
 					return true;
 				}
 			}
@@ -978,14 +978,14 @@ bool OSystem_X11::poll_event(Event *scumm_event) {
 			if (report_presses != 0) {
 				if (event.xbutton.button == 1) {
 					if (fake_right_mouse == 0) {
-						scumm_event->event_code = EVENT_LBUTTONDOWN;
+						scumm_event.event_code = EVENT_LBUTTONDOWN;
 					} else {
-						scumm_event->event_code = EVENT_RBUTTONDOWN;
+						scumm_event.event_code = EVENT_RBUTTONDOWN;
 					}
 				} else if (event.xbutton.button == 3)
-					scumm_event->event_code = EVENT_RBUTTONDOWN;
-				scumm_event->mouse.x = event.xbutton.x - scumm_x;
-				scumm_event->mouse.y = event.xbutton.y - scumm_y;
+					scumm_event.event_code = EVENT_RBUTTONDOWN;
+				scumm_event.mouse.x = event.xbutton.x - scumm_x;
+				scumm_event.mouse.y = event.xbutton.y - scumm_y;
 				return true;
 			}
 			break;
@@ -994,23 +994,23 @@ bool OSystem_X11::poll_event(Event *scumm_event) {
 			if (report_presses != 0) {
 				if (event.xbutton.button == 1) {
 					if (fake_right_mouse == 0) {
-						scumm_event->event_code = EVENT_LBUTTONUP;
+						scumm_event.event_code = EVENT_LBUTTONUP;
 					} else {
-						scumm_event->event_code = EVENT_RBUTTONUP;
+						scumm_event.event_code = EVENT_RBUTTONUP;
 					}
 				} else if (event.xbutton.button == 3)
-					scumm_event->event_code = EVENT_RBUTTONUP;
-				scumm_event->mouse.x = event.xbutton.x - scumm_x;
-				scumm_event->mouse.y = event.xbutton.y - scumm_y;
+					scumm_event.event_code = EVENT_RBUTTONUP;
+				scumm_event.mouse.x = event.xbutton.x - scumm_x;
+				scumm_event.mouse.y = event.xbutton.y - scumm_y;
 				return true;
 			}
 			break;
 
 		case MotionNotify:
-			scumm_event->event_code = EVENT_MOUSEMOVE;
-			scumm_event->mouse.x = event.xmotion.x - scumm_x;
-			scumm_event->mouse.y = event.xmotion.y - scumm_y;
-			set_mouse_pos(scumm_event->mouse.x, scumm_event->mouse.y);
+			scumm_event.event_code = EVENT_MOUSEMOVE;
+			scumm_event.mouse.x = event.xmotion.x - scumm_x;
+			scumm_event.mouse.y = event.xmotion.y - scumm_y;
+			set_mouse_pos(scumm_event.mouse.x, scumm_event.mouse.y);
 			return true;
 
 		case ConfigureNotify:{
@@ -1036,7 +1036,7 @@ bool OSystem_X11::poll_event(Event *scumm_event) {
 void OSystem_X11::setTimerCallback(TimerProc callback, int interval) {
 	if (callback != NULL) {
 		_timer_duration = interval;
-		_timer_next_expiry = get_msecs() + interval;
+		_timer_next_expiry = getMillis() + interval;
 		_timer_callback = callback;
 		_timer_active = true;
 	} else {