MOHAWK: Misc cleanups

svn-id: r54645

10 files changed, 654 insertions, 695 deletions

diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp
index f65ae0ee66..fad60445b4 100644
--- a/engines/mohawk/graphics.cpp
+++ b/engines/mohawk/graphics.cpp
@@ -299,7 +299,7 @@ void MystGraphics::updateScreen() {
 	}
 }
 
-void MystGraphics::animatedUpdate(uint16 type, Common::Rect rect, uint16 steps, uint16 delay) {
+void MystGraphics::runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay) {
 	// Bypass dirty rects for animated updates
 	_dirtyRects.clear();
 
diff --git a/engines/mohawk/graphics.h b/engines/mohawk/graphics.h
index 356372cbe9..7fa4404e12 100644
--- a/engines/mohawk/graphics.h
+++ b/engines/mohawk/graphics.h
@@ -105,7 +105,7 @@ public:
 	void copyImageSectionToScreen(uint16 image, Common::Rect src, Common::Rect dest);
 	void copyImageToScreen(uint16 image, Common::Rect dest);
 	void updateScreen();
-	void animatedUpdate(uint16 type, Common::Rect rect, uint16 steps, uint16 delay);
+	void runTransition(uint16 type, Common::Rect rect, uint16 steps, uint16 delay);
 	void drawRect(Common::Rect rect, RectState state);
 
 protected:
diff --git a/engines/mohawk/myst.cpp b/engines/mohawk/myst.cpp
index a44cee745f..b04e4f72d0 100644
--- a/engines/mohawk/myst.cpp
+++ b/engines/mohawk/myst.cpp
@@ -300,22 +300,22 @@ Common::Error MohawkEngine_Myst::run() {
 					checkCurrentResource();
 				}
 				if (_curResource >= 0 && _resources[_curResource]->isEnabled() && _mouseClicked) {
-					debug(2, "Sending mouse move event to resource %d\n", _curResource);
-					_resources[_curResource]->handleMouseDrag(&event.mouse);
+					debug(2, "Sending mouse move event to resource %d", _curResource);
+					_resources[_curResource]->handleMouseDrag(event.mouse);
 				}
 				break;
 			case Common::EVENT_LBUTTONUP:
 				_mouseClicked = false;
 				if (_curResource >= 0 && _resources[_curResource]->isEnabled()) {
-					debug(2, "Sending mouse up event to resource %d\n", _curResource);
-					_resources[_curResource]->handleMouseUp(&event.mouse);
+					debug(2, "Sending mouse up event to resource %d", _curResource);
+					_resources[_curResource]->handleMouseUp(event.mouse);
 				}
 				break;
 			case Common::EVENT_LBUTTONDOWN:
 				_mouseClicked = true;
 				if (_curResource >= 0 && _resources[_curResource]->isEnabled()) {
-					debug(2, "Sending mouse up event to resource %d\n", _curResource);
-					_resources[_curResource]->handleMouseDown(&event.mouse);
+					debug(2, "Sending mouse up event to resource %d", _curResource);
+					_resources[_curResource]->handleMouseDown(event.mouse);
 				}
 				break;
 			case Common::EVENT_KEYDOWN:
@@ -956,7 +956,7 @@ MystResource *MohawkEngine_Myst::loadResource(Common::SeekableReadStream *rlstSt
 	case kMystDragArea:
 		resource =  new MystResourceType11(this, rlstStream, parent);
 		break;
-	case kMystVideoInfos:
+	case kMystVideoInfo:
 		resource =  new MystResourceType12(this, rlstStream, parent);
 		break;
 	case kMystHoverArea:
diff --git a/engines/mohawk/myst_areas.cpp b/engines/mohawk/myst_areas.cpp
index d04bb3a771..fddf46e371 100644
--- a/engines/mohawk/myst_areas.cpp
+++ b/engines/mohawk/myst_areas.cpp
@@ -68,7 +68,7 @@ MystResource::MystResource(MohawkEngine_Myst *vm, Common::SeekableReadStream *rl
 MystResource::~MystResource() {
 }
 
-void MystResource::handleMouseUp(Common::Point *mouse) {
+void MystResource::handleMouseUp(const Common::Point &mouse) {
 	if (_dest != 0)
 		_vm->changeToCard(_dest, true);
 	else
@@ -101,7 +101,7 @@ MystResourceType5::MystResourceType5(MohawkEngine_Myst *vm, Common::SeekableRead
 	_script = vm->_scriptParser->readScript(rlstStream, kMystScriptNormal);
 }
 
-void MystResourceType5::handleMouseUp(Common::Point *mouse) {
+void MystResourceType5::handleMouseUp(const Common::Point &mouse) {
 	_vm->_scriptParser->runScript(_script, this);
 }
 
@@ -238,7 +238,7 @@ void MystResourceType7::handleAnimation() {
 	}
 }
 
-void MystResourceType7::handleMouseUp(Common::Point *mouse) {
+void MystResourceType7::handleMouseUp(const Common::Point &mouse) {
 	if (_var7 == 0xFFFF) {
 		if (_numSubResources == 1)
 			_subResources[0]->handleMouseUp(mouse);
@@ -258,7 +258,7 @@ void MystResourceType7::handleMouseUp(Common::Point *mouse) {
 	}
 }
 
-void MystResourceType7::handleMouseDown(Common::Point *mouse) {
+void MystResourceType7::handleMouseDown(const Common::Point &mouse) {
 	if (_var7 == 0xFFFF) {
 		if (_numSubResources == 1)
 			_subResources[0]->handleMouseDown(mouse);
@@ -520,7 +520,7 @@ void MystResourceType10::drawDataToScreen()
 	MystResourceType8::drawDataToScreen();
 }
 
-void MystResourceType10::handleMouseDown(Common::Point *mouse) {
+void MystResourceType10::handleMouseDown(const Common::Point &mouse) {
 	// Tell the engine we are dragging a resource
 	_vm->_dragResource = this;
 
@@ -535,7 +535,7 @@ void MystResourceType10::handleMouseDown(Common::Point *mouse) {
 	drawConditionalDataToScreen(2);
 }
 
-void MystResourceType10::handleMouseUp(Common::Point *mouse) {
+void MystResourceType10::handleMouseUp(const Common::Point &mouse) {
 	updatePosition(mouse);
 
 	// Restore background
@@ -567,7 +567,7 @@ void MystResourceType10::handleMouseUp(Common::Point *mouse) {
 	_vm->_dragResource = 0;
 }
 
-void MystResourceType10::handleMouseDrag(Common::Point *mouse) {
+void MystResourceType10::handleMouseDrag(const Common::Point &mouse) {
 	updatePosition(mouse);
 
 	MystResourceType11::handleMouseDrag(mouse);
@@ -579,14 +579,15 @@ void MystResourceType10::handleMouseDrag(Common::Point *mouse) {
 	drawConditionalDataToScreen(2);
 }
 
-void MystResourceType10::updatePosition(Common::Point *mouse) {
+void MystResourceType10::updatePosition(const Common::Point &mouse) {
 	bool positionChanged = false;
 
-	setPositionClipping(mouse, mouse);
+	Common::Point mouseClipped;
+	setPositionClipping(mouse, mouseClipped);
 
 	if (_flagHV & 2) {
 		if (_stepV) {
-			uint16 center = _minV + _stepV * (mouse->y - _minV) / _stepV;
+			uint16 center = _minV + _stepV * (mouseClipped.y - _minV) / _stepV;
 			uint16 top = center - _sliderHeigth / 2;
 			if (_rect.top != top) {
 				positionChanged = true;
@@ -595,8 +596,8 @@ void MystResourceType10::updatePosition(Common::Point *mouse) {
 			}
 		} else {
 			positionChanged = true;
-			_pos.y = mouse->y;
-			_rect.top = mouse->y - _sliderHeigth / 2;
+			_pos.y = mouseClipped.y;
+			_rect.top = mouseClipped.y - _sliderHeigth / 2;
 		}
 		if (positionChanged) {
 			_rect.bottom = _rect.top + _sliderHeigth;
@@ -607,7 +608,7 @@ void MystResourceType10::updatePosition(Common::Point *mouse) {
 
 	if (_flagHV & 1) {
 		if (_stepH) {
-			uint16 center = _minH + _stepH * (mouse->x - _minH) / _stepH;
+			uint16 center = _minH + _stepH * (mouseClipped.x - _minH) / _stepH;
 			uint16 left = center - _sliderWidth / 2;
 			if (_rect.left != left) {
 				positionChanged = true;
@@ -616,8 +617,8 @@ void MystResourceType10::updatePosition(Common::Point *mouse) {
 			}
 		} else {
 			positionChanged = true;
-			_pos.x = mouse->x;
-			_rect.left = mouse->x - _sliderWidth / 2;
+			_pos.x = mouseClipped.x;
+			_rect.left = mouseClipped.x - _sliderWidth / 2;
 		}
 		if (positionChanged) {
 			_rect.right = _rect.left + _sliderWidth;
@@ -683,30 +684,30 @@ MystResourceType11::~MystResourceType11() {
 		delete[] _lists[i].list;
 }
 
-void MystResourceType11::handleMouseDown(Common::Point *mouse) {
-	setPositionClipping(mouse, &_pos);
+void MystResourceType11::handleMouseDown(const Common::Point &mouse) {
+	setPositionClipping(mouse, _pos);
 
 	_vm->_scriptParser->runOpcode(_mouseDownOpcode, _var8);
 }
 
-void MystResourceType11::handleMouseUp(Common::Point *mouse) {
-	setPositionClipping(mouse, &_pos);
+void MystResourceType11::handleMouseUp(const Common::Point &mouse) {
+	setPositionClipping(mouse, _pos);
 
 	_vm->_scriptParser->runOpcode(_mouseUpOpcode, _var8);
 }
 
-void MystResourceType11::handleMouseDrag(Common::Point *mouse) {
-	setPositionClipping(mouse, &_pos);
+void MystResourceType11::handleMouseDrag(const Common::Point &mouse) {
+	setPositionClipping(mouse, _pos);
 
 	_vm->_scriptParser->runOpcode(_mouseDragOpcode, _var8);
 }
 
-void MystResourceType11::setPositionClipping(Common::Point *mouse, Common::Point *dest) {
+void MystResourceType11::setPositionClipping(const Common::Point &mouse, Common::Point &dest) {
 	if (_flagHV & 2) {
-		dest->y = CLIP<uint16>(mouse->y, _minV, _maxV);
+		dest.y = CLIP<uint16>(mouse.y, _minV, _maxV);
 	}
 	if (_flagHV & 1) {
-		dest->x = CLIP<uint16>(mouse->x, _minH, _maxH);
+		dest.x = CLIP<uint16>(mouse.x, _minH, _maxH);
 	}
 }
 
@@ -770,7 +771,7 @@ void MystResourceType12::handleAnimation() {
 	}
 }
 
-void MystResourceType12::handleMouseUp(Common::Point *mouse) {
+void MystResourceType12::handleMouseUp(const Common::Point &mouse) {
 	// HACK/TODO: Trigger Animation on Mouse Click. Probably not final version. Variable/Type 11 Controlled?
 	_currentFrame = _firstFrame;
 	_doAnimation = true;
@@ -794,7 +795,7 @@ void MystResourceType13::handleMouseLeave() {
 	_vm->_scriptParser->runOpcode(_leaveOpcode);
 }
 
-void MystResourceType13::handleMouseUp(Common::Point *mouse) {
+void MystResourceType13::handleMouseUp(const Common::Point &mouse) {
 	// Type 13 Resources do nothing on Mouse Clicks.
 	// This is required to override the inherited default
 	// i.e. MystResource::handleMouseUp
diff --git a/engines/mohawk/myst_areas.h b/engines/mohawk/myst_areas.h
index e5063408c3..afc160ef47 100644
--- a/engines/mohawk/myst_areas.h
+++ b/engines/mohawk/myst_areas.h
@@ -43,7 +43,7 @@ enum ResourceType {
 	kMystConditionalImage = 8,
 	kMystSlider = 10,
 	kMystDragArea = 11,
-	kMystVideoInfos = 12,
+	kMystVideoInfo = 12,
 	kMystHoverArea = 13
 };
 
@@ -77,9 +77,9 @@ public:
 	bool canBecomeActive();
 
 	// Mouse interface
-	virtual void handleMouseUp(Common::Point *mouse);
-	virtual void handleMouseDown(Common::Point *mouse) {}
-	virtual void handleMouseDrag(Common::Point *mouse) {}
+	virtual void handleMouseUp(const Common::Point &mouse);
+	virtual void handleMouseDown(const Common::Point &mouse) {}
+	virtual void handleMouseDrag(const Common::Point &mouse) {}
 	virtual void handleMouseEnter() {}
 	virtual void handleMouseLeave() {}
 
@@ -94,7 +94,7 @@ protected:
 class MystResourceType5 : public MystResource {
 public:
 	MystResourceType5(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
-	void handleMouseUp(Common::Point *mouse);
+	void handleMouseUp(const Common::Point &mouse);
 
 protected:
 	MystScript _script;
@@ -128,8 +128,8 @@ public:
 	virtual void drawDataToScreen();
 	virtual void handleAnimation();
 
-	virtual void handleMouseUp(Common::Point *mouse);
-	virtual void handleMouseDown(Common::Point *mouse);
+	virtual void handleMouseUp(const Common::Point &mouse);
+	virtual void handleMouseDown(const Common::Point &mouse);
 	virtual void handleMouseEnter();
 	virtual void handleMouseLeave();
 
@@ -163,9 +163,9 @@ class MystResourceType11 : public MystResourceType8 {
 public:
 	MystResourceType11(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
 	virtual ~MystResourceType11();
-	void handleMouseDown(Common::Point *mouse);
-	void handleMouseUp(Common::Point *mouse);
-	void handleMouseDrag(Common::Point *mouse);
+	void handleMouseDown(const Common::Point &mouse);
+	void handleMouseUp(const Common::Point &mouse);
+	void handleMouseDrag(const Common::Point &mouse);
 
 	uint16 getList1(uint16 index);
 	uint16 getList2(uint16 index);
@@ -173,7 +173,7 @@ public:
 
 	Common::Point _pos;
 protected:
-	void setPositionClipping(Common::Point *mouse, Common::Point *dest);
+	void setPositionClipping(const Common::Point &mouse, Common::Point &dest);
 
 	uint16 _flagHV;
 	uint16 _minH;
@@ -200,14 +200,14 @@ public:
 	virtual ~MystResourceType10();
 
 	void drawDataToScreen();
-	void handleMouseDown(Common::Point *mouse);
-	void handleMouseUp(Common::Point *mouse);
-	void handleMouseDrag(Common::Point *mouse);
+	void handleMouseDown(const Common::Point &mousee);
+	void handleMouseUp(const Common::Point &mouse);
+	void handleMouseDrag(const Common::Point &mouse);
 	void setStep(uint16 step);
 
 protected:
 	Common::Rect boundingBox();
-	void updatePosition(Common::Point *mouse);
+	void updatePosition(const Common::Point &mouse);
     void restoreBackground();
 
 	uint16 _dragSound;
@@ -220,7 +220,7 @@ public:
 	MystResourceType12(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
 	virtual ~MystResourceType12();
 	void handleAnimation();
-	void handleMouseUp(Common::Point *mouse);
+	void handleMouseUp(const Common::Point &mouse);
 
 protected:
 	uint16 _numFrames;
@@ -235,7 +235,7 @@ private:
 class MystResourceType13 : public MystResource {
 public:
 	MystResourceType13(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
-	void handleMouseUp(Common::Point *mouse);
+	void handleMouseUp(const Common::Point &mouse);
 	void handleMouseEnter();
 	void handleMouseLeave();
 
diff --git a/engines/mohawk/myst_scripts.cpp b/engines/mohawk/myst_scripts.cpp
index f9a1315bde..0e794cdb8f 100644
--- a/engines/mohawk/myst_scripts.cpp
+++ b/engines/mohawk/myst_scripts.cpp
@@ -97,53 +97,53 @@ void MystScriptParser::setupOpcodes() {
 
 	static const MystOpcode myst_opcodes[] = {
 		// "Standard" Opcodes
-		OPCODE(0, o_0_toggleVar),
-		OPCODE(1, o_1_setVar),
-		OPCODE(2, o_2_changeCardSwitch),
-		OPCODE(3, o_3_takePage),
-		OPCODE(4, o_4_redrawCard),
+		OPCODE(0, o_toggleVar),
+		OPCODE(1, o_setVar),
+		OPCODE(2, o_changeCardSwitch),
+		OPCODE(3, o_takePage),
+		OPCODE(4, o_redrawCard),
 		// Opcode 5 Not Present
-		OPCODE(6, o_6_goToDest),
-		OPCODE(7, o_6_goToDest),
-		OPCODE(8, o_6_goToDest),
-		OPCODE(9, o_9_triggerMovie),
-		OPCODE(10, o_10_toggleVarNoRedraw),
+		OPCODE(6, o_goToDest),
+		OPCODE(7, o_goToDest),
+		OPCODE(8, o_goToDest),
+		OPCODE(9, o_triggerMovie),
+		OPCODE(10, o_toggleVarNoRedraw),
 		// Opcode 11 Not Present
-		OPCODE(12, o_2_changeCardSwitch),
-		OPCODE(13, o_2_changeCardSwitch),
-		OPCODE(14, o_14_drawAreaState),
-		OPCODE(15, o_15_redrawAreaForVar),
-		OPCODE(16, o_16_changeCardDirectional),
-		OPCODE(17, o_17_changeCardPush),
-		OPCODE(18, o_18_changeCardPop),
-		OPCODE(19, o_19_enableAreas),
-		OPCODE(20, o_20_disableAreas),
-		OPCODE(21, o_21_directionalUpdate),
-		OPCODE(22, o_6_goToDest),
-		OPCODE(23, o_23_toggleAreasActivation),
-		OPCODE(24, o_24_playSound),
+		OPCODE(12, o_changeCardSwitch),
+		OPCODE(13, o_changeCardSwitch),
+		OPCODE(14, o_drawAreaState),
+		OPCODE(15, o_redrawAreaForVar),
+		OPCODE(16, o_changeCardDirectional),
+		OPCODE(17, o_changeCardPush),
+		OPCODE(18, o_changeCardPop),
+		OPCODE(19, o_enableAreas),
+		OPCODE(20, o_disableAreas),
+		OPCODE(21, o_directionalUpdate),
+		OPCODE(22, o_goToDest),
+		OPCODE(23, o_toggleAreasActivation),
+		OPCODE(24, o_playSound),
 		// Opcode 25 Not Present, original calls replaceSound
-		OPCODE(26, o_26_stopSoundBackground),
-		OPCODE(27, o_27_playSoundBlocking),
-		OPCODE(28, o_28_restoreDefaultRect),
-		OPCODE(29, o_29_33_blitRect),
-		OPCODE(30, o_30_changeSound),
-		OPCODE(31, o_31_soundPlaySwitch),
-		OPCODE(32, o_32_soundResumeBackground),
-		OPCODE(33, o_29_33_blitRect),
-		OPCODE(34, o_34_changeCard),
-		OPCODE(35, o_35_drawImageChangeCard),
-		OPCODE(36, o_36_changeMainCursor),
-		OPCODE(37, o_37_hideCursor),
-		OPCODE(38, o_38_showCursor),
-		OPCODE(39, o_39_delay),
-		OPCODE(40, o_40_changeStack),
-		OPCODE(41, o_41_changeCardPlaySoundDirectional),
-		OPCODE(42, o_42_directionalUpdatePlaySound),
-		OPCODE(43, o_43_saveMainCursor),
-		OPCODE(44, o_44_restoreMainCursor),
+		OPCODE(26, o_stopSoundBackground),
+		OPCODE(27, o_playSoundBlocking),
+		OPCODE(28, o_restoreDefaultRect),
+		OPCODE(29, o_blitRect),
+		OPCODE(30, o_changeSound),
+		OPCODE(31, o_soundPlaySwitch),
+		OPCODE(32, o_soundResumeBackground),
+		OPCODE(33, o_blitRect),
+		OPCODE(34, o_changeCard),
+		OPCODE(35, o_drawImageChangeCard),
+		OPCODE(36, o_changeMainCursor),
+		OPCODE(37, o_hideCursor),
+		OPCODE(38, o_showCursor),
+		OPCODE(39, o_delay),
+		OPCODE(40, o_changeStack),
+		OPCODE(41, o_changeCardPlaySoundDirectional),
+		OPCODE(42, o_directionalUpdatePlaySound),
+		OPCODE(43, o_saveMainCursor),
+		OPCODE(44, o_restoreMainCursor),
 		// Opcode 45 Not Present
-		OPCODE(46, o_46_soundWaitStop),
+		OPCODE(46, o_soundWaitStop),
 		// Opcodes 47 to 99 Not Present
 
 		OPCODE(0xFFFF, NOP)
@@ -279,7 +279,7 @@ void MystScriptParser::animatedUpdate(uint16 argc, uint16 *argv, uint16 delay) {
 		debugC(kDebugScript, "\tkind / direction: %d", kind);
 		debugC(kDebugScript, "\tsteps: %d", steps);
 
-		_vm->_gfx->animatedUpdate(kind, rect, steps, delay);
+		_vm->_gfx->runTransition(kind, rect, steps, delay);
 
 		argsRead += 6;
 	}
@@ -304,18 +304,18 @@ void MystScriptParser::NOP(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "NOP");
 }
 
-void MystScriptParser::o_0_toggleVar(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_toggleVar(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	toggleVar(var);
 	_vm->redrawArea(var);
 }
 
-void MystScriptParser::o_1_setVar(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_setVar(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	if (setVarValue(var, argv[0])) {
 		_vm->redrawArea(var);
 	}
 }
 
-void MystScriptParser::o_2_changeCardSwitch(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeCardSwitch(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	// Opcodes 2, 12, and 13 are the same
 	uint16 value = getVar(var);
 
@@ -329,7 +329,7 @@ void MystScriptParser::o_2_changeCardSwitch(uint16 op, uint16 var, uint16 argc,
 		warning("Missing invokingResource in altDest call");
 }
 
-void MystScriptParser::o_3_takePage(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_takePage(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	uint16 *game_globals = _vm->_saveLoad->_v->game_globals;
 
 	uint16 cursorId = argv[0];
@@ -341,7 +341,7 @@ void MystScriptParser::o_3_takePage(uint16 op, uint16 var, uint16 argc, uint16 *
 	toggleVar(var);
 
 	if (oldPage != game_globals[2]) {
-		_vm->_gfx->hideCursor();
+		_vm->_cursor->hideCursor();
 		_vm->redrawArea(var);
 
 		// Set new cursor
@@ -350,11 +350,11 @@ void MystScriptParser::o_3_takePage(uint16 op, uint16 var, uint16 argc, uint16 *
 		else
 			_vm->setMainCursor(kDefaultMystCursor);
 
-		_vm->_gfx->showCursor();
+		_vm->_cursor->showCursor();
 	}
 }
 
-void MystScriptParser::o_4_redrawCard(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_redrawCard(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Redraw card", op);
 
 	// TODO: Is redrawing the background correct ?
@@ -363,7 +363,7 @@ void MystScriptParser::o_4_redrawCard(uint16 op, uint16 var, uint16 argc, uint16
 	_vm->_gfx->updateScreen();
 }
 
-void MystScriptParser::o_6_goToDest(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_goToDest(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Change To Dest of Invoking Resource", op);
 
 	if (_invokingResource != NULL)
@@ -371,7 +371,7 @@ void MystScriptParser::o_6_goToDest(uint16 op, uint16 var, uint16 argc, uint16 *
 	else
 		warning("Opcode %d: Missing invokingResource", op);
 }
-void MystScriptParser::o_9_triggerMovie(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_triggerMovie(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Trigger Type 6 Resource Movie..", op);
 	// If movie has sound, pause background music
 
@@ -386,13 +386,13 @@ void MystScriptParser::o_9_triggerMovie(uint16 op, uint16 var, uint16 argc, uint
 	// If movie has sound, resume background music
 }
 
-void MystScriptParser::o_10_toggleVarNoRedraw(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_toggleVarNoRedraw(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: toggleVarNoRedraw", op);
 
 	toggleVar(var);
 }
 
-void MystScriptParser::o_14_drawAreaState(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_drawAreaState(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: drawAreaState, state: %d", op, argv[0]);
 	debugC(kDebugScript, "\tVar: %d", var);
 
@@ -400,14 +400,14 @@ void MystScriptParser::o_14_drawAreaState(uint16 op, uint16 var, uint16 argc, ui
 	parent->drawConditionalDataToScreen(argv[0]);
 }
 
-void MystScriptParser::o_15_redrawAreaForVar(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_redrawAreaForVar(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: dropPage", op);
 	debugC(kDebugScript, "\tvar: %d", var);
 
 	_vm->redrawArea(var);
 }
 
-void MystScriptParser::o_16_changeCardDirectional(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeCardDirectional(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 
 	// Used by Channelwood Card 3262 (In Elevator)
 	debugC(kDebugScript, "Opcode %d: Change Card with optional directional update", op);
@@ -430,7 +430,7 @@ void MystScriptParser::o_16_changeCardDirectional(uint16 op, uint16 var, uint16
 // TODO: The purpose of the optional argv[1] on Opcode 17 and argv[0]
 // on Opcode 18 which are always 4, 5 or 6 is unknown.
 
-void MystScriptParser::o_17_changeCardPush(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeCardPush(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	if (argc == 2) {
@@ -451,7 +451,7 @@ void MystScriptParser::o_17_changeCardPush(uint16 op, uint16 var, uint16 argc, u
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_18_changeCardPop(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeCardPop(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	if (argc == 1) {
@@ -466,7 +466,7 @@ void MystScriptParser::o_18_changeCardPop(uint16 op, uint16 var, uint16 argc, ui
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_19_enableAreas(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_enableAreas(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	if (argc > 0) {
@@ -486,7 +486,7 @@ void MystScriptParser::o_19_enableAreas(uint16 op, uint16 var, uint16 argc, uint
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_20_disableAreas(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_disableAreas(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	if (argc > 0) {
@@ -512,13 +512,13 @@ void MystScriptParser::o_20_disableAreas(uint16 op, uint16 var, uint16 argc, uin
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_21_directionalUpdate(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_directionalUpdate(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Transition / Directional update", op);
 
 	animatedUpdate(argc, argv, 0);
 }
 
-void MystScriptParser::o_23_toggleAreasActivation(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_toggleAreasActivation(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	if (argc > 0) {
 		debugC(kDebugScript, "Opcode %d: Toggle areas activation", op);
 
@@ -544,7 +544,7 @@ void MystScriptParser::o_23_toggleAreasActivation(uint16 op, uint16 var, uint16
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_24_playSound(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_playSound(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	if (argc == 1) {
@@ -558,12 +558,12 @@ void MystScriptParser::o_24_playSound(uint16 op, uint16 var, uint16 argc, uint16
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_26_stopSoundBackground(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_stopSoundBackground(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: stopSoundBackground", op);
 	//_vm->_sound->stopBackground();
 }
 
-void MystScriptParser::o_27_playSoundBlocking(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_playSoundBlocking(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	uint16 soundId = argv[0];
 
 	debugC(kDebugScript, "Opcode %d: playSoundBlocking", op);
@@ -572,7 +572,7 @@ void MystScriptParser::o_27_playSoundBlocking(uint16 op, uint16 var, uint16 argc
 	_vm->_sound->playSoundBlocking(soundId);
 }
 
-void MystScriptParser::o_28_restoreDefaultRect(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_restoreDefaultRect(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	Common::Rect rect;
@@ -603,7 +603,7 @@ void MystScriptParser::o_28_restoreDefaultRect(uint16 op, uint16 var, uint16 arg
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_29_33_blitRect(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_blitRect(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	// TODO: Opcode 29 called on Mechanical Card 6178 causes a engine
@@ -650,7 +650,7 @@ void MystScriptParser::o_29_33_blitRect(uint16 op, uint16 var, uint16 argc, uint
 //       Current behaviour here and with VIEW sound block is not right as demonstrated
 //       by Channelwood Card 3280 (Tank Valve) and water flow sound behaviour in pipe
 //       on cards leading from shed...
-void MystScriptParser::o_30_changeSound(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeSound(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	int16 *soundList = NULL;
@@ -730,7 +730,7 @@ void MystScriptParser::o_30_changeSound(uint16 op, uint16 var, uint16 argc, uint
 	soundListVolume = NULL;
 }
 
-void MystScriptParser::o_31_soundPlaySwitch(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_soundPlaySwitch(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Switch Choice of Play Sound", op);
 
 	uint16 value = getVar(var);
@@ -744,12 +744,12 @@ void MystScriptParser::o_31_soundPlaySwitch(uint16 op, uint16 var, uint16 argc,
 	}
 }
 
-void MystScriptParser::o_32_soundResumeBackground(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_soundResumeBackground(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: soundResumeBackground", op);
 	//_vm->_sound->resumeBackground();
 }
 
-void MystScriptParser::o_34_changeCard(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeCard(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Change Card", op);
 
 	uint16 cardId = argv[0];
@@ -763,7 +763,7 @@ void MystScriptParser::o_34_changeCard(uint16 op, uint16 var, uint16 argc, uint1
 	_vm->changeToCard(cardId, true);
 }
 
-void MystScriptParser::o_35_drawImageChangeCard(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_drawImageChangeCard(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	varUnusedCheck(op, var);
 
 	if (argc == 3) {
@@ -785,7 +785,7 @@ void MystScriptParser::o_35_drawImageChangeCard(uint16 op, uint16 var, uint16 ar
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_36_changeMainCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeMainCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Change main cursor", op);
 
 	uint16 cursorId = argv[0];
@@ -796,17 +796,17 @@ void MystScriptParser::o_36_changeMainCursor(uint16 op, uint16 var, uint16 argc,
 	_vm->_cursor->setCursor(cursorId);
 }
 
-void MystScriptParser::o_37_hideCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_hideCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Hide Cursor", op);
 	_vm->_cursor->hideCursor();
 }
 
-void MystScriptParser::o_38_showCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_showCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Show Cursor", op);
 	_vm->_cursor->showCursor();
 }
 
-void MystScriptParser::o_39_delay(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_delay(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	// Used on Mechanical Card 6327 (Elevator)
 	debugC(kDebugScript, "Opcode %d: Delay", op);
 
@@ -817,7 +817,7 @@ void MystScriptParser::o_39_delay(uint16 op, uint16 var, uint16 argc, uint16 *ar
 	_vm->_system->delayMillis(time);
 }
 
-void MystScriptParser::o_40_changeStack(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeStack(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	Audio::SoundHandle *handle;
 	varUnusedCheck(op, var);
 
@@ -880,7 +880,7 @@ void MystScriptParser::o_40_changeStack(uint16 op, uint16 var, uint16 argc, uint
 		unknown(op, var, argc, argv);
 }
 
-void MystScriptParser::o_41_changeCardPlaySoundDirectional(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_changeCardPlaySoundDirectional(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Play Sound, Change Card and Directional Update Screen Region", op);
 
 	uint16 cardId = argv[0];
@@ -901,7 +901,7 @@ void MystScriptParser::o_41_changeCardPlaySoundDirectional(uint16 op, uint16 var
 	animatedUpdate(dataSize, &argv[4], delayBetweenSteps);
 }
 
-void MystScriptParser::o_42_directionalUpdatePlaySound(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_directionalUpdatePlaySound(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Play Sound and Directional Update Screen Region", op);
 
 	uint16 soundId = argv[0];
@@ -918,25 +918,25 @@ void MystScriptParser::o_42_directionalUpdatePlaySound(uint16 op, uint16 var, ui
 	animatedUpdate(dataSize, &argv[3], delayBetweenSteps);
 }
 
-void MystScriptParser::o_43_saveMainCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_saveMainCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Save main cursor", op);
 
 	_savedCursorId = _vm->getMainCursor();
 }
 
-void MystScriptParser::o_44_restoreMainCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_restoreMainCursor(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Restore main cursor", op);
 
 	_vm->setMainCursor(_savedCursorId);
 }
 
-void MystScriptParser::o_46_soundWaitStop(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser::o_soundWaitStop(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	// Used on Selenitic Card 1191 (Maze Runner)
 	// Used on Mechanical Card 6267 (Code Lock)
 	// Used when Button is pushed...
 	debugC(kDebugScript, "Opcode %d: Wait for foreground sound to finish", op);
 
-	//TODO: Implement
+	// TODO: Implement
 }
 
 } // End of namespace Mohawk
diff --git a/engines/mohawk/myst_scripts.h b/engines/mohawk/myst_scripts.h
index 9be9113393..6d805ebd37 100644
--- a/engines/mohawk/myst_scripts.h
+++ b/engines/mohawk/myst_scripts.h
@@ -80,43 +80,43 @@ public:
 
 	DECLARE_OPCODE(unknown);
 
-	DECLARE_OPCODE(o_0_toggleVar);
-	DECLARE_OPCODE(o_1_setVar);
-	DECLARE_OPCODE(o_2_changeCardSwitch);
-	DECLARE_OPCODE(o_3_takePage);
-	DECLARE_OPCODE(o_4_redrawCard);
-	DECLARE_OPCODE(o_6_goToDest);
-	DECLARE_OPCODE(o_9_triggerMovie);
-	DECLARE_OPCODE(o_10_toggleVarNoRedraw);
-	DECLARE_OPCODE(o_14_drawAreaState);
-	DECLARE_OPCODE(o_15_redrawAreaForVar);
-	DECLARE_OPCODE(o_16_changeCardDirectional);
-	DECLARE_OPCODE(o_17_changeCardPush);
-	DECLARE_OPCODE(o_18_changeCardPop);
-	DECLARE_OPCODE(o_19_enableAreas);
-	DECLARE_OPCODE(o_20_disableAreas);
-	DECLARE_OPCODE(o_21_directionalUpdate);
-	DECLARE_OPCODE(o_23_toggleAreasActivation);
-	DECLARE_OPCODE(o_24_playSound);
-	DECLARE_OPCODE(o_26_stopSoundBackground);
-	DECLARE_OPCODE(o_27_playSoundBlocking);
-	DECLARE_OPCODE(o_28_restoreDefaultRect);
-	DECLARE_OPCODE(o_29_33_blitRect);
-	DECLARE_OPCODE(o_30_changeSound);
-	DECLARE_OPCODE(o_31_soundPlaySwitch);
-	DECLARE_OPCODE(o_32_soundResumeBackground);
-	DECLARE_OPCODE(o_34_changeCard);
-	DECLARE_OPCODE(o_35_drawImageChangeCard);
-	DECLARE_OPCODE(o_36_changeMainCursor);
-	DECLARE_OPCODE(o_37_hideCursor);
-	DECLARE_OPCODE(o_38_showCursor);
-	DECLARE_OPCODE(o_39_delay);
-	DECLARE_OPCODE(o_40_changeStack);
-	DECLARE_OPCODE(o_41_changeCardPlaySoundDirectional);
-	DECLARE_OPCODE(o_42_directionalUpdatePlaySound);
-	DECLARE_OPCODE(o_43_saveMainCursor);
-	DECLARE_OPCODE(o_44_restoreMainCursor);
-	DECLARE_OPCODE(o_46_soundWaitStop);
+	DECLARE_OPCODE(o_toggleVar);
+	DECLARE_OPCODE(o_setVar);
+	DECLARE_OPCODE(o_changeCardSwitch);
+	DECLARE_OPCODE(o_takePage);
+	DECLARE_OPCODE(o_redrawCard);
+	DECLARE_OPCODE(o_goToDest);
+	DECLARE_OPCODE(o_triggerMovie);
+	DECLARE_OPCODE(o_toggleVarNoRedraw);
+	DECLARE_OPCODE(o_drawAreaState);
+	DECLARE_OPCODE(o_redrawAreaForVar);
+	DECLARE_OPCODE(o_changeCardDirectional);
+	DECLARE_OPCODE(o_changeCardPush);
+	DECLARE_OPCODE(o_changeCardPop);
+	DECLARE_OPCODE(o_enableAreas);
+	DECLARE_OPCODE(o_disableAreas);
+	DECLARE_OPCODE(o_directionalUpdate);
+	DECLARE_OPCODE(o_toggleAreasActivation);
+	DECLARE_OPCODE(o_playSound);
+	DECLARE_OPCODE(o_stopSoundBackground);
+	DECLARE_OPCODE(o_playSoundBlocking);
+	DECLARE_OPCODE(o_restoreDefaultRect);
+	DECLARE_OPCODE(o_blitRect);
+	DECLARE_OPCODE(o_changeSound);
+	DECLARE_OPCODE(o_soundPlaySwitch);
+	DECLARE_OPCODE(o_soundResumeBackground);
+	DECLARE_OPCODE(o_changeCard);
+	DECLARE_OPCODE(o_drawImageChangeCard);
+	DECLARE_OPCODE(o_changeMainCursor);
+	DECLARE_OPCODE(o_hideCursor);
+	DECLARE_OPCODE(o_showCursor);
+	DECLARE_OPCODE(o_delay);
+	DECLARE_OPCODE(o_changeStack);
+	DECLARE_OPCODE(o_changeCardPlaySoundDirectional);
+	DECLARE_OPCODE(o_directionalUpdatePlaySound);
+	DECLARE_OPCODE(o_saveMainCursor);
+	DECLARE_OPCODE(o_restoreMainCursor);
+	DECLARE_OPCODE(o_soundWaitStop);
 
 	DECLARE_OPCODE(NOP);
 
diff --git a/engines/mohawk/myst_scripts_myst.cpp b/engines/mohawk/myst_scripts_myst.cpp
index f63aa839d4..92054e540e 100644
--- a/engines/mohawk/myst_scripts_myst.cpp
+++ b/engines/mohawk/myst_scripts_myst.cpp
@@ -58,53 +58,53 @@ void MystScriptParser_Myst::setupOpcodes() {
 
 	static const MystOpcode myst_opcodes[] = {
 		// "Standard" Opcodes
-		OPCODE(0, o_0_toggleVar),
-		OPCODE(1, o_1_setVar),
-		OPCODE(2, o_2_changeCardSwitch),
-		OPCODE(3, o_3_takePage),
-		OPCODE(4, o_4_redrawCard),
+		OPCODE(0, o_toggleVar),
+		OPCODE(1, o_setVar),
+		OPCODE(2, o_changeCardSwitch),
+		OPCODE(3, o_takePage),
+		OPCODE(4, o_redrawCard),
 		// TODO: Opcode 5 Not Present
-		OPCODE(6, o_6_goToDest),
-		OPCODE(7, o_6_goToDest),
-		OPCODE(8, o_6_goToDest),
-		OPCODE(9, o_9_triggerMovie),
-		OPCODE(10, o_10_toggleVarNoRedraw),
+		OPCODE(6, o_goToDest),
+		OPCODE(7, o_goToDest),
+		OPCODE(8, o_goToDest),
+		OPCODE(9, o_triggerMovie),
+		OPCODE(10, o_toggleVarNoRedraw),
 		// TODO: Opcode 10 to 11 Not Present
-		OPCODE(12, o_2_changeCardSwitch),
-		OPCODE(13, o_2_changeCardSwitch),
-		OPCODE(14, o_14_drawAreaState),
-		OPCODE(15, o_15_redrawAreaForVar),
-		OPCODE(16, o_16_changeCardDirectional),
-		OPCODE(17, o_17_changeCardPush),
-		OPCODE(18, o_18_changeCardPop),
-		OPCODE(19, o_19_enableAreas),
-		OPCODE(20, o_20_disableAreas),
-		OPCODE(21, o_21_directionalUpdate),
-		OPCODE(22, o_6_goToDest),
-		OPCODE(23, o_23_toggleAreasActivation),
-		OPCODE(24, o_24_playSound),
+		OPCODE(12, o_changeCardSwitch),
+		OPCODE(13, o_changeCardSwitch),
+		OPCODE(14, o_drawAreaState),
+		OPCODE(15, o_redrawAreaForVar),
+		OPCODE(16, o_changeCardDirectional),
+		OPCODE(17, o_changeCardPush),
+		OPCODE(18, o_changeCardPop),
+		OPCODE(19, o_enableAreas),
+		OPCODE(20, o_disableAreas),
+		OPCODE(21, o_directionalUpdate),
+		OPCODE(22, o_goToDest),
+		OPCODE(23, o_toggleAreasActivation),
+		OPCODE(24, o_playSound),
 		// TODO: Opcode 25 Not Present
-		OPCODE(26, o_26_stopSoundBackground),
-		OPCODE(27, o_27_playSoundBlocking),
-		OPCODE(28, o_28_restoreDefaultRect),
-		OPCODE(29, o_29_33_blitRect),
-		OPCODE(30, o_30_changeSound),
-		OPCODE(31, o_31_soundPlaySwitch),
-		OPCODE(32, o_32_soundResumeBackground),
-		OPCODE(33, o_29_33_blitRect),
-		OPCODE(34, o_34_changeCard),
-		OPCODE(35, o_35_drawImageChangeCard),
-		OPCODE(36, o_36_changeMainCursor),
-		OPCODE(37, o_37_hideCursor),
-		OPCODE(38, o_38_showCursor),
-		OPCODE(39, o_39_delay),
-		OPCODE(40, o_40_changeStack),
-		OPCODE(41, o_41_changeCardPlaySoundDirectional),
-		OPCODE(42, o_42_directionalUpdatePlaySound),
-		OPCODE(43, o_43_saveMainCursor),
-		OPCODE(44, o_44_restoreMainCursor),
+		OPCODE(26, o_stopSoundBackground),
+		OPCODE(27, o_playSoundBlocking),
+		OPCODE(28, o_restoreDefaultRect),
+		OPCODE(29, o_blitRect),
+		OPCODE(30, o_changeSound),
+		OPCODE(31, o_soundPlaySwitch),
+		OPCODE(32, o_soundResumeBackground),
+		OPCODE(33, o_blitRect),
+		OPCODE(34, o_changeCard),
+		OPCODE(35, o_drawImageChangeCard),
+		OPCODE(36, o_changeMainCursor),
+		OPCODE(37, o_hideCursor),
+		OPCODE(38, o_showCursor),
+		OPCODE(39, o_delay),
+		OPCODE(40, o_changeStack),
+		OPCODE(41, o_changeCardPlaySoundDirectional),
+		OPCODE(42, o_directionalUpdatePlaySound),
+		OPCODE(43, o_saveMainCursor),
+		OPCODE(44, o_restoreMainCursor),
 		// TODO: Opcode 45 Not Present
-		OPCODE(46, o_46_soundWaitStop),
+		OPCODE(46, o_soundWaitStop),
 		// TODO: Opcodes 47 to 99 Not Present
 
 		// "Stack-Specific" Opcodes
diff --git a/engines/mohawk/myst_scripts_selenitic.cpp b/engines/mohawk/myst_scripts_selenitic.cpp
index be9adf17ef..35896d4a8f 100644
--- a/engines/mohawk/myst_scripts_selenitic.cpp
+++ b/engines/mohawk/myst_scripts_selenitic.cpp
@@ -42,7 +42,7 @@ namespace Mohawk {
 MystScriptParser_Selenitic::MystScriptParser_Selenitic(MohawkEngine_Myst *vm) : MystScriptParser(vm) {
 	setupOpcodes();
 	_invokingResource = NULL;
-	_maze_runner_position = 288;
+	_mazeRunnerPosition = 288;
 }
 
 MystScriptParser_Selenitic::~MystScriptParser_Selenitic() {
@@ -54,83 +54,83 @@ void MystScriptParser_Selenitic::setupOpcodes() {
 
 	static const MystOpcode myst_opcodes[] = {
 		// "Standard" Opcodes
-		OPCODE(0, o_0_toggleVar),
-		OPCODE(1, o_1_setVar),
-		OPCODE(2, o_2_changeCardSwitch),
-		OPCODE(3, o_3_takePage),
-		OPCODE(4, o_4_redrawCard),
+		OPCODE(0, o_toggleVar),
+		OPCODE(1, o_setVar),
+		OPCODE(2, o_changeCardSwitch),
+		OPCODE(3, o_takePage),
+		OPCODE(4, o_redrawCard),
 		// TODO: Opcode 5 Not Present
-		OPCODE(6, o_6_goToDest),
-		OPCODE(7, o_6_goToDest),
-		OPCODE(8, o_6_goToDest),
-		OPCODE(9, o_9_triggerMovie),
-		OPCODE(10, o_10_toggleVarNoRedraw),
+		OPCODE(6, o_goToDest),
+		OPCODE(7, o_goToDest),
+		OPCODE(8, o_goToDest),
+		OPCODE(9, o_triggerMovie),
+		OPCODE(10, o_toggleVarNoRedraw),
 		// TODO: Opcode 10 to 11 Not Present
-		OPCODE(12, o_2_changeCardSwitch),
-		OPCODE(13, o_2_changeCardSwitch),
-		OPCODE(14, o_14_drawAreaState),
-		OPCODE(15, o_15_redrawAreaForVar),
-		OPCODE(16, o_16_changeCardDirectional),
-		OPCODE(17, o_17_changeCardPush),
-		OPCODE(18, o_18_changeCardPop),
-		OPCODE(19, o_19_enableAreas),
-		OPCODE(20, o_20_disableAreas),
-		OPCODE(21, o_21_directionalUpdate),
-		OPCODE(22, o_6_goToDest),
-		OPCODE(23, o_23_toggleAreasActivation),
-		OPCODE(24, o_24_playSound),
+		OPCODE(12, o_changeCardSwitch),
+		OPCODE(13, o_changeCardSwitch),
+		OPCODE(14, o_drawAreaState),
+		OPCODE(15, o_redrawAreaForVar),
+		OPCODE(16, o_changeCardDirectional),
+		OPCODE(17, o_changeCardPush),
+		OPCODE(18, o_changeCardPop),
+		OPCODE(19, o_enableAreas),
+		OPCODE(20, o_disableAreas),
+		OPCODE(21, o_directionalUpdate),
+		OPCODE(22, o_goToDest),
+		OPCODE(23, o_toggleAreasActivation),
+		OPCODE(24, o_playSound),
 		// TODO: Opcode 25 Not Present
-		OPCODE(26, o_26_stopSoundBackground),
-		OPCODE(27, o_27_playSoundBlocking),
-		OPCODE(28, o_28_restoreDefaultRect),
-		OPCODE(29, o_29_33_blitRect),
-		OPCODE(30, o_30_changeSound),
-		OPCODE(31, o_31_soundPlaySwitch),
-		OPCODE(32, o_32_soundResumeBackground),
-		OPCODE(33, o_29_33_blitRect),
-		OPCODE(34, o_34_changeCard),
-		OPCODE(35, o_35_drawImageChangeCard),
-		OPCODE(36, o_36_changeMainCursor),
-		OPCODE(37, o_37_hideCursor),
-		OPCODE(38, o_38_showCursor),
-		OPCODE(39, o_39_delay),
-		OPCODE(40, o_40_changeStack),
-		OPCODE(41, o_41_changeCardPlaySoundDirectional),
-		OPCODE(42, o_42_directionalUpdatePlaySound),
-		OPCODE(43, o_43_saveMainCursor),
-		OPCODE(44, o_44_restoreMainCursor),
+		OPCODE(26, o_stopSoundBackground),
+		OPCODE(27, o_playSoundBlocking),
+		OPCODE(28, o_restoreDefaultRect),
+		OPCODE(29, o_blitRect),
+		OPCODE(30, o_changeSound),
+		OPCODE(31, o_soundPlaySwitch),
+		OPCODE(32, o_soundResumeBackground),
+		OPCODE(33, o_blitRect),
+		OPCODE(34, o_changeCard),
+		OPCODE(35, o_drawImageChangeCard),
+		OPCODE(36, o_changeMainCursor),
+		OPCODE(37, o_hideCursor),
+		OPCODE(38, o_showCursor),
+		OPCODE(39, o_delay),
+		OPCODE(40, o_changeStack),
+		OPCODE(41, o_changeCardPlaySoundDirectional),
+		OPCODE(42, o_directionalUpdatePlaySound),
+		OPCODE(43, o_saveMainCursor),
+		OPCODE(44, o_restoreMainCursor),
 		// TODO: Opcode 45 Not Present
-		OPCODE(46, o_46_soundWaitStop),
+		OPCODE(46, o_soundWaitStop),
 		// TODO: Opcodes 47 to 99 Not Present
 
 		// "Stack-Specific" Opcodes
-		SPECIFIC_OPCODE(100, o_100_mazeRunnerMove),
-		SPECIFIC_OPCODE(101, o_101_mazeRunnerSoundRepeat),
-		SPECIFIC_OPCODE(102, o_102_soundReceiverSigma),
-		SPECIFIC_OPCODE(103, o_103_soundReceiverRight),
-		SPECIFIC_OPCODE(104, o_104_soundReceiverLeft),
-		SPECIFIC_OPCODE(105, o_105_109_soundReceiverSource),
-		SPECIFIC_OPCODE(106, o_105_109_soundReceiverSource),
-		SPECIFIC_OPCODE(107, o_105_109_soundReceiverSource),
-		SPECIFIC_OPCODE(108, o_105_109_soundReceiverSource),
-		SPECIFIC_OPCODE(109, o_105_109_soundReceiverSource),
-		SPECIFIC_OPCODE(110, o_110_mazeRunnerDoorButton),
-		SPECIFIC_OPCODE(111, o_111_soundReceiverUpdateSound),
-		SPECIFIC_OPCODE(112, o_112_soundLockMove),
-		SPECIFIC_OPCODE(113, o_113_soundLockStartMove),
-		SPECIFIC_OPCODE(114, o_114_soundLockEndMove),
-		SPECIFIC_OPCODE(115, o_115_soundLockButton),
+		SPECIFIC_OPCODE(100, o_mazeRunnerMove),
+		SPECIFIC_OPCODE(101, o_mazeRunnerSoundRepeat),
+		SPECIFIC_OPCODE(102, o_soundReceiverSigma),
+		SPECIFIC_OPCODE(103, o_soundReceiverRight),
+		SPECIFIC_OPCODE(104, o_soundReceiverLeft),
+		SPECIFIC_OPCODE(105, o_soundReceiverSource),
+		SPECIFIC_OPCODE(106, o_soundReceiverSource),
+		SPECIFIC_OPCODE(107, o_soundReceiverSource),
+		SPECIFIC_OPCODE(108, o_soundReceiverSource),
+		SPECIFIC_OPCODE(109, o_soundReceiverSource),
+		SPECIFIC_OPCODE(110, o_mazeRunnerDoorButton),
+		SPECIFIC_OPCODE(111, o_soundReceiverUpdateSound),
+		SPECIFIC_OPCODE(112, o_soundLockMove),
+		SPECIFIC_OPCODE(113, o_soundLockStartMove),
+		SPECIFIC_OPCODE(114, o_soundLockEndMove),
+		SPECIFIC_OPCODE(115, o_soundLockButton),
 		SPECIFIC_OPCODE(116, NOP),
-		SPECIFIC_OPCODE(117, o_117_soundReceiverEndMove),
+		SPECIFIC_OPCODE(117, o_soundReceiverEndMove),
 
 		// "Init" Opcodes
-		SPECIFIC_OPCODE(200, o_200_mazeRunnerCompass_init),
-		SPECIFIC_OPCODE(201, o_201_mazeRunnerWindow_init),
-		SPECIFIC_OPCODE(202, o_202_mazeRunnerLight_init),
-		SPECIFIC_OPCODE(203, o_203_soundReceiver_init),
-		SPECIFIC_OPCODE(204, o_204_soundLock_init),
-		SPECIFIC_OPCODE(205, o_205_mazeRunnerRight_init),
-		SPECIFIC_OPCODE(206, o_206_mazeRunnerLeft_init),
+		SPECIFIC_OPCODE(200, o_mazeRunnerCompass_init),
+		SPECIFIC_OPCODE(201, o_mazeRunnerWindow_init),
+		SPECIFIC_OPCODE(202, o_mazeRunnerLight_init),
+		SPECIFIC_OPCODE(203, o_soundReceiver_init),
+		SPECIFIC_OPCODE(204, o_soundLock_init),
+		SPECIFIC_OPCODE(205, o_mazeRunnerRight_init),
+		SPECIFIC_OPCODE(206, o_mazeRunnerLeft_init),
 
 		OPCODE(0xFFFF, NOP)
 	};
@@ -140,12 +140,12 @@ void MystScriptParser_Selenitic::setupOpcodes() {
 }
 
 void MystScriptParser_Selenitic::disablePersistentScripts() {
-	_sound_receiver_running = false;
+	_soundReceiverRunning = false;
 }
 
 void MystScriptParser_Selenitic::runPersistentScripts() {
-	if (_sound_receiver_running)
-		o_203_soundReceiver_run();
+	if (_soundReceiverRunning)
+		soundReceiver_run();
 }
 
 uint16 MystScriptParser_Selenitic::getVar(uint16 var) {
@@ -153,12 +153,12 @@ uint16 MystScriptParser_Selenitic::getVar(uint16 var) {
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
 
 	switch(var) {
-    case 0: // Sound receiver emitters enabled
-    	return selenitic_vars[4];
+	case 0: // Sound receiver emitters enabled
+		return selenitic_vars[4];
 	case 1:
 		return selenitic_vars[1];
-    case 2:
-    	return selenitic_vars[2];
+	case 2:
+		return selenitic_vars[2];
 	case 3:
 		return selenitic_vars[0];
 	case 4:
@@ -167,57 +167,57 @@ uint16 MystScriptParser_Selenitic::getVar(uint16 var) {
 		return selenitic_vars[5];
 	case 6: // Tunnel lights
 		return selenitic_vars[6];
-    case 7:// Maze runner display
-    	if (_maze_runner_position == 288) {
-    		return 0;
-    	} else if (_maze_runner_position == 289) {
-    		return 1;
-    	} else if (!mazeRunnerForwardAllowed(_maze_runner_position)) {
-    		return 2;
-    	} else {
-    		return 3;
-    	}
-    case 8: // Viewer
-    	return 0;
-    case 9: // Sound receiver selected source
-    	return selenitic_vars[7] == 0;
+	case 7:// Maze runner display
+		if (_mazeRunnerPosition == 288) {
+			return 0;
+		} else if (_mazeRunnerPosition == 289) {
+			return 1;
+		} else if (!mazeRunnerForwardAllowed(_mazeRunnerPosition)) {
+			return 2;
+		} else {
+			return 3;
+		}
+	case 8: // Viewer
+		return 0;
+	case 9: // Sound receiver selected source
+		return selenitic_vars[7] == 0;
 	case 10:
 		return selenitic_vars[7] == 1;
-    case 11:
-    	return selenitic_vars[7] == 2;
-    case 12:
-    	return selenitic_vars[7] == 3;
-    case 13:
-    	return selenitic_vars[7] == 4;
+	case 11:
+		return selenitic_vars[7] == 2;
+	case 12:
+		return selenitic_vars[7] == 3;
+	case 13:
+		return selenitic_vars[7] == 4;
 	case 14: // Sound receiver position
-		return (*_sound_receiver_position) / 1000;
+		return (*_soundReceiverPosition) / 1000;
 	case 15:
-		return ((*_sound_receiver_position) / 100) % 10;
+		return ((*_soundReceiverPosition) / 100) % 10;
 	case 16:
-		return ((*_sound_receiver_position) / 10) % 10;
+		return ((*_soundReceiverPosition) / 10) % 10;
 	case 17:
-		return (*_sound_receiver_position) % 10;
-    case 20: // Sound lock sliders state
-    case 21:
-    case 22:
-    case 23:
-    case 24:
-    	return 1;
-    case 25: // Maze runner direction
-    	return _maze_runner_direction;
+		return (*_soundReceiverPosition) % 10;
+	case 20: // Sound lock sliders state
+	case 21:
+	case 22:
+	case 23:
+	case 24:
+		return 1;
+	case 25: // Maze runner direction
+		return _mazeRunnerDirection;
 	case 26:
-		return _sound_receiver_sigma_pressed;
+		return _soundReceiverSigmaPressed;
 	case 27:
 	case 29: // Maze runner door
 		return 0;
 	case 30:
-		return _maze_runner_door_opened;
+		return _mazeRunnerDoorOpened;
 	case 31: // Maze runner forward allowed
-		return mazeRunnerForwardAllowed(_maze_runner_position) || _maze_runner_position == 288;
+		return mazeRunnerForwardAllowed(_mazeRunnerPosition) || _mazeRunnerPosition == 288;
 	case 32: // Maze runner exit allowed
-		return _maze_runner_position != 288 && _maze_runner_position != 289;
+		return _mazeRunnerPosition != 288 && _mazeRunnerPosition != 289;
 	case 33: // Maze runner at entry
-		return _maze_runner_position != 288;
+		return _mazeRunnerPosition != 288;
 	case 102: // Red page
 		return !(game_globals[6] & 2) && (game_globals[2] != 8);
 	case 103: // Blue page
@@ -232,43 +232,41 @@ void MystScriptParser_Selenitic::toggleVar(uint16 var) {
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
 
 	switch(var) {
-    case 0: // Sound receiver emitters enabled
-    	selenitic_vars[4] = (selenitic_vars[4] + 1) % 2;
-    	break;
+	case 0: // Sound receiver emitters enabled
+		selenitic_vars[4] = (selenitic_vars[4] + 1) % 2;
+		break;
 	case 1:
 		selenitic_vars[1] = (selenitic_vars[1] + 1) % 2;
-    	break;
-    case 2:
-    	selenitic_vars[2] = (selenitic_vars[2] + 1) % 2;
-    	break;
+		break;
+	case 2:
+		selenitic_vars[2] = (selenitic_vars[2] + 1) % 2;
+		break;
 	case 3:
 		selenitic_vars[0] = (selenitic_vars[0] + 1) % 2;
-    	break;
+		break;
 	case 4:
 		selenitic_vars[3] = (selenitic_vars[3] + 1) % 2;
-    	break;
+		break;
 	case 5: // Sound receiver opened
 		selenitic_vars[5] = (selenitic_vars[5] + 1) % 2;
-    	break;
+		break;
 	case 6: // Tunnel lights
 		selenitic_vars[6] = (selenitic_vars[6] + 1) % 2;
-    	break;
+		break;
 	case 102: // Red page
-        if (!(game_globals[6] & 2)) {
+		if (!(game_globals[6] & 2)) {
 			if (game_globals[2] == 8)
 				game_globals[2] = 0;
 			else {
-				//TODO: Cursor animation
 				game_globals[2] = 8;
 			}
 		}
 		break;
 	case 103: // Blue page
-        if (!(game_globals[7] & 2)) {
+		if (!(game_globals[7] & 2)) {
 			if (game_globals[2] == 2)
 				game_globals[2] = 0;
 			else {
-				//TODO: Cursor animation
 				game_globals[2] = 2;
 			}
 		}
@@ -284,48 +282,48 @@ bool MystScriptParser_Selenitic::setVarValue(uint16 var, uint16 value) {
 	bool refresh = false;
 
 	switch (var) {
-    case 0: // Sound receiver emitters enabled
-    	if (selenitic_vars[4] != value) {
-    		selenitic_vars[4] = value;
-    		refresh = true;
-    	}
-    	break;
+	case 0: // Sound receiver emitters enabled
+		if (selenitic_vars[4] != value) {
+			selenitic_vars[4] = value;
+			refresh = true;
+		}
+		break;
 	case 1:
-    	if (selenitic_vars[1] != value) {
-    		selenitic_vars[1] = value;
-    		refresh = true;
-    	}
-    	break;
-    case 2:
-    	if (selenitic_vars[2] != value) {
-    		selenitic_vars[2] = value;
-    		refresh = true;
-    	}
-    	break;
+		if (selenitic_vars[1] != value) {
+			selenitic_vars[1] = value;
+			refresh = true;
+		}
+		break;
+	case 2:
+		if (selenitic_vars[2] != value) {
+			selenitic_vars[2] = value;
+			refresh = true;
+		}
+		break;
 	case 3:
-    	if (selenitic_vars[0] != value) {
-    		selenitic_vars[0] = value;
-    		refresh = true;
-    	}
-    	break;
+		if (selenitic_vars[0] != value) {
+			selenitic_vars[0] = value;
+			refresh = true;
+		}
+		break;
 	case 4:
-    	if (selenitic_vars[3] != value) {
-    		selenitic_vars[3] = value;
-    		refresh = true;
-    	}
-    	break;
+		if (selenitic_vars[3] != value) {
+			selenitic_vars[3] = value;
+			refresh = true;
+		}
+		break;
 	case 5: // Sound receiver opened
-    	if (selenitic_vars[5] != value) {
-    		selenitic_vars[5] = value;
-    		refresh = true;
-    	}
-    	break;
+		if (selenitic_vars[5] != value) {
+			selenitic_vars[5] = value;
+			refresh = true;
+		}
+		break;
 	case 6: // Tunnel lights
-    	if (selenitic_vars[6] != value) {
-    		selenitic_vars[6] = value;
-    		refresh = true;
-    	}
-    	break;
+		if (selenitic_vars[6] != value) {
+			selenitic_vars[6] = value;
+			refresh = true;
+		}
+		break;
 	case 20: // Sound lock sliders
 		selenitic_vars[13] = value;
 		break;
@@ -342,7 +340,7 @@ bool MystScriptParser_Selenitic::setVarValue(uint16 var, uint16 value) {
 		selenitic_vars[17] = value;
 		break;
 	case 30:
-		_maze_runner_door_opened = value;
+		_mazeRunnerDoorOpened = value;
 		break;
 	default:
 		refresh = MystScriptParser::setVarValue(var, value);
@@ -352,15 +350,15 @@ bool MystScriptParser_Selenitic::setVarValue(uint16 var, uint16 value) {
 	return refresh;
 }
 
-void MystScriptParser_Selenitic::o_100_mazeRunnerMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	uint16 oldPosition = _maze_runner_position;
+void MystScriptParser_Selenitic::o_mazeRunnerMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	uint16 oldPosition = _mazeRunnerPosition;
 	uint16 move = var;
 
-	uint16 videoToNext = _mazeRunnerVideos[_maze_runner_position][move];
-	_maze_runner_position = _mazeRunnerMap[_maze_runner_position][move];
+	uint16 videoToNext = _mazeRunnerVideos[_mazeRunnerPosition][move];
+	_mazeRunnerPosition = _mazeRunnerMap[_mazeRunnerPosition][move];
 
 	if (videoToNext) {
-		_maze_runner_compass->drawConditionalDataToScreen(8);
+		_mazeRunnerCompass->drawConditionalDataToScreen(8);
 
 		mazeRunnerPlayVideo(videoToNext, oldPosition);
 		mazeRunnerUpdateCompass();
@@ -381,7 +379,7 @@ void MystScriptParser_Selenitic::mazeRunnerPlayVideo(uint16 video, uint16 pos) {
 		file = _vm->wrapMovieFilename("forwe0", kSeleniticStack);
 		break;
 	case 3:
-		if (mazeRunnerForwardAllowed(_maze_runner_position)) {
+		if (mazeRunnerForwardAllowed(_mazeRunnerPosition)) {
 			file = _vm->wrapMovieFilename("forwf1", kSeleniticStack);
 		} else {
 			file = _vm->wrapMovieFilename("forwf0", kSeleniticStack);
@@ -412,35 +410,35 @@ void MystScriptParser_Selenitic::mazeRunnerPlayVideo(uint16 video, uint16 pos) {
 		file = _vm->wrapMovieFilename("right11", kSeleniticStack);
 		break;
 	case 12:
-		if (mazeRunnerForwardAllowed(_maze_runner_position)) {
+		if (mazeRunnerForwardAllowed(_mazeRunnerPosition)) {
 			file = _vm->wrapMovieFilename("forwo1", kSeleniticStack);
 		} else {
 			file = _vm->wrapMovieFilename("forwo0", kSeleniticStack);
 		}
 		break;
 	case 13:
-		if (mazeRunnerForwardAllowed(_maze_runner_position)) {
+		if (mazeRunnerForwardAllowed(_mazeRunnerPosition)) {
 			file = _vm->wrapMovieFilename("forwp1", kSeleniticStack);
 		} else {
 			file = _vm->wrapMovieFilename("forwp0", kSeleniticStack);
 		}
 		break;
 	case 14:
-		if (mazeRunnerForwardAllowed(_maze_runner_position)) {
+		if (mazeRunnerForwardAllowed(_mazeRunnerPosition)) {
 			file = _vm->wrapMovieFilename("forws1", kSeleniticStack);
 		} else {
 			file = _vm->wrapMovieFilename("forws0", kSeleniticStack);
 		}
 		break;
 	case 15:
-		if (mazeRunnerForwardAllowed(_maze_runner_position)) {
+		if (mazeRunnerForwardAllowed(_mazeRunnerPosition)) {
 			file = _vm->wrapMovieFilename("forwr1", kSeleniticStack);
 		} else {
 			file = _vm->wrapMovieFilename("forwr0", kSeleniticStack);
 		}
 		break;
 	case 16:
-		if (mazeRunnerForwardAllowed(_maze_runner_position)) {
+		if (mazeRunnerForwardAllowed(_mazeRunnerPosition)) {
 			file = _vm->wrapMovieFilename("forwl1", kSeleniticStack);
 		} else {
 			file = _vm->wrapMovieFilename("forwl0", kSeleniticStack);
@@ -497,18 +495,18 @@ void MystScriptParser_Selenitic::mazeRunnerPlayVideo(uint16 video, uint16 pos) {
 	}
 
 	if (file != "") {
-		const Common::Rect &dest = _maze_runner_window->getRect();
+		const Common::Rect &dest = _mazeRunnerWindow->getRect();
 		_vm->_video->playMovie(file, dest.left, dest.top, false);
 	}
 }
 
 void MystScriptParser_Selenitic::mazeRunnerUpdateCompass() {
-	if (_maze_runner_position == 288 || _maze_runner_position == 289) {
-		_maze_runner_direction = 8;
+	if (_mazeRunnerPosition == 288 || _mazeRunnerPosition == 289) {
+		_mazeRunnerDirection = 8;
 	} else {
-		_maze_runner_direction = _maze_runner_position % 8;
+		_mazeRunnerDirection = _mazeRunnerPosition % 8;
 	}
-	_maze_runner_compass->drawConditionalDataToScreen(_maze_runner_direction);
+	_mazeRunnerCompass->drawConditionalDataToScreen(_mazeRunnerDirection);
 }
 
 bool MystScriptParser_Selenitic::mazeRunnerForwardAllowed(uint16 position) {
@@ -519,57 +517,57 @@ bool MystScriptParser_Selenitic::mazeRunnerForwardAllowed(uint16 position) {
 void MystScriptParser_Selenitic::mazeRunnerPlaySoundHelp() {
 	uint16 soundId = 0;
 
-	_maze_runner_light->drawConditionalDataToScreen(1);
+	_mazeRunnerLight->drawConditionalDataToScreen(1);
 
-	if (_maze_runner_position >= 272)
+	if (_mazeRunnerPosition >= 272)
 		soundId = 0;
-	else if (_maze_runner_position >= 264)
+	else if (_mazeRunnerPosition >= 264)
 		soundId =  8191;
-	else if (_maze_runner_position >= 256)
+	else if (_mazeRunnerPosition >= 256)
 		soundId = 0;
-	else if (_maze_runner_position >= 248)
+	else if (_mazeRunnerPosition >= 248)
 		soundId =  5191;
-	else if (_maze_runner_position >= 232)
+	else if (_mazeRunnerPosition >= 232)
 		soundId = 0;
-	else if (_maze_runner_position >= 224)
+	else if (_mazeRunnerPosition >= 224)
 		soundId =  5191;
-	else if (_maze_runner_position >= 216)
+	else if (_mazeRunnerPosition >= 216)
 		soundId = 0;
-	else if (_maze_runner_position >= 208)
+	else if (_mazeRunnerPosition >= 208)
 		soundId =  5191;
-	else if (_maze_runner_position >= 176)
+	else if (_mazeRunnerPosition >= 176)
 		soundId = 0;
-	else if (_maze_runner_position >= 168)
+	else if (_mazeRunnerPosition >= 168)
 		soundId =  7191;
-	else if (_maze_runner_position >= 152)
+	else if (_mazeRunnerPosition >= 152)
 		soundId = 0;
-	else if (_maze_runner_position >= 144)
+	else if (_mazeRunnerPosition >= 144)
 		soundId =  7191;
-	else if (_maze_runner_position >= 136)
+	else if (_mazeRunnerPosition >= 136)
 		soundId =  2191;
-	else if (_maze_runner_position >= 112)
+	else if (_mazeRunnerPosition >= 112)
 		soundId = 0;
-	else if (_maze_runner_position >= 104)
+	else if (_mazeRunnerPosition >= 104)
 		soundId =  6191;
-	else if (_maze_runner_position >= 96)
+	else if (_mazeRunnerPosition >= 96)
 		soundId =  2191;
-	else if (_maze_runner_position >= 88)
+	else if (_mazeRunnerPosition >= 88)
 		soundId =  3191;
-	else if (_maze_runner_position >= 80)
+	else if (_mazeRunnerPosition >= 80)
 		soundId =  4191;
-	else if (_maze_runner_position >= 72)
+	else if (_mazeRunnerPosition >= 72)
 		soundId =  8191;
-	else if (_maze_runner_position >= 64)
+	else if (_mazeRunnerPosition >= 64)
 		soundId =  7191;
-	else if (_maze_runner_position >= 56)
+	else if (_mazeRunnerPosition >= 56)
 		soundId =  8191;
-	else if (_maze_runner_position >= 40)
+	else if (_mazeRunnerPosition >= 40)
 		soundId =  5191;
-	else if (_maze_runner_position >= 24)
+	else if (_mazeRunnerPosition >= 24)
 		soundId =  1191;
-	else if (_maze_runner_position >= 16)
+	else if (_mazeRunnerPosition >= 16)
 		soundId =  2191;
-	else if (_maze_runner_position >= 8)
+	else if (_mazeRunnerPosition >= 8)
 		soundId =  8191;
 	else
 		soundId =  2191;
@@ -577,30 +575,30 @@ void MystScriptParser_Selenitic::mazeRunnerPlaySoundHelp() {
 	if (soundId)
 		_vm->_sound->playSound(soundId);
 
-	_maze_runner_light->drawConditionalDataToScreen(0);
+	_mazeRunnerLight->drawConditionalDataToScreen(0);
 }
 
-void MystScriptParser_Selenitic::o_101_mazeRunnerSoundRepeat(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_mazeRunnerSoundRepeat(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	mazeRunnerPlaySoundHelp();
 }
 
 /**
  * Sound receiver sigma button
  */
-void MystScriptParser_Selenitic::o_102_soundReceiverSigma(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundReceiverSigma(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
 
 	debugC(kDebugScript, "Opcode %d: Sound receiver sigma button", op);
 
 	_vm->_cursor->hideCursor();
 
-	_sound_receiver_current_source->drawConditionalDataToScreen(0);
+	_soundReceiverCurrentSource->drawConditionalDataToScreen(0);
 
-	uint16 *oldPosition = _sound_receiver_position;
+	uint16 *oldPosition = _soundReceiverPosition;
 	uint16 source = 0;
 
 	for (uint i = 0; i < 5; i++) {
-	    switch (i) {
+		switch (i) {
 		case 0:
 			source = 3;
 			break;
@@ -618,22 +616,22 @@ void MystScriptParser_Selenitic::o_102_soundReceiverSigma(uint16 op, uint16 var,
 			break;
 		}
 
-		_sound_receiver_position = &selenitic_vars[8 + source];
+		_soundReceiverPosition = &selenitic_vars[8 + source];
 		_vm->_sound->stopSound();
 		_vm->_sound->playSound(2287);
-		sound_receiver_draw_view();
-		uint16 soundId = sound_receiver_current_sound(source, *_sound_receiver_position);
+		soundReceiverDrawView();
+		uint16 soundId = soundReceiverCurrentSound(source, *_soundReceiverPosition);
 		_vm->_sound->replaceSound(soundId);
 		_vm->_system->delayMillis(1000);
 	}
 
-	_sound_receiver_position = oldPosition;
-	_sound_receiver_sigma_pressed = true;
+	_soundReceiverPosition = oldPosition;
+	_soundReceiverSigmaPressed = true;
 	_vm->_sound->stopSound();
 
-	_sound_receiver_sources[selenitic_vars[7]]->drawConditionalDataToScreen(1);
+	_soundReceiverSources[selenitic_vars[7]]->drawConditionalDataToScreen(1);
 
-	sound_receiver_draw_view();
+	soundReceiverDrawView();
 
 	_vm->_cursor->showCursor();
 }
@@ -641,129 +639,129 @@ void MystScriptParser_Selenitic::o_102_soundReceiverSigma(uint16 op, uint16 var,
 /**
  * Sound receiver right button
  */
-void MystScriptParser_Selenitic::o_103_soundReceiverRight(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundReceiverRight(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Sound receiver right", op);
 
-	sound_receiver_left_right(1);
+	soundReceiverLeftRight(1);
 }
 
 /**
  * Sound receiver left button
  */
-void MystScriptParser_Selenitic::o_104_soundReceiverLeft(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundReceiverLeft(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Sound receiver left", op);
 
-	sound_receiver_left_right(2);
+	soundReceiverLeftRight(2);
 }
 
-void MystScriptParser_Selenitic::sound_receiver_left_right(uint direction) {
+void MystScriptParser_Selenitic::soundReceiverLeftRight(uint direction) {
 
-	if (_sound_receiver_sigma_pressed) {
-		_sound_receiver_sigma_button->drawConditionalDataToScreen(0);
-		_sound_receiver_sigma_pressed = false;
+	if (_soundReceiverSigmaPressed) {
+		_soundReceiverSigmaButton->drawConditionalDataToScreen(0);
+		_soundReceiverSigmaPressed = false;
 	}
 
 	if (direction == 1) {
-		_sound_receiver_right_button->drawConditionalDataToScreen(1);
+		_soundReceiverRightButton->drawConditionalDataToScreen(1);
 	} else {
-		_sound_receiver_left_button->drawConditionalDataToScreen(1);
+		_soundReceiverLeftButton->drawConditionalDataToScreen(1);
 	}
 
 	_vm->_sound->stopSound();
 
-	_sound_receiver_direction = direction;
-	_sound_receiver_speed = 1;
-	_sound_receiver_start_time = _vm->_system->getMillis();
+	_soundReceiverDirection = direction;
+	_soundReceiverSpeed = 1;
+	_soundReceiverStartTime = _vm->_system->getMillis();
 
-	sound_receiver_update();
+	soundReceiverUpdate();
 }
 
-void MystScriptParser_Selenitic::sound_receiver_update() {
-	if (_sound_receiver_direction == 1) {
-		*_sound_receiver_position = ((*_sound_receiver_position) + _sound_receiver_speed) % 3600;
-	} else if (_sound_receiver_direction == 2) {
-		*_sound_receiver_position = ((*_sound_receiver_position) + 3600 - _sound_receiver_speed) % 3600;
+void MystScriptParser_Selenitic::soundReceiverUpdate() {
+	if (_soundReceiverDirection == 1) {
+		*_soundReceiverPosition = ((*_soundReceiverPosition) + _soundReceiverSpeed) % 3600;
+	} else if (_soundReceiverDirection == 2) {
+		*_soundReceiverPosition = ((*_soundReceiverPosition) + 3600 - _soundReceiverSpeed) % 3600;
 	}
 
-	sound_receiver_draw_view();
+	soundReceiverDrawView();
 }
 
-void MystScriptParser_Selenitic::sound_receiver_draw_view() {
-	uint32 left = ((*_sound_receiver_position) * 1800) / 3600;
+void MystScriptParser_Selenitic::soundReceiverDrawView() {
+	uint32 left = ((*_soundReceiverPosition) * 1800) / 3600;
 
-	_sound_receiver_viewer->_subImages->rect.left = left;
-	_sound_receiver_viewer->_subImages->rect.right = left + 136;
+	_soundReceiverViewer->_subImages->rect.left = left;
+	_soundReceiverViewer->_subImages->rect.right = left + 136;
 
-	_sound_receiver_viewer->drawConditionalDataToScreen(0);
+	_soundReceiverViewer->drawConditionalDataToScreen(0);
 
-	sound_receiver_draw_angle();
+	soundReceiverDrawAngle();
 }
 
-void MystScriptParser_Selenitic::sound_receiver_draw_angle() {
-	_vm->redrawResource(_sound_receiver_angle_1);
-	_vm->redrawResource(_sound_receiver_angle_2);
-	_vm->redrawResource(_sound_receiver_angle_3);
-	_vm->redrawResource(_sound_receiver_angle_4);
+void MystScriptParser_Selenitic::soundReceiverDrawAngle() {
+	_vm->redrawResource(_soundReceiverAngle1);
+	_vm->redrawResource(_soundReceiverAngle2);
+	_vm->redrawResource(_soundReceiverAngle3);
+	_vm->redrawResource(_soundReceiverAngle4);
 }
 
 /**
  * Sound receiver source selection buttons
  */
-void MystScriptParser_Selenitic::o_105_109_soundReceiverSource(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-    uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
+void MystScriptParser_Selenitic::o_soundReceiverSource(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
 
 	debugC(kDebugScript, "Opcode %d: Sound receiver source", op);
 
-	if (_sound_receiver_sigma_pressed) {
-		_sound_receiver_sigma_button->drawConditionalDataToScreen(0);
-		_sound_receiver_sigma_pressed = false;
+	if (_soundReceiverSigmaPressed) {
+		_soundReceiverSigmaButton->drawConditionalDataToScreen(0);
+		_soundReceiverSigmaPressed = false;
 	}
 
 	_vm->_cursor->hideCursor();
 
-	uint pressed_button = var - 9;
+	uint pressedButton = var - 9;
 
-	if (selenitic_vars[7] != pressed_button) {
-		selenitic_vars[7] = pressed_button;
+	if (selenitic_vars[7] != pressedButton) {
+		selenitic_vars[7] = pressedButton;
 
-		_sound_receiver_current_source->drawConditionalDataToScreen(0);
+		_soundReceiverCurrentSource->drawConditionalDataToScreen(0);
 
-		_sound_receiver_position = &selenitic_vars[8 + pressed_button];
-		_sound_receiver_current_source = _sound_receiver_sources[pressed_button];
+		_soundReceiverPosition = &selenitic_vars[8 + pressedButton];
+		_soundReceiverCurrentSource = _soundReceiverSources[pressedButton];
 
 		_vm->_sound->stopSound();
 
-		uint16 sound_id = argv[0];
-		_vm->_sound->playSound(sound_id);
+		uint16 soundId = argv[0];
+		_vm->_sound->playSound(soundId);
 
-		_sound_receiver_current_source->drawConditionalDataToScreen(1);
+		_soundReceiverCurrentSource->drawConditionalDataToScreen(1);
 
-		sound_receiver_draw_view();
+		soundReceiverDrawView();
 	}
 
 	_vm->_cursor->showCursor();
 }
 
-void MystScriptParser_Selenitic::o_110_mazeRunnerDoorButton(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_mazeRunnerDoorButton(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	// Used for Selenitic Maze Runner Exit Logic
 	uint16 cardIdExit = argv[0];
 	uint16 cardIdEntry = argv[1];
 
-	if (_maze_runner_position == 288) {
+	if (_mazeRunnerPosition == 288) {
 		_vm->changeToCard(cardIdEntry, false);
 		_vm->_sound->playSound(cardIdEntry);
 		animatedUpdate(argv[2], &argv[3], 10);
-	} else if (_maze_runner_position == 289) {
+	} else if (_mazeRunnerPosition == 289) {
 		_vm->changeToCard(cardIdExit, false);
 		_vm->_sound->playSound(cardIdExit);
 		animatedUpdate(argv[2], &argv[3], 10);
 	}
 }
 
-void MystScriptParser_Selenitic::o_111_soundReceiverUpdateSound(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundReceiverUpdateSound(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Sound receiver update sound", op);
 
-	sound_receiver_update_sound();
+	soundReceiverUpdateSound();
 }
 
 uint16 MystScriptParser_Selenitic::soundLockCurrentSound(uint16 position, bool pixels) {
@@ -795,33 +793,33 @@ uint16 MystScriptParser_Selenitic::soundLockCurrentSound(uint16 position, bool p
 MystResourceType10 *MystScriptParser_Selenitic::soundLockSliderFromVar(uint16 var) {
 	switch (var) {
 	case 20:
-		return _sound_lock_slider_1;
+		return _soundLockSlider1;
 	case 21:
-		return _sound_lock_slider_2;
+		return _soundLockSlider2;
 	case 22:
-		return _sound_lock_slider_3;
+		return _soundLockSlider3;
 	case 23:
-		return _sound_lock_slider_4;
+		return _soundLockSlider4;
 	case 24:
-		return _sound_lock_slider_5;
+		return _soundLockSlider5;
 	}
 
 	return 0;
 }
 
-void MystScriptParser_Selenitic::o_112_soundLockMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundLockMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Sound lock move", op);
 
 	MystResourceType10 *slider = soundLockSliderFromVar(var);
 
 	uint16 soundId = soundLockCurrentSound(slider->_pos.y, true);
-	if (_sound_lock_sound_id != soundId) {
-		_sound_lock_sound_id = soundId;
+	if (_soundLockSoundId != soundId) {
+		_soundLockSoundId = soundId;
 		_vm->_sound->replaceSound(soundId, Audio::Mixer::kMaxChannelVolume, true);
 	}
 }
 
-void MystScriptParser_Selenitic::o_113_soundLockStartMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundLockStartMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Sound lock start move", op);
 
 	MystResourceType10 *slider = soundLockSliderFromVar(var);
@@ -829,11 +827,11 @@ void MystScriptParser_Selenitic::o_113_soundLockStartMove(uint16 op, uint16 var,
 	_vm->_cursor->setCursor(700);
 	_vm->_sound->pauseBackground();
 
-	_sound_lock_sound_id = soundLockCurrentSound(slider->_pos.y, true);
-	_vm->_sound->replaceSound(_sound_lock_sound_id, Audio::Mixer::kMaxChannelVolume, true);
+	_soundLockSoundId = soundLockCurrentSound(slider->_pos.y, true);
+	_vm->_sound->replaceSound(_soundLockSoundId, Audio::Mixer::kMaxChannelVolume, true);
 }
 
-void MystScriptParser_Selenitic::o_114_soundLockEndMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundLockEndMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Sound lock end move", op);
 
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
@@ -860,9 +858,9 @@ void MystScriptParser_Selenitic::o_114_soundLockEndMove(uint16 op, uint16 var, u
 
 	uint16 stepped = 12 * (*value / 12) + 6;
 
-	if ( stepped == 6 )
+	if (stepped == 6)
 		stepped = 0;
-	if ( stepped == 114 )
+	if (stepped == 114)
 		stepped = 119;
 
 	*value = stepped;
@@ -892,7 +890,7 @@ void MystScriptParser_Selenitic::soundLockCheckSolution(MystResourceType10 *slid
 	_vm->_sound->stopSound();
 }
 
-void MystScriptParser_Selenitic::o_115_soundLockButton(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundLockButton(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Sound lock button", op);
 
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
@@ -900,20 +898,20 @@ void MystScriptParser_Selenitic::o_115_soundLockButton(uint16 op, uint16 var, ui
 
 	_vm->_sound->pauseBackground();
 	_vm->_sound->playSound(1147);
-	_sound_lock_button->drawConditionalDataToScreen(1);
+	_soundLockButton->drawConditionalDataToScreen(1);
 	_vm->_cursor->hideCursor();
 
-	soundLockCheckSolution(_sound_lock_slider_1, selenitic_vars[13], 5, solved);
-	soundLockCheckSolution(_sound_lock_slider_2, selenitic_vars[14], 9, solved);
-	soundLockCheckSolution(_sound_lock_slider_3, selenitic_vars[15], 0, solved);
-	soundLockCheckSolution(_sound_lock_slider_4, selenitic_vars[16], 6, solved);
-	soundLockCheckSolution(_sound_lock_slider_5, selenitic_vars[17], 7, solved);
+	soundLockCheckSolution(_soundLockSlider1, selenitic_vars[13], 5, solved);
+	soundLockCheckSolution(_soundLockSlider2, selenitic_vars[14], 9, solved);
+	soundLockCheckSolution(_soundLockSlider3, selenitic_vars[15], 0, solved);
+	soundLockCheckSolution(_soundLockSlider4, selenitic_vars[16], 6, solved);
+	soundLockCheckSolution(_soundLockSlider5, selenitic_vars[17], 7, solved);
 
 	_vm->_sound->playSound(1148);
 	_vm->_sound->resumeBackground();
 
 	if (solved) {
-		_sound_lock_button->drawConditionalDataToScreen(2);
+		_soundLockButton->drawConditionalDataToScreen(2);
 
 		uint16 cardIdClosed = argv[0];
 		uint16 cardIdOpen = argv[1];
@@ -925,133 +923,93 @@ void MystScriptParser_Selenitic::o_115_soundLockButton(uint16 op, uint16 var, ui
 
 		animatedUpdate(argv[4], &argv[5], argv[3]);
 	} else {
-		_sound_lock_button->drawConditionalDataToScreen(0);
+		_soundLockButton->drawConditionalDataToScreen(0);
 	}
 
 	_vm->_cursor->showCursor();
 }
 
-void MystScriptParser_Selenitic::o_117_soundReceiverEndMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundReceiverEndMove(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	debugC(kDebugScript, "Opcode %d: Sound receiver end move", op);
 
-	uint16 old_direction = _sound_receiver_direction;
+	uint16 oldDirection = _soundReceiverDirection;
 
-	if (_sound_receiver_direction) {
-		_sound_receiver_direction = 0;
+	if (_soundReceiverDirection) {
+		_soundReceiverDirection = 0;
 
-		sound_receiver_update_sound();
+		soundReceiverUpdateSound();
 
-		if (old_direction == 1) {
-			_sound_receiver_right_button->drawConditionalDataToScreen(0);
+		if (oldDirection == 1) {
+			_soundReceiverRightButton->drawConditionalDataToScreen(0);
 		} else {
-			_sound_receiver_left_button->drawConditionalDataToScreen(0);
+			_soundReceiverLeftButton->drawConditionalDataToScreen(0);
 		}
 
 	}
 }
 
-// Selenitic Stack Movies For Maze Runner (Card 1191)
-//static const char* kHCMovPathSelenitic[36] = {
-//	"backa1",
-//	"backe1",
-//	"backf0",
-//	"backf1",
-//	"backl0",
-//	"backl1",
-//	"backo0",
-//	"backo1",
-//	"backp0",
-//	"backp1",
-//	"backr0",
-//	"backr1",
-//	"backs0",
-//	"backs1",
-//	"forwa1",
-//	"forwe0",
-//	"forwf0",
-//	"forwf1",
-//	"forwl0",
-//	"forwl1",
-//	"forwo0",
-//	"forwo1",
-//	"forwp0",
-//	"forwp1",
-//	"forwr0",
-//	"forwr1",
-//	"forws0",
-//	"forws1",
-//	"left00",
-//	"left01",
-//	"left10",
-//	"left11",
-//	"right00",
-//	"right01",
-//	"right10",
-//	"right11"
-//};
-
-void MystScriptParser_Selenitic::o_200_mazeRunnerCompass_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	_maze_runner_compass = static_cast<MystResourceType8 *>(_invokingResource);
+void MystScriptParser_Selenitic::o_mazeRunnerCompass_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	_mazeRunnerCompass = static_cast<MystResourceType8 *>(_invokingResource);
 }
 
-void MystScriptParser_Selenitic::o_201_mazeRunnerWindow_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	_maze_runner_window = static_cast<MystResourceType8 *>(_invokingResource);
+void MystScriptParser_Selenitic::o_mazeRunnerWindow_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	_mazeRunnerWindow = static_cast<MystResourceType8 *>(_invokingResource);
 }
 
-void MystScriptParser_Selenitic::o_202_mazeRunnerLight_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	_maze_runner_light = static_cast<MystResourceType8 *>(_invokingResource);
+void MystScriptParser_Selenitic::o_mazeRunnerLight_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	_mazeRunnerLight = static_cast<MystResourceType8 *>(_invokingResource);
 }
 
-void MystScriptParser_Selenitic::o_203_soundReceiver_run(void) {
-	if (_sound_receiver_start_time) {
-		if (_sound_receiver_direction) {
-			uint32 current_time = _vm->_system->getMillis();
+void MystScriptParser_Selenitic::soundReceiver_run() {
+	if (_soundReceiverStartTime) {
+		if (_soundReceiverDirection) {
+			uint32 currentTime = _vm->_system->getMillis();
 
-			if (_sound_receiver_speed == 50) {
-				if (current_time > _sound_receiver_start_time + 500) {
-					sound_receiver_increase_speed();
+			if (_soundReceiverSpeed == 50) {
+				if (currentTime > _soundReceiverStartTime + 500) {
+					soundReceiverIncreaseSpeed();
 				}
 			} else {
-				if (current_time > _sound_receiver_start_time + 1000) {
-					sound_receiver_increase_speed();
+				if (currentTime > _soundReceiverStartTime + 1000) {
+					soundReceiverIncreaseSpeed();
 				}
 			}
 
-			if (current_time > _sound_receiver_start_time + 100) {
-				sound_receiver_update();
+			if (currentTime > _soundReceiverStartTime + 100) {
+				soundReceiverUpdate();
 			}
 
-		} else if (!_sound_receiver_sigma_pressed) {
-			sound_receiver_update_sound();
+		} else if (!_soundReceiverSigmaPressed) {
+			soundReceiverUpdateSound();
 		}
 	}
 }
 
-void MystScriptParser_Selenitic::sound_receiver_increase_speed() {
-	switch (_sound_receiver_speed) {
+void MystScriptParser_Selenitic::soundReceiverIncreaseSpeed() {
+	switch (_soundReceiverSpeed) {
 	case 1:
-		_sound_receiver_speed = 10;
+		_soundReceiverSpeed = 10;
 		break;
 	case 10:
-		_sound_receiver_speed = 50;
+		_soundReceiverSpeed = 50;
 		break;
 	case 50:
-		_sound_receiver_speed = 100;
+		_soundReceiverSpeed = 100;
 		break;
 	}
 }
 
-void MystScriptParser_Selenitic::sound_receiver_update_sound() {
+void MystScriptParser_Selenitic::soundReceiverUpdateSound() {
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
 
-	uint16 soundId = sound_receiver_current_sound(selenitic_vars[7], *_sound_receiver_position);
+	uint16 soundId = soundReceiverCurrentSound(selenitic_vars[7], *_soundReceiverPosition);
 	_vm->_sound->replaceSound(soundId);
 }
 
-uint16 MystScriptParser_Selenitic::sound_receiver_current_sound(uint16 source, uint16 position) {
+uint16 MystScriptParser_Selenitic::soundReceiverCurrentSound(uint16 source, uint16 position) {
 	uint16 solution;
 	bool sourceEnabled;
-	sound_receiver_solution(source, solution, sourceEnabled);
+	soundReceiverSolution(source, solution, sourceEnabled);
 
 	uint16 soundIdGood;
 	uint16 soundIdNear;
@@ -1084,12 +1042,12 @@ uint16 MystScriptParser_Selenitic::sound_receiver_current_sound(uint16 source, u
 		if (position == solution) {
 			soundId = soundIdGood;
 		} else if (position > solution && position <= solution + 50) {
-			_sound_receiver_left_button->drawConditionalDataToScreen(2);
-			_sound_receiver_left_button->drawConditionalDataToScreen(0);
+			_soundReceiverLeftButton->drawConditionalDataToScreen(2);
+			_soundReceiverLeftButton->drawConditionalDataToScreen(0);
 			soundId = soundIdNear;
 		} else if (position < solution && position >= solution - 50) {
-			_sound_receiver_right_button->drawConditionalDataToScreen(2);
-			_sound_receiver_right_button->drawConditionalDataToScreen(0);
+			_soundReceiverRightButton->drawConditionalDataToScreen(2);
+			_soundReceiverRightButton->drawConditionalDataToScreen(0);
 			soundId = soundIdNear;
 		}
 	}
@@ -1097,7 +1055,7 @@ uint16 MystScriptParser_Selenitic::sound_receiver_current_sound(uint16 source, u
 	return soundId;
 }
 
-void MystScriptParser_Selenitic::sound_receiver_solution(uint16 source, uint16 &solution, bool &enabled) {
+void MystScriptParser_Selenitic::soundReceiverSolution(uint16 source, uint16 &solution, bool &enabled) {
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
 
 	switch (source) {
@@ -1124,36 +1082,36 @@ void MystScriptParser_Selenitic::sound_receiver_solution(uint16 source, uint16 &
 	}
 }
 
-void MystScriptParser_Selenitic::o_203_soundReceiver_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundReceiver_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
 
 	debugC(kDebugScript, "Opcode %d: Sound receiver init", op);
 
 	// Used for Card 1245 (Sound Receiver)
-	_sound_receiver_running = true;
-
-	_sound_receiver_right_button = static_cast<MystResourceType8 *>(_vm->_resources[0]);
-	_sound_receiver_left_button = static_cast<MystResourceType8 *>(_vm->_resources[1]);
-	_sound_receiver_sigma_button = static_cast<MystResourceType8 *>(_vm->_resources[2]);
-	_sound_receiver_sources[4] = static_cast<MystResourceType8 *>(_vm->_resources[3]);
-	_sound_receiver_sources[3] = static_cast<MystResourceType8 *>(_vm->_resources[4]);
-	_sound_receiver_sources[2] = static_cast<MystResourceType8 *>(_vm->_resources[5]);
-	_sound_receiver_sources[1] = static_cast<MystResourceType8 *>(_vm->_resources[6]);
-	_sound_receiver_sources[0] = static_cast<MystResourceType8 *>(_vm->_resources[7]);
-	_sound_receiver_viewer = static_cast<MystResourceType8 *>(_vm->_resources[8]);
-	_sound_receiver_angle_1 = static_cast<MystResourceType8 *>(_vm->_resources[10]);
-	_sound_receiver_angle_2 = static_cast<MystResourceType8 *>(_vm->_resources[11]);
-	_sound_receiver_angle_3 = static_cast<MystResourceType8 *>(_vm->_resources[12]);
-	_sound_receiver_angle_4 = static_cast<MystResourceType8 *>(_vm->_resources[13]);
-
-    uint16 current_source = selenitic_vars[7];
-    _sound_receiver_position = &selenitic_vars[8 + current_source];
-	_sound_receiver_current_source = _sound_receiver_sources[current_source];
-
-	_sound_receiver_sigma_pressed = false;
+	_soundReceiverRunning = true;
+
+	_soundReceiverRightButton = static_cast<MystResourceType8 *>(_vm->_resources[0]);
+	_soundReceiverLeftButton = static_cast<MystResourceType8 *>(_vm->_resources[1]);
+	_soundReceiverSigmaButton = static_cast<MystResourceType8 *>(_vm->_resources[2]);
+	_soundReceiverSources[4] = static_cast<MystResourceType8 *>(_vm->_resources[3]);
+	_soundReceiverSources[3] = static_cast<MystResourceType8 *>(_vm->_resources[4]);
+	_soundReceiverSources[2] = static_cast<MystResourceType8 *>(_vm->_resources[5]);
+	_soundReceiverSources[1] = static_cast<MystResourceType8 *>(_vm->_resources[6]);
+	_soundReceiverSources[0] = static_cast<MystResourceType8 *>(_vm->_resources[7]);
+	_soundReceiverViewer = static_cast<MystResourceType8 *>(_vm->_resources[8]);
+	_soundReceiverAngle1 = static_cast<MystResourceType8 *>(_vm->_resources[10]);
+	_soundReceiverAngle2 = static_cast<MystResourceType8 *>(_vm->_resources[11]);
+	_soundReceiverAngle3 = static_cast<MystResourceType8 *>(_vm->_resources[12]);
+	_soundReceiverAngle4 = static_cast<MystResourceType8 *>(_vm->_resources[13]);
+
+	uint16 currentSource = selenitic_vars[7];
+	_soundReceiverPosition = &selenitic_vars[8 + currentSource];
+	_soundReceiverCurrentSource = _soundReceiverSources[currentSource];
+
+	_soundReceiverSigmaPressed = false;
 }
 
-void MystScriptParser_Selenitic::o_204_soundLock_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+void MystScriptParser_Selenitic::o_soundLock_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
 	uint16 *selenitic_vars = _vm->_saveLoad->_v->selenitic_vars;
 
 	debugC(kDebugScript, "Opcode %d: Sound lock init", op);
@@ -1162,42 +1120,42 @@ void MystScriptParser_Selenitic::o_204_soundLock_init(uint16 op, uint16 var, uin
 		if (_vm->_resources[i]->type == kMystSlider) {
 			switch (_vm->_resources[i]->getType8Var()) {
 			case 20:
-				_sound_lock_slider_1 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
-				_sound_lock_slider_1->setStep(selenitic_vars[13]);
+				_soundLockSlider1 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
+				_soundLockSlider1->setStep(selenitic_vars[13]);
 				break;
 			case 21:
-				_sound_lock_slider_2 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
-				_sound_lock_slider_2->setStep(selenitic_vars[14]);
+				_soundLockSlider2 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
+				_soundLockSlider2->setStep(selenitic_vars[14]);
 				break;
 			case 22:
-				_sound_lock_slider_3 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
-				_sound_lock_slider_3->setStep(selenitic_vars[15]);
+				_soundLockSlider3 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
+				_soundLockSlider3->setStep(selenitic_vars[15]);
 				break;
 			case 23:
-				_sound_lock_slider_4 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
-				_sound_lock_slider_4->setStep(selenitic_vars[16]);
+				_soundLockSlider4 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
+				_soundLockSlider4->setStep(selenitic_vars[16]);
 				break;
 			case 24:
-				_sound_lock_slider_5 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
-				_sound_lock_slider_5->setStep(selenitic_vars[17]);
+				_soundLockSlider5 = static_cast<MystResourceType10 *>(_vm->_resources[i]);
+				_soundLockSlider5->setStep(selenitic_vars[17]);
 				break;
 			}
 		} else if (_vm->_resources[i]->type == kMystConditionalImage) {
 			if (_vm->_resources[i]->getType8Var() == 28) {
-				_sound_lock_button = static_cast<MystResourceType8 *>(_vm->_resources[i]);
+				_soundLockButton = static_cast<MystResourceType8 *>(_vm->_resources[i]);
 			}
 		}
 	}
 
-	_sound_lock_sound_id = 0;
+	_soundLockSoundId = 0;
 }
 
-void MystScriptParser_Selenitic::o_205_mazeRunnerRight_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	_maze_runner_right_button = static_cast<MystResourceType8 *>(_invokingResource);
+void MystScriptParser_Selenitic::o_mazeRunnerRight_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	_mazeRunnerRightButton = static_cast<MystResourceType8 *>(_invokingResource);
 }
 
-void MystScriptParser_Selenitic::o_206_mazeRunnerLeft_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
-	_maze_runner_left_button = static_cast<MystResourceType8 *>(_invokingResource);
+void MystScriptParser_Selenitic::o_mazeRunnerLeft_init(uint16 op, uint16 var, uint16 argc, uint16 *argv) {
+	_mazeRunnerLeftButton = static_cast<MystResourceType8 *>(_invokingResource);
 }
 
 const uint16 MystScriptParser_Selenitic::_mazeRunnerMap[300][4] = {
diff --git a/engines/mohawk/myst_scripts_selenitic.h b/engines/mohawk/myst_scripts_selenitic.h
index d09603ec56..5b9cc52d24 100644
--- a/engines/mohawk/myst_scripts_selenitic.h
+++ b/engines/mohawk/myst_scripts_selenitic.h
@@ -52,75 +52,75 @@ private:
 	void toggleVar(uint16 var);
 	bool setVarValue(uint16 var, uint16 value);
 
-	DECLARE_OPCODE(o_100_mazeRunnerMove);
-	DECLARE_OPCODE(o_101_mazeRunnerSoundRepeat);
-	DECLARE_OPCODE(o_102_soundReceiverSigma);
-	DECLARE_OPCODE(o_103_soundReceiverRight);
-	DECLARE_OPCODE(o_104_soundReceiverLeft);
-	DECLARE_OPCODE(o_105_109_soundReceiverSource);
-	DECLARE_OPCODE(o_110_mazeRunnerDoorButton);
-	DECLARE_OPCODE(o_111_soundReceiverUpdateSound);
-	DECLARE_OPCODE(o_112_soundLockMove);
-	DECLARE_OPCODE(o_113_soundLockStartMove);
-	DECLARE_OPCODE(o_114_soundLockEndMove);
-	DECLARE_OPCODE(o_115_soundLockButton);
-	DECLARE_OPCODE(o_117_soundReceiverEndMove);
-
-	DECLARE_OPCODE(o_200_mazeRunnerCompass_init);
-	DECLARE_OPCODE(o_201_mazeRunnerWindow_init);
-	DECLARE_OPCODE(o_202_mazeRunnerLight_init);
-	DECLARE_OPCODE(o_203_soundReceiver_init);
-	DECLARE_OPCODE(o_204_soundLock_init);
-	DECLARE_OPCODE(o_205_mazeRunnerRight_init);
-	DECLARE_OPCODE(o_206_mazeRunnerLeft_init);
-
-	void o_203_soundReceiver_run();
-
-	bool _sound_receiver_running;
-	bool _sound_receiver_sigma_pressed; // 6
-	MystResourceType8 *_sound_receiver_sources[5]; // 92 -> 108
-	MystResourceType8 *_sound_receiver_current_source; // 112
-	uint16 *_sound_receiver_position; // 116
-	uint16 _sound_receiver_direction; // 120
-	uint16 _sound_receiver_speed; // 122
-	uint32 _sound_receiver_start_time; //124
-	MystResourceType8 *_sound_receiver_viewer; // 128
-	MystResourceType8 *_sound_receiver_right_button; // 132
-	MystResourceType8 *_sound_receiver_left_button; // 136
-	MystResourceType8 *_sound_receiver_angle_1; // 140
-	MystResourceType8 *_sound_receiver_angle_2; // 144
-	MystResourceType8 *_sound_receiver_angle_3; // 148
-	MystResourceType8 *_sound_receiver_angle_4; // 152
-	MystResourceType8 *_sound_receiver_sigma_button; // 156
+	DECLARE_OPCODE(o_mazeRunnerMove);
+	DECLARE_OPCODE(o_mazeRunnerSoundRepeat);
+	DECLARE_OPCODE(o_soundReceiverSigma);
+	DECLARE_OPCODE(o_soundReceiverRight);
+	DECLARE_OPCODE(o_soundReceiverLeft);
+	DECLARE_OPCODE(o_soundReceiverSource);
+	DECLARE_OPCODE(o_mazeRunnerDoorButton);
+	DECLARE_OPCODE(o_soundReceiverUpdateSound);
+	DECLARE_OPCODE(o_soundLockMove);
+	DECLARE_OPCODE(o_soundLockStartMove);
+	DECLARE_OPCODE(o_soundLockEndMove);
+	DECLARE_OPCODE(o_soundLockButton);
+	DECLARE_OPCODE(o_soundReceiverEndMove);
+
+	DECLARE_OPCODE(o_mazeRunnerCompass_init);
+	DECLARE_OPCODE(o_mazeRunnerWindow_init);
+	DECLARE_OPCODE(o_mazeRunnerLight_init);
+	DECLARE_OPCODE(o_soundReceiver_init);
+	DECLARE_OPCODE(o_soundLock_init);
+	DECLARE_OPCODE(o_mazeRunnerRight_init);
+	DECLARE_OPCODE(o_mazeRunnerLeft_init);
+
+	void soundReceiver_run();
+
+	bool _soundReceiverRunning;
+	bool _soundReceiverSigmaPressed; // 6
+	MystResourceType8 *_soundReceiverSources[5]; // 92 -> 108
+	MystResourceType8 *_soundReceiverCurrentSource; // 112
+	uint16 *_soundReceiverPosition; // 116
+	uint16 _soundReceiverDirection; // 120
+	uint16 _soundReceiverSpeed; // 122
+	uint32 _soundReceiverStartTime; //124
+	MystResourceType8 *_soundReceiverViewer; // 128
+	MystResourceType8 *_soundReceiverRightButton; // 132
+	MystResourceType8 *_soundReceiverLeftButton; // 136
+	MystResourceType8 *_soundReceiverAngle1; // 140
+	MystResourceType8 *_soundReceiverAngle2; // 144
+	MystResourceType8 *_soundReceiverAngle3; // 148
+	MystResourceType8 *_soundReceiverAngle4; // 152
+	MystResourceType8 *_soundReceiverSigmaButton; // 156
 
 	static const uint16 _mazeRunnerMap[300][4];
 	static const uint8 _mazeRunnerVideos[300][4];
 
-	uint16 _maze_runner_position; // 56
-	uint16 _maze_runner_direction; // 58
-	MystResourceType8 *_maze_runner_window; // 68
-	MystResourceType8 *_maze_runner_compass; // 72
-	MystResourceType8 *_maze_runner_light; // 76
-	MystResourceType8 *_maze_runner_right_button; // 80
-	MystResourceType8 *_maze_runner_left_button; // 84
-	bool _maze_runner_door_opened; // 160
-
-	uint16 _sound_lock_sound_id;
-	MystResourceType10 *_sound_lock_slider_1; // 164
-	MystResourceType10 *_sound_lock_slider_2; // 168
-	MystResourceType10 *_sound_lock_slider_3; // 172
-	MystResourceType10 *_sound_lock_slider_4; // 176
-	MystResourceType10 *_sound_lock_slider_5; // 180
-	MystResourceType8 *_sound_lock_button; // 184
-
-	void sound_receiver_left_right(uint direction);
-	void sound_receiver_update();
-	void sound_receiver_draw_view();
-	void sound_receiver_draw_angle();
-	void sound_receiver_increase_speed();
-	void sound_receiver_update_sound();
-	uint16 sound_receiver_current_sound(uint16 source, uint16 position);
-	void sound_receiver_solution(uint16 source, uint16 &solution, bool &enabled);
+	uint16 _mazeRunnerPosition; // 56
+	uint16 _mazeRunnerDirection; // 58
+	MystResourceType8 *_mazeRunnerWindow; // 68
+	MystResourceType8 *_mazeRunnerCompass; // 72
+	MystResourceType8 *_mazeRunnerLight; // 76
+	MystResourceType8 *_mazeRunnerRightButton; // 80
+	MystResourceType8 *_mazeRunnerLeftButton; // 84
+	bool _mazeRunnerDoorOpened; // 160
+
+	uint16 _soundLockSoundId;
+	MystResourceType10 *_soundLockSlider1; // 164
+	MystResourceType10 *_soundLockSlider2; // 168
+	MystResourceType10 *_soundLockSlider3; // 172
+	MystResourceType10 *_soundLockSlider4; // 176
+	MystResourceType10 *_soundLockSlider5; // 180
+	MystResourceType8 *_soundLockButton; // 184
+
+	void soundReceiverLeftRight(uint direction);
+	void soundReceiverUpdate();
+	void soundReceiverDrawView();
+	void soundReceiverDrawAngle();
+	void soundReceiverIncreaseSpeed();
+	void soundReceiverUpdateSound();
+	uint16 soundReceiverCurrentSound(uint16 source, uint16 position);
+	void soundReceiverSolution(uint16 source, uint16 &solution, bool &enabled);
 
 	uint16 soundLockCurrentSound(uint16 position, bool pixels);
 	MystResourceType10 *soundLockSliderFromVar(uint16 var);