GNAP: Rename members of GnapEngine from beaver to platypus for consistency

39 files changed, 455 insertions, 455 deletions

diff --git a/engines/gnap/scenes/scene01.cpp b/engines/gnap/scenes/scene01.cpp
index 08c807d1cd..808c190af1 100644
--- a/engines/gnap/scenes/scene01.cpp
+++ b/engines/gnap/scenes/scene01.cpp
@@ -103,7 +103,7 @@ void GnapEngine::scene01_run() {
 	if (_prevSceneNum == 2) {
 		initGnapPos(11, 6, kDirBottomLeft);
 		if (isFlag(kGFPlatypus))
-			initBeaverPos(12, 6, kDirUnk4);
+			initPlatypusPos(12, 6, kDirUnk4);
 		endSceneInit();
 		if (isFlag(kGFPlatypus))
 			platypusWalkTo(9, 6, -1, 0x107C2, 1);
@@ -111,7 +111,7 @@ void GnapEngine::scene01_run() {
 	} else {
 		initGnapPos(1, 6, kDirBottomRight);
 		if (isFlag(kGFPlatypus))
-			initBeaverPos(1, 7, kDirNone);
+			initPlatypusPos(1, 7, kDirNone);
 		endSceneInit();
 	}
 
@@ -152,7 +152,7 @@ void GnapEngine::scene01_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -272,8 +272,8 @@ void GnapEngine::scene01_run() {
 			playSound(0x1091C, true);
 
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0 && isFlag(kGFPlatypus))
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0 && isFlag(kGFPlatypus))
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (_timers[4] == 0) {
diff --git a/engines/gnap/scenes/scene02.cpp b/engines/gnap/scenes/scene02.cpp
index 3831c68b2c..d7b542545a 100644
--- a/engines/gnap/scenes/scene02.cpp
+++ b/engines/gnap/scenes/scene02.cpp
@@ -101,7 +101,7 @@ void GnapEngine::scene02_run() {
 	case 3:
 		initGnapPos(11, 6, kDirBottomLeft);
 		if (isFlag(kGFPlatypus))
-			initBeaverPos(12, 6, kDirUnk4);
+			initPlatypusPos(12, 6, kDirUnk4);
 		endSceneInit();
 		if (isFlag(kGFPlatypus))
 			platypusWalkTo(9, 6, -1, 0x107C2, 1);
@@ -110,7 +110,7 @@ void GnapEngine::scene02_run() {
 	case 4:
 		initGnapPos(_hotspotsWalkPos[6].x, _hotspotsWalkPos[6].y, kDirBottomLeft);
 		if (isFlag(kGFPlatypus))
-			initBeaverPos(_hotspotsWalkPos[6].x + 1, _hotspotsWalkPos[6].y, kDirUnk4);
+			initPlatypusPos(_hotspotsWalkPos[6].x + 1, _hotspotsWalkPos[6].y, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(7, 6, 0, 0x107B9, 1);
 		if (isFlag(kGFPlatypus))
@@ -121,19 +121,19 @@ void GnapEngine::scene02_run() {
 	case 47:
 		clearFlag(kGFUnk25);
 		initGnapPos(5, 6, kDirBottomLeft);
-		initBeaverPos(6, 7, kDirUnk4);
+		initPlatypusPos(6, 7, kDirUnk4);
 		endSceneInit();
 		break;
 	case 49:
 		initGnapPos(5, 6, kDirBottomRight);
 		if (isFlag(kGFPlatypus))
-			initBeaverPos(6, 7, kDirNone);
+			initPlatypusPos(6, 7, kDirNone);
 		endSceneInit();
 		break;
 	default:
 		initGnapPos(-1, 6, kDirBottomRight);
 		if (isFlag(kGFPlatypus))
-			initBeaverPos(-1, 7, kDirNone);
+			initPlatypusPos(-1, 7, kDirNone);
 		endSceneInit();
 		if (isFlag(kGFPlatypus))
 			platypusWalkTo(2, 7, -1, 0x107C2, 1);
@@ -180,7 +180,7 @@ void GnapEngine::scene02_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -363,8 +363,8 @@ void GnapEngine::scene02_run() {
 			playSound(0x1091C, true);
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0 && isFlag(kGFPlatypus))
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0 && isFlag(kGFPlatypus))
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
diff --git a/engines/gnap/scenes/scene03.cpp b/engines/gnap/scenes/scene03.cpp
index 974b0d24a2..c5af2f3e7d 100644
--- a/engines/gnap/scenes/scene03.cpp
+++ b/engines/gnap/scenes/scene03.cpp
@@ -103,13 +103,13 @@ void GnapEngine::scene03_run() {
 	_timers[5] = getRandom(100) + 200;
 	
 	if (isFlag(kGFPlatypus)) {
-		initBeaverPos(5, 4, kDirNone);
+		initPlatypusPos(5, 4, kDirNone);
 	} else {
 		_timers[1] = getRandom(40) + 20;
 		_gameSys->setAnimation(0x1C2, 99, 1);
 		_gameSys->insertSequence(0x1C2, 99, 0, 0, kSeqNone, 0, 0, 0);
-		_beaverSequenceId = 0x1C2;
-		_beaverSequenceDatNum = 0;
+		_platypusSequenceId = 0x1C2;
+		_platypusSequenceDatNum = 0;
 	}
 	
 	_gameSys->insertSequence(0x1C4, 255, 0, 0, kSeqNone, 0, 0, 0);
@@ -154,7 +154,7 @@ void GnapEngine::scene03_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -319,18 +319,18 @@ void GnapEngine::scene03_run() {
 			playSound(0x10925, true);
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0 && isFlag(kGFPlatypus))
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0 && isFlag(kGFPlatypus))
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (!_timers[1] && !_s03_platypusScared) {
 				_timers[1] = getRandom(40) + 20;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && !isFlag(kGFPlatypus) && !_s03_platypusHypnotized)
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && !isFlag(kGFPlatypus) && !_s03_platypusHypnotized)
 					_s03_nextPlatSequenceId = 450;
 			}
 			if (!_timers[6]) {
 				_timers[6] = getRandom(20) + 30;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s03_nextFrogSequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s03_nextFrogSequenceId == -1) {
 					if (getRandom(5) == 1)
 						_s03_nextFrogSequenceId = 0x1C6;
 					else
@@ -340,12 +340,12 @@ void GnapEngine::scene03_run() {
 			if (!_timers[4]) {
 				// Update bird animation
 				_timers[4] = getRandom(100) + 300;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0)
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0)
 					_gameSys->insertSequence(getRandom(2) != 0 ? 0x1C8 : 0x1C3, 253, 0, 0, kSeqNone, 0, 0, 0);
 			}
 			if (!_timers[5]) {
 				_timers[5] = getRandom(100) + 200;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0) {
 					_gameSys->setAnimation(0x1C5, 253, 4);
 					_gameSys->insertSequence(0x1C5, 253, 0, 0, kSeqNone, 0, 0, 0);
 				}
@@ -385,13 +385,13 @@ void GnapEngine::scene03_updateAnimations() {
 			_gnapActionStatus = -1;
 			_platX = 6;
 			_platY = 6;
-			_beaverFacing = kDirUnk4;
-			_beaverId = 120;
-			_gameSys->insertSequence(0x107CA, _beaverId, 0x1BC, 99,
+			_platypusFacing = kDirUnk4;
+			_platypusId = 120;
+			_gameSys->insertSequence(0x107CA, _platypusId, 0x1BC, 99,
 				kSeqSyncWait, 0, 75 * _platX - _platGridX, 48 * _platY - _platGridY);
 			_gameSys->insertSequence(0x1B7, 99, 0, 0, kSeqNone, 0, 0, 0);
-			_beaverSequenceDatNum = 1;
-			_beaverSequenceId = 0x7CA;
+			_platypusSequenceDatNum = 1;
+			_platypusSequenceId = 0x7CA;
 			setFlag(kGFPlatypus);
 			_s03_nextPlatSequenceId = -1;
 			scene03_updateHotspots();
@@ -405,16 +405,16 @@ void GnapEngine::scene03_updateAnimations() {
 				gameUpdateTick();
 			removeFullScreenSprite();
 			_gameSys->setAnimation(0x1BA, 99, 1);
-			_gameSys->insertSequence(0x1BA, 99, _beaverSequenceId | (_beaverSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
-			_beaverSequenceDatNum = 0;
-			_beaverSequenceId = 0x1BA;
+			_gameSys->insertSequence(0x1BA, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
+			_platypusSequenceDatNum = 0;
+			_platypusSequenceId = 0x1BA;
 			_gnapActionStatus = -1;
 			_s03_platypusHypnotized = true;
 			scene03_updateHotspots();
 			break;
 		case kASHypnotizeScaredPlat:
 			playGnapBrainPulsating(0, 0);
-			_gameSys->insertSequence(0x1BF, 99, _beaverSequenceId | (_beaverSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
+			_gameSys->insertSequence(0x1BF, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncExists, 0, 0, 0);
 			_gameSys->setAnimation(0x1BF, 99, 1);
 			while (_gameSys->getAnimationStatus(1) != 2)
 				gameUpdateTick();
@@ -426,8 +426,8 @@ void GnapEngine::scene03_updateAnimations() {
 			removeFullScreenSprite();
 			_gameSys->setAnimation(0x1BA, 99, 1);
 			_gameSys->insertSequence(0x1BA, 99, 447, 99, kSeqSyncWait, 0, 0, 0);
-			_beaverSequenceDatNum = 0;
-			_beaverSequenceId = 0x1BA;
+			_platypusSequenceDatNum = 0;
+			_platypusSequenceId = 0x1BA;
 			_gnapActionStatus = -1;
 			_s03_platypusHypnotized = true;
 			scene03_updateHotspots();
@@ -458,12 +458,12 @@ void GnapEngine::scene03_updateAnimations() {
 			_gameSys->setAnimation(0, 0, 1);
 			_s03_platypusScared = true;
 			_gameSys->insertSequence(0x1B5, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(_s03_nextPlatSequenceId, 99, _beaverSequenceId | (_beaverSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_gameSys->insertSequence(_s03_nextPlatSequenceId, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
 			_gnapSequenceId = 0x1B5;
 			_gnapSequenceDatNum = 0;
 			_gnapIdleFacing = kDirNone;
-			_beaverSequenceId = _s03_nextPlatSequenceId;
-			_beaverSequenceDatNum = 0;
+			_platypusSequenceId = _s03_nextPlatSequenceId;
+			_platypusSequenceDatNum = 0;
 			_gameSys->setAnimation(_s03_nextPlatSequenceId, 99, 1);
 			_s03_nextPlatSequenceId = -1;
 			_gnapActionStatus = -1;
@@ -471,7 +471,7 @@ void GnapEngine::scene03_updateAnimations() {
 			_gnapX = 3;
 			_gnapY = 6;
 			_gameSys->insertSequence(0x1B6, 120, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(0x1BC, 99, _beaverSequenceId | (_beaverSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_gameSys->insertSequence(0x1BC, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
 			_gameSys->setAnimation(0x1BC, 99, 0);
 			_gnapId = 20 * _gnapY;
 			_gnapSequenceId = 0x1B6;
@@ -481,17 +481,17 @@ void GnapEngine::scene03_updateAnimations() {
 			_s03_nextPlatSequenceId = -1;
 		} else if (_s03_nextPlatSequenceId == 0x1C2 && !_s03_platypusScared) {
 			_gameSys->setAnimation(0, 0, 1);
-			_gameSys->insertSequence(0x1C2, 99, _beaverSequenceId | (_beaverSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_beaverSequenceId = 0x1C2;
-			_beaverSequenceDatNum = 0;
+			_gameSys->insertSequence(0x1C2, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_platypusSequenceId = 0x1C2;
+			_platypusSequenceDatNum = 0;
 			_gameSys->setAnimation(0x1C2, 99, 1);
 			_s03_nextPlatSequenceId = -1;
 		} else if (_s03_nextPlatSequenceId == -1 && _s03_platypusScared && !_s03_platypusHypnotized) {
 			_gameSys->setAnimation(0, 0, 1);
 			_gameSys->setAnimation(0x1BE, 99, 1);
-			_gameSys->insertSequence(0x1BE, 99, _beaverSequenceId | (_beaverSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
-			_beaverSequenceId = 0x1BE;
-			_beaverSequenceDatNum = 0;
+			_gameSys->insertSequence(0x1BE, 99, _platypusSequenceId | (_platypusSequenceDatNum << 16), 99, kSeqSyncWait, 0, 0, 0);
+			_platypusSequenceId = 0x1BE;
+			_platypusSequenceDatNum = 0;
 			_s03_nextPlatSequenceId = -1;
 		}
 	}
diff --git a/engines/gnap/scenes/scene04.cpp b/engines/gnap/scenes/scene04.cpp
index 0f86eed02c..a233152242 100644
--- a/engines/gnap/scenes/scene04.cpp
+++ b/engines/gnap/scenes/scene04.cpp
@@ -115,7 +115,7 @@ void GnapEngine::scene04_run() {
 		_gnapId = 140;
 		_platX = 6;
 		_platY = 7;
-		_beaverId = 141;
+		_platypusId = 141;
 		_gameSys->insertSequence(0x107B5, 140, 0, 0, kSeqNone, 0, 300 - _gnapGridX, 336 - _gnapGridY);
 		_gameSys->insertSequence(0x20C, 141, 0, 0, kSeqNone, 0, 0, 0);
 		_gameSys->insertSequence(0x208, 121, 0, 0, kSeqNone, 0, 0, 0);
@@ -125,9 +125,9 @@ void GnapEngine::scene04_run() {
 		invAdd(kItemKeys);
 		setFlag(kGFKeysTaken);
 		clearFlag(kGFPlatyPussDisguised);
-		_beaverSequenceId = 0x20C;
-		_beaverSequenceDatNum = 0;
-		_beaverFacing = kDirBottomRight;
+		_platypusSequenceId = 0x20C;
+		_platypusSequenceDatNum = 0;
+		_platypusFacing = kDirBottomRight;
 		_gnapSequenceId = 0x7B5;
 		_gnapSequenceDatNum = 1;
 		_gameSys->waitForUpdate();
@@ -136,19 +136,19 @@ void GnapEngine::scene04_run() {
 		if (_prevSceneNum == 2) {
 			initGnapPos(5, 11, kDirUpRight);
 			if (isFlag(kGFPlatypus))
-				initBeaverPos(6, 11, kDirUpLeft);
+				initPlatypusPos(6, 11, kDirUpLeft);
 			endSceneInit();
 			if (isFlag(kGFPlatypus))
 				platypusWalkTo(5, 8, -1, 0x107C2, 1);
 			gnapWalkTo(6, 9, -1, 0x107BA, 1);
 		} else if (_prevSceneNum == 38) {
 			initGnapPos(5, 7, kDirBottomRight);
-			initBeaverPos(4, 7, kDirNone);
+			initPlatypusPos(4, 7, kDirNone);
 			endSceneInit();
 		} else {
 			initGnapPos(12, 9, kDirBottomRight);
 			if (isFlag(kGFPlatypus))
-				initBeaverPos(12, 8, kDirNone);
+				initPlatypusPos(12, 8, kDirNone);
 			endSceneInit();
 			if (isFlag(kGFPlatypus))
 				platypusWalkTo(9, 8, -1, 0x107C2, 1);
@@ -197,7 +197,7 @@ void GnapEngine::scene04_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -398,8 +398,8 @@ void GnapEngine::scene04_run() {
 			playSound(0x1091C, true);
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0 && isFlag(kGFPlatypus))
-				beaverSub426234();
+			if (_platypusActionStatus < 0 && isFlag(kGFPlatypus))
+				platypusSub426234();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence2();
 			if (!_timers[5]) {
diff --git a/engines/gnap/scenes/scene05.cpp b/engines/gnap/scenes/scene05.cpp
index 4a60292808..405bd2aba3 100644
--- a/engines/gnap/scenes/scene05.cpp
+++ b/engines/gnap/scenes/scene05.cpp
@@ -98,7 +98,7 @@ void GnapEngine::scene05_run() {
 	if (_prevSceneNum != 6 && _prevSceneNum != 36) {
 		initGnapPos(-1, 8, kDirBottomRight);
 		if (isFlag(kGFPlatypus))
-			initBeaverPos(-1, 9, kDirNone);
+			initPlatypusPos(-1, 9, kDirNone);
 		endSceneInit();
 		if (isFlag(kGFPlatypus))
 			platypusWalkTo(2, 8, -1, 0x107C2, 1);
@@ -106,7 +106,7 @@ void GnapEngine::scene05_run() {
 	} else {
 		initGnapPos(6, 8, kDirBottomRight);
 		if (isFlag(kGFPlatypus))
-			initBeaverPos(7, 9, kDirNone);
+			initPlatypusPos(7, 9, kDirNone);
 		endSceneInit();
 	}
 	
@@ -148,7 +148,7 @@ void GnapEngine::scene05_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -159,7 +159,7 @@ void GnapEngine::scene05_run() {
 			break;
 
 		case kHSHaystack:
-			if (_gnapActionStatus < 0 && _beaverActionStatus < 0) {
+			if (_gnapActionStatus < 0 && _platypusActionStatus < 0) {
 				if (_grabCursorSpriteIndex >= 0) {
 					playGnapShowCurrItem(_hotspotsWalkPos[1].x - 2, _hotspotsWalkPos[1].y, 4, 5);
 				} else if (isFlag(kGFNeedleTaken)) {
@@ -175,10 +175,10 @@ void GnapEngine::scene05_run() {
 						break;
 					case PLAT_CURSOR:
 						if (isFlag(kGFPlatypus)) {
-							gnapUseDeviceOnBeaver();
+							gnapUseDeviceOnPlatypuss();
 							if (platypusWalkTo(_hotspotsWalkPos[1].x, _hotspotsWalkPos[1].y, 1, 0x107C2, 1)) {
-								_beaverActionStatus = kASPlatSearchHaystack;
-								_beaverFacing = kDirUnk4;
+								_platypusActionStatus = kASPlatSearchHaystack;
+								_platypusFacing = kDirUnk4;
 							}
 							if (_gnapX == 4 && (_gnapY == 8 || _gnapY == 7))
 								gnapWalkStep();
@@ -321,7 +321,7 @@ void GnapEngine::scene05_run() {
 	
 		if (!_isLeavingScene) {
 			if (isFlag(kGFPlatypus))
-				updateBeaverIdleSequence();
+				updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[5]) {
 				_timers[5] = getRandom(20) + 30;
@@ -417,28 +417,28 @@ void GnapEngine::scene05_updateAnimations() {
 	}
 	
 	if (_gameSys->getAnimationStatus(1) == 2) {
-		if (_beaverSequenceId == 0x146) {
+		if (_platypusSequenceId == 0x146) {
 			_platX = 4;
 			_platY = 8;
 			_gameSys->insertSequence(0x107C1, 160, 0x146, 256, kSeqSyncWait, 0, 300 - _platGridX, 384 - _platGridY);
-			_beaverSequenceId = 0x7C1;
-			_beaverSequenceDatNum = 1;
-			_beaverId = 20 * _platY;
+			_platypusSequenceId = 0x7C1;
+			_platypusSequenceDatNum = 1;
+			_platypusId = 20 * _platY;
 			invAdd(kItemNeedle);
 			setFlag(kGFNeedleTaken);
 			setGrabCursorSprite(kItemNeedle);
 			showCursor();
 			_timers[1] = 30;
-			_beaverActionStatus = -1;
+			_platypusActionStatus = -1;
 		}
-		if (_beaverActionStatus == kASPlatSearchHaystack) {
+		if (_platypusActionStatus == kASPlatSearchHaystack) {
 			_gameSys->setAnimation(0, 0, 1);
-			_gameSys->insertSequence(0x145, _beaverId, _beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(0x146, 256, 0x145, _beaverId, kSeqSyncWait, 0, 0, 0);
+			_gameSys->insertSequence(0x145, _platypusId, _platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, kSeqSyncWait, 0, 0, 0);
+			_gameSys->insertSequence(0x146, 256, 0x145, _platypusId, kSeqSyncWait, 0, 0, 0);
 			hideCursor();
 			setGrabCursorSprite(-1);
-			_beaverSequenceId = 0x146;
-			_beaverSequenceDatNum = 0;
+			_platypusSequenceId = 0x146;
+			_platypusSequenceDatNum = 0;
 			_gameSys->setAnimation(0x146, 256, 1);
 			_timers[1] = 300;
 		}
diff --git a/engines/gnap/scenes/scene06.cpp b/engines/gnap/scenes/scene06.cpp
index cbe4fb44e1..a07c218f00 100644
--- a/engines/gnap/scenes/scene06.cpp
+++ b/engines/gnap/scenes/scene06.cpp
@@ -107,7 +107,7 @@ void GnapEngine::scene06_run() {
 	queueInsertDeviceIcon();
 	
 	initGnapPos(5, 12, kDirBottomRight);
-	initBeaverPos(6, 12, kDirNone);
+	initPlatypusPos(6, 12, kDirNone);
 	endSceneInit();
 	
 	platypusWalkTo(6, 8, -1, 0x107C2, 1);
@@ -151,7 +151,7 @@ void GnapEngine::scene06_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -230,7 +230,7 @@ void GnapEngine::scene06_run() {
 					_hotspots[kHSWalkArea5]._flags &= ~SF_WALKABLE;
 					_gnapIdleFacing = kDirUpLeft;
 					platypusWalkTo(6, 8, 1, 0x107C2, 1);
-					_beaverFacing = kDirNone;
+					_platypusFacing = kDirNone;
 					_gnapActionStatus = kASUseTwigOnHorse;
 					setGrabCursorSprite(-1);
 				} else if (_grabCursorSpriteIndex >= 0) {
@@ -294,13 +294,13 @@ void GnapEngine::scene06_run() {
 		scene06_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0)
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0)
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(40) + 25;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s06_nextHorseSequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s06_nextHorseSequenceId == -1) {
 					if (_s06_horseTurnedBack) {
 						_s06_nextHorseSequenceId = 0xF5;
 					} else {
@@ -379,18 +379,18 @@ void GnapEngine::scene06_updateAnimations() {
 	
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		if (_beaverSequenceId == 0xFA) {
+		if (_platypusSequenceId == 0xFA) {
 			_gameSys->setAnimation(0, 0, 1);
 			invAdd(kItemGas);
 			setFlag(kGFGasTaken);
 			_hotspots[kHSLadder]._flags = SF_DISABLED;
 			setGrabCursorSprite(kItemGas);
-			_beaverActionStatus = -1;
+			_platypusActionStatus = -1;
 			_platX = 6;
 			_platY = 8;
-			_gameSys->insertSequence(0x107C1, _beaverId, 0, 0, kSeqNone, 0, 450 - _platGridX, 384 - _platGridY);
-			_beaverSequenceId = 0x7C1;
-			_beaverSequenceDatNum = 1;
+			_gameSys->insertSequence(0x107C1, _platypusId, 0, 0, kSeqNone, 0, 450 - _platGridX, 384 - _platGridY);
+			_platypusSequenceId = 0x7C1;
+			_platypusSequenceDatNum = 1;
 			setFlag(kGFUnk04);
 			_gnapActionStatus = -1;
 			showCursor();
@@ -398,7 +398,7 @@ void GnapEngine::scene06_updateAnimations() {
 		if (_s06_nextPlatSequenceId == 0xFB) {
 			_gameSys->setAnimation(0, 0, 1);
 			_s06_nextHorseSequenceId = 0xF2;
-			_beaverActionStatus = 6;
+			_platypusActionStatus = 6;
 		}
 	}
 	
@@ -411,10 +411,10 @@ void GnapEngine::scene06_updateAnimations() {
 			_gameSys->insertSequence(0xF2, 120, _s06_currHorseSequenceId, 120, kSeqSyncWait, 0, 0, 0);
 			_gameSys->insertSequence(0x100, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
 			_gameSys->insertSequence(0xF7, 20, 0xF8, 20, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(0xFB, _beaverId, _beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(0xFA, 256, 0xFB, _beaverId, kSeqSyncWait, 0, 0, 0);
-			_beaverSequenceId = 0xFA;
-			_beaverSequenceDatNum = 0;
+			_gameSys->insertSequence(0xFB, _platypusId, _platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, kSeqSyncWait, 0, 0, 0);
+			_gameSys->insertSequence(0xFA, 256, 0xFB, _platypusId, kSeqSyncWait, 0, 0, 0);
+			_platypusSequenceId = 0xFA;
+			_platypusSequenceDatNum = 0;
 			_gameSys->insertSequence(0x107B7, _gnapId, 0x100, _gnapId,
 				kSeqSyncWait, 0, 75 * _gnapX - _gnapGridX, 48 * _gnapY - _gnapGridY);
 			_gnapSequenceId = 0x7B7;
diff --git a/engines/gnap/scenes/scene07.cpp b/engines/gnap/scenes/scene07.cpp
index d240378eca..3d392d6b74 100644
--- a/engines/gnap/scenes/scene07.cpp
+++ b/engines/gnap/scenes/scene07.cpp
@@ -72,7 +72,7 @@ void GnapEngine::scene07_run() {
 
 	if (_prevSceneNum == 8) {
 		initGnapPos(7, 7, kDirBottomLeft);
-		initBeaverPos(9, 7, kDirUnk4);
+		initPlatypusPos(9, 7, kDirUnk4);
 		endSceneInit();
 	} else {
 		_gnapX = 6;
@@ -86,10 +86,10 @@ void GnapEngine::scene07_run() {
 		_gnapActionStatus = kASWait;
 		_platX = 3;
 		_platY = 8;
-		_beaverId = 160;
-		_beaverSequenceId = 0x91;
-		_beaverSequenceDatNum = 0;
-		_beaverFacing = kDirNone;
+		_platypusId = 160;
+		_platypusSequenceId = 0x91;
+		_platypusSequenceDatNum = 0;
+		_platypusFacing = kDirNone;
 		_gameSys->insertSequence(0x91, 160, 0, 0, kSeqNone, 0, 0, 0);
 		endSceneInit();
 	}
@@ -123,7 +123,7 @@ void GnapEngine::scene07_run() {
 				break;
 			case TALK_CURSOR:
 				playGnapBrainPulsating(_platX, _platY);
-				playBeaverSequence(getBeaverSequenceId());
+				playPlatypusSequence(getPlatypusSequenceId());
 				break;
 			case PLAT_CURSOR:
 				break;
@@ -197,38 +197,38 @@ void GnapEngine::scene07_run() {
 
 		if (!_isLeavingScene) {
 			updateGnapIdleSequence();
-			if (_beaverActionStatus < 0 && _gnapActionStatus < 0) {
+			if (_platypusActionStatus < 0 && _gnapActionStatus < 0) {
 				if (_timers[0]) {
 					if (!_timers[1]) {
 						_timers[1] = getRandom(20) + 30;
 						int _gnapRandomValue = getRandom(20);
 						// TODO Cleanup
-						if (_beaverFacing != kDirNone) {
-							if (_gnapRandomValue != 0 || _beaverSequenceId != 0x7CA) {
-								if (_gnapRandomValue != 1 || _beaverSequenceId != 0x7CA) {
+						if (_platypusFacing != kDirNone) {
+							if (_gnapRandomValue != 0 || _platypusSequenceId != 0x7CA) {
+								if (_gnapRandomValue != 1 || _platypusSequenceId != 0x7CA) {
 									if (_platY == 9)
-										playBeaverSequence(0x107CA);
+										playPlatypusSequence(0x107CA);
 								} else {
-									playBeaverSequence(0x10845);
+									playPlatypusSequence(0x10845);
 								}
 							} else {
-								playBeaverSequence(0x107CC);
+								playPlatypusSequence(0x107CC);
 							}
-						} else if (_gnapRandomValue != 0 || _beaverSequenceId != 0x7C9) {
-							if (_gnapRandomValue != 1 || _beaverSequenceId != 0x7C9) {
+						} else if (_gnapRandomValue != 0 || _platypusSequenceId != 0x7C9) {
+							if (_gnapRandomValue != 1 || _platypusSequenceId != 0x7C9) {
 								if (_platY == 9)
-									playBeaverSequence(0x107C9);
+									playPlatypusSequence(0x107C9);
 							} else {
-								playBeaverSequence(0x10844);
+								playPlatypusSequence(0x10844);
 							}
 						} else {
-							playBeaverSequence(0x107CB);
+							playPlatypusSequence(0x107CB);
 						}
-						_gameSys->setAnimation(_beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, 1);
+						_gameSys->setAnimation(_platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, 1);
 					}
 				} else {
 					_timers[0] = getRandom(75) + 75;
-					beaverMakeRoom();
+					platypusMakeRoom();
 				}
 			} else {
 				_timers[0] = 100;
diff --git a/engines/gnap/scenes/scene08.cpp b/engines/gnap/scenes/scene08.cpp
index ed67669d5d..f31c05d0c3 100644
--- a/engines/gnap/scenes/scene08.cpp
+++ b/engines/gnap/scenes/scene08.cpp
@@ -117,7 +117,7 @@ void GnapEngine::scene08_run() {
 		_gameSys->insertSequence(0x146, 1, 0, 0, kSeqNone, 0, 0, 0);
 	
 	initGnapPos(-1, 8, kDirBottomRight);
-	initBeaverPos(-1, 7, kDirNone);
+	initPlatypusPos(-1, 7, kDirNone);
 	
 	endSceneInit();
 	
@@ -167,7 +167,7 @@ void GnapEngine::scene08_run() {
 					break;
 				case TALK_CURSOR:
 					playGnapBrainPulsating(_platX, _platY);
-					playBeaverSequence(getBeaverSequenceId());
+					playPlatypusSequence(getPlatypusSequenceId());
 					break;
 				case PLAT_CURSOR:
 					break;
@@ -215,10 +215,10 @@ void GnapEngine::scene08_run() {
 					break;
 				case PLAT_CURSOR:
 					gnapActionIdle(0x14D);
-					gnapUseDeviceOnBeaver();
+					gnapUseDeviceOnPlatypuss();
 					platypusWalkTo(6, 6, 1, 0x107C2, 1);
-					_beaverActionStatus = kASPlatWithMan;
-					_beaverFacing = kDirNone;
+					_platypusActionStatus = kASPlatWithMan;
+					_platypusFacing = kDirNone;
 					playGnapIdle(6, 6);
 					break;
 				}
@@ -251,10 +251,10 @@ void GnapEngine::scene08_run() {
 				case PLAT_CURSOR:
 					setFlag(kGFSceneFlag1);
 					gnapActionIdle(0x14D);
-					gnapUseDeviceOnBeaver();
+					gnapUseDeviceOnPlatypuss();
 					platypusWalkTo(3, 7, 1, 0x107C2, 1);
-					_beaverActionStatus = kASPlatWithDog;
-					_beaverFacing = kDirNone;
+					_platypusActionStatus = kASPlatWithDog;
+					_platypusFacing = kDirNone;
 					playGnapIdle(3, 7);
 					break;
 				}
@@ -358,11 +358,11 @@ void GnapEngine::scene08_run() {
 		scene08_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(50) + 125;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s08_nextManSequenceId == -1 &&
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s08_nextManSequenceId == -1 &&
 					(_s08_currDogSequenceId == 0x134 || _s08_currDogSequenceId == 0x135)) {
 					int _gnapRandomValue = getRandom(4);
 					switch (_gnapRandomValue) {
@@ -438,13 +438,13 @@ void GnapEngine::scene08_updateAnimations() {
 	
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		switch (_beaverActionStatus) {
+		switch (_platypusActionStatus) {
 		case kASPlatWithDog:
 			_s08_nextDogSequenceId = 0x147;
 			break;
 		case kASPlatWithMan:
 			_s08_nextManSequenceId = 0x140;
-			_beaverActionStatus = -1;
+			_platypusActionStatus = -1;
 			break;
 		}
 	}
@@ -458,7 +458,7 @@ void GnapEngine::scene08_updateAnimations() {
 	
 	if (_gameSys->getAnimationStatus(3) == 2) {
 		if (_s08_currDogSequenceId == 0x147)
-			_beaverActionStatus = -1;
+			_platypusActionStatus = -1;
 		if (_s08_currDogSequenceId == 0x149 || _s08_currDogSequenceId == 0x14A || _s08_currDogSequenceId == 0x14B) {
 			if (getRandom(2) != 0)
 				_s08_nextManSequenceId = 0x13D;
@@ -491,15 +491,15 @@ void GnapEngine::scene08_updateAnimations() {
 		} else if (_s08_nextDogSequenceId == 0x147) {
 			_gameSys->setAnimation(_s08_nextDogSequenceId, 100, 3);
 			_gameSys->insertSequence(_s08_nextDogSequenceId, 100, _s08_currDogSequenceId, 100, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(0x148, 160, _beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, kSeqSyncWait, 0, 0, 0);
+			_gameSys->insertSequence(0x148, 160, _platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, kSeqSyncWait, 0, 0, 0);
 			_s08_currDogSequenceId = _s08_nextDogSequenceId;
 			_s08_nextDogSequenceId = 0x134;
 			_platX = 1;
 			_platY = 8;
-			_beaverId = 160;
-			_beaverSequenceId = 0x148;
-			_beaverFacing = kDirUnk4;
-			_beaverSequenceDatNum = 0;
+			_platypusId = 160;
+			_platypusSequenceId = 0x148;
+			_platypusFacing = kDirUnk4;
+			_platypusSequenceDatNum = 0;
 			if (_gnapX == 1 && _gnapY == 8)
 				gnapWalkStep();
 		} else if (_s08_nextDogSequenceId != -1) {
diff --git a/engines/gnap/scenes/scene09.cpp b/engines/gnap/scenes/scene09.cpp
index cf1af00ca2..7d9a4a9576 100644
--- a/engines/gnap/scenes/scene09.cpp
+++ b/engines/gnap/scenes/scene09.cpp
@@ -68,13 +68,13 @@ void GnapEngine::scene09_run() {
 	
 	if (_prevSceneNum == 8) {
 		initGnapPos(11, 8, kDirBottomLeft);
-		initBeaverPos(12, 7, kDirUnk4);
+		initPlatypusPos(12, 7, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(9, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 7, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(4, 7, kDirBottomRight);
-		initBeaverPos(5, 7, kDirNone);
+		initPlatypusPos(5, 7, kDirNone);
 		endSceneInit();
 	}
 
@@ -115,7 +115,7 @@ void GnapEngine::scene09_run() {
 				break;
 			case TALK_CURSOR:
 				playGnapBrainPulsating(_platX, _platY);
-				playBeaverSequence(getBeaverSequenceId());
+				playPlatypusSequence(getPlatypusSequenceId());
 				break;
 			case PLAT_CURSOR:
 				break;
@@ -128,7 +128,7 @@ void GnapEngine::scene09_run() {
 			gnapWalkTo(4, 7, 0, 0x107BF, 1);
 			_gnapActionStatus = kASLeaveScene;
 			platypusWalkTo(4, 8, -1, 0x107D2, 1);
-			_beaverFacing = kDirUnk4;
+			_platypusFacing = kDirUnk4;
 			break;
 
 		case kHSExitHouse:
@@ -137,7 +137,7 @@ void GnapEngine::scene09_run() {
 			gnapWalkTo(10, -1, 0, 0x107AB, 1);
 			_gnapActionStatus = kASLeaveScene;
 			platypusWalkTo(10, -1, -1, 0x107CD, 1);
-			_beaverFacing = kDirUnk4;
+			_platypusFacing = kDirUnk4;
 			break;
 
 		case kHSTrash:
@@ -178,7 +178,7 @@ void GnapEngine::scene09_run() {
 		scene09_updateAnimations();
 	
 		if (!_isLeavingScene && _gnapActionStatus != 1 && _gnapActionStatus != 2) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(150) + 100;
diff --git a/engines/gnap/scenes/scene10.cpp b/engines/gnap/scenes/scene10.cpp
index 5650dd1d16..b750ea4ed4 100644
--- a/engines/gnap/scenes/scene10.cpp
+++ b/engines/gnap/scenes/scene10.cpp
@@ -85,13 +85,13 @@ void GnapEngine::scene10_run() {
 	
 	if (_prevSceneNum == 9) {
 		initGnapPos(11, 8, kDirBottomLeft);
-		initBeaverPos(12, 7, kDirUnk4);
+		initPlatypusPos(12, 7, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(9, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 7, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(-1, 7, kDirBottomRight);
-		initBeaverPos(-2, 8, kDirNone);
+		initPlatypusPos(-2, 8, kDirNone);
 		endSceneInit();
 		gnapWalkTo(1, 7, -1, 0x107B9, 1);
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
@@ -135,7 +135,7 @@ void GnapEngine::scene10_run() {
 					break;
 				case TALK_CURSOR:
 					playGnapBrainPulsating(_platX, _platY);
-					playBeaverSequence(getBeaverSequenceId());
+					playPlatypusSequence(getPlatypusSequenceId());
 					break;
 				case PLAT_CURSOR:
 					break;
@@ -183,7 +183,7 @@ void GnapEngine::scene10_run() {
 					break;
 				case PLAT_CURSOR:
 					gnapActionIdle(0x10C);
-					gnapUseDeviceOnBeaver();
+					gnapUseDeviceOnPlatypuss();
 					platypusWalkTo(4, 6, -1, -1, 1);
 					gnapWalkTo(4, 8, 0, 0x107BB, 1);
 					_gnapActionStatus = kASAnnoyCook;
@@ -220,7 +220,7 @@ void GnapEngine::scene10_run() {
 						playGnapMoan2(-1, -1);
 					else {
 						gnapActionIdle(0x10C);
-						gnapUseDeviceOnBeaver();
+						gnapUseDeviceOnPlatypuss();
 						platypusWalkTo(3, 7, -1, -1, 1);
 						gnapWalkTo(4, 8, 0, 0x107BB, 1);
 						_gnapActionStatus = kASAnnoyCook;
@@ -253,10 +253,10 @@ void GnapEngine::scene10_run() {
 						invAdd(kItemTongs);
 						setFlag(kGFMudTaken);
 						gnapActionIdle(0x10C);
-						gnapUseDeviceOnBeaver();
+						gnapUseDeviceOnPlatypuss();
 						platypusWalkTo(7, 6, 1, 0x107D2, 1);
-						_beaverActionStatus = kASPlatWithBox;
-						_beaverFacing = kDirUnk4;
+						_platypusActionStatus = kASPlatWithBox;
+						_platypusFacing = kDirUnk4;
 						_largeSprite = _gameSys->createSurface(0xC3);
 						playGnapIdle(7, 6);
 					}
@@ -321,7 +321,7 @@ void GnapEngine::scene10_run() {
 		scene10_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(80) + 150;
@@ -374,7 +374,7 @@ void GnapEngine::scene10_updateAnimations() {
 	
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		switch (_beaverActionStatus) {
+		switch (_platypusActionStatus) {
 		case kASPlatWithBox:
 			_s10_nextCookSequenceId = 0x109;
 			break;
@@ -389,16 +389,16 @@ void GnapEngine::scene10_updateAnimations() {
 			_platY = 8;
 			_gameSys->insertSequence(0x109, 100, _s10_currCookSequenceId, 100, kSeqSyncWait, 0, 0, 0);
 			_gameSys->insertSequence(0x107C9, 160,
-				_beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId,
+				_platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId,
 				kSeqSyncWait, getSequenceTotalDuration(0x109) + getSequenceTotalDuration(0x10A) + getSequenceTotalDuration(0x10843),
 				75 * _platX - _platGridX, 48 * _platY - _platGridY);
 			_gameSys->removeSequence(0x107, 100, true);
 			_s10_currCookSequenceId = 0x109;
 			_s10_nextCookSequenceId = 0x843;
-			_beaverSequenceId = 0x7C9;
-			_beaverId = 160;
-			_beaverFacing = kDirNone;
-			_beaverSequenceDatNum = 1;
+			_platypusSequenceId = 0x7C9;
+			_platypusId = 160;
+			_platypusFacing = kDirNone;
+			_platypusSequenceDatNum = 1;
 			break;
 		case 0x843:
 			hideCursor();
@@ -416,8 +416,8 @@ void GnapEngine::scene10_updateAnimations() {
 			delayTicksCursor(5);
 			deleteSurface(&_largeSprite);
 			setGrabCursorSprite(kItemTongs);
-			if (_beaverActionStatus == kASPlatWithBox)
-				_beaverActionStatus = -1;
+			if (_platypusActionStatus == kASPlatWithBox)
+				_platypusActionStatus = -1;
 			if (_gnapX == 4 && _gnapY == 8)
 				gnapWalkStep();
 			break;
@@ -431,7 +431,7 @@ void GnapEngine::scene10_updateAnimations() {
 		case 0x106: {
 			// TODO: Refactor into a if + a switch
 			int rnd = getRandom(7);
-			if (_gnapActionStatus >= 0 || _beaverActionStatus >= 0)
+			if (_gnapActionStatus >= 0 || _platypusActionStatus >= 0)
 				_s10_nextCookSequenceId = 0x106;
 			else if (rnd == 0)
 				_s10_nextCookSequenceId = 0x104;
@@ -445,7 +445,7 @@ void GnapEngine::scene10_updateAnimations() {
 			}
 			break;
 		case 0x103:
-			if (_gnapActionStatus >= 0 || _beaverActionStatus >= 0)
+			if (_gnapActionStatus >= 0 || _platypusActionStatus >= 0)
 				_s10_nextCookSequenceId = 0x106;
 			else if (getRandom(7) == 0)
 				_s10_nextCookSequenceId = 0x104;
@@ -453,7 +453,7 @@ void GnapEngine::scene10_updateAnimations() {
 				_s10_nextCookSequenceId = 0x106;
 			break;
 		case 0x104:
-			if (_gnapActionStatus >= 0 || _beaverActionStatus >= 0)
+			if (_gnapActionStatus >= 0 || _platypusActionStatus >= 0)
 				_s10_nextCookSequenceId = 0x106;
 			else if (getRandom(7) == 0)
 				_s10_nextCookSequenceId = 0x103;
@@ -463,7 +463,7 @@ void GnapEngine::scene10_updateAnimations() {
 		case 0x105: {
 			// TODO: Refactor into a if + a switch
 			int rnd = getRandom(7);
-			if (_gnapActionStatus >= 0 || _beaverActionStatus >= 0)
+			if (_gnapActionStatus >= 0 || _platypusActionStatus >= 0)
 				_s10_nextCookSequenceId = 0x106;
 			else if (rnd == 0)
 				_s10_nextCookSequenceId = 0x104;
@@ -478,7 +478,7 @@ void GnapEngine::scene10_updateAnimations() {
 			_gnapIdleFacing = kDirUpRight;
 			_gnapSequenceDatNum = 0;
 			_gnapActionStatus = -1;
-			_beaverActionStatus = -1;
+			_platypusActionStatus = -1;
 			}
 			break;
 		}
diff --git a/engines/gnap/scenes/scene11.cpp b/engines/gnap/scenes/scene11.cpp
index 68a261bf72..35a575cd27 100644
--- a/engines/gnap/scenes/scene11.cpp
+++ b/engines/gnap/scenes/scene11.cpp
@@ -94,22 +94,22 @@ void GnapEngine::scene11_run() {
 	switch (_prevSceneNum) {
 	case 13:
 		initGnapPos(8, 5, kDirBottomLeft);
-		initBeaverPos(9, 6, kDirUnk4);
+		initPlatypusPos(9, 6, kDirUnk4);
 		break;
 	case 47:
 		initGnapPos(8, 5, kDirBottomLeft);
-		initBeaverPos(9, 5, kDirUnk4);
+		initPlatypusPos(9, 5, kDirUnk4);
 		_s11_currGoggleGuySequenceId = 0x1FA;
 		_s11_currHookGuySequenceId = 0x1FF;
 		_timers[7] = 180;
 		break;
 	case 12:
 		initGnapPos(-1, 9, kDirBottomRight);
-		initBeaverPos(-2, 8, kDirNone);
+		initPlatypusPos(-2, 8, kDirNone);
 		break;
 	default:
 		initGnapPos(6, 6, kDirBottomLeft);
-		initBeaverPos(6, 5, kDirUnk4);
+		initPlatypusPos(6, 5, kDirUnk4);
 		break;
 	}
 	
@@ -163,7 +163,7 @@ void GnapEngine::scene11_run() {
 					break;
 				case TALK_CURSOR:
 					playGnapBrainPulsating(_platX, _platY);
-					playBeaverSequence(getBeaverSequenceId());
+					playPlatypusSequence(getPlatypusSequenceId());
 					break;
 				case PLAT_CURSOR:
 					break;
@@ -306,11 +306,11 @@ void GnapEngine::scene11_run() {
 				_gameSys->setAnimation(0x207, 257, 4);
 				_gameSys->insertSequence(0x207, 257, 0, 0, kSeqNone, 0, 0, 0);
 			}
-			beaverSub426234();
+			platypusSub426234();
 			updateGnapIdleSequence2();
 			if (!_timers[5]) {
 				_timers[5] = getRandom(100) + 75;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s11_nextGoggleGuySequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s11_nextGoggleGuySequenceId == -1) {
 					if (getRandom(2))
 						_s11_nextGoggleGuySequenceId = 0x1F6;
 					else
@@ -319,7 +319,7 @@ void GnapEngine::scene11_run() {
 			}
 			if (!_timers[4]) {
 				_timers[4] = getRandom(40) + 20;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s11_nextHookGuySequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s11_nextHookGuySequenceId == -1) {
 					if (_s11_currHookGuySequenceId == 0x201) {
 						switch (getRandom(7)) {
 						case 0:
diff --git a/engines/gnap/scenes/scene12.cpp b/engines/gnap/scenes/scene12.cpp
index dcd62a36a6..a60e6a2dfa 100644
--- a/engines/gnap/scenes/scene12.cpp
+++ b/engines/gnap/scenes/scene12.cpp
@@ -112,11 +112,11 @@ void GnapEngine::scene12_run() {
 	
 	if (_prevSceneNum == 15) {
 		initGnapPos(5, 6, kDirBottomRight);
-		initBeaverPos(3, 7, kDirNone);
+		initPlatypusPos(3, 7, kDirNone);
 		endSceneInit();
 	} else {
 		initGnapPos(11, 8, kDirBottomLeft);
-		initBeaverPos(12, 8, kDirUnk4);
+		initPlatypusPos(12, 8, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 8, -1, 0x107D2, 1);
@@ -152,7 +152,7 @@ void GnapEngine::scene12_run() {
 				break;
 			case TALK_CURSOR:
 				playGnapBrainPulsating(_platX, _platY);
-				playBeaverSequence(getBeaverSequenceId());
+				playPlatypusSequence(getPlatypusSequenceId());
 				break;
 			case PLAT_CURSOR:
 				break;
@@ -200,10 +200,10 @@ void GnapEngine::scene12_run() {
 					_gnapActionStatus = kASTalkToothGuy;
 					break;
 				case PLAT_CURSOR:
-					gnapUseDeviceOnBeaver();
+					gnapUseDeviceOnPlatypuss();
 					platypusWalkTo(3, 7, 1, 0x107D2, 1);
-					_beaverActionStatus = kASPlatWithToothGuy;
-					_beaverFacing = kDirUnk4;
+					_platypusActionStatus = kASPlatWithToothGuy;
+					_platypusFacing = kDirUnk4;
 					playGnapIdle(2, 7);
 					break;
 				}
@@ -270,10 +270,10 @@ void GnapEngine::scene12_run() {
 					_gnapActionStatus = kASTalkBeardGuy;
 					break;
 				case PLAT_CURSOR:
-					gnapUseDeviceOnBeaver();
+					gnapUseDeviceOnPlatypuss();
 					platypusWalkTo(7, 6, 1, 0x107C2, 1);
-					_beaverActionStatus = kASPlatWithBeardGuy;
-					_beaverFacing = kDirNone;
+					_platypusActionStatus = kASPlatWithBeardGuy;
+					_platypusFacing = kDirNone;
 					playGnapIdle(7, 6);
 					break;
 				}
@@ -307,12 +307,12 @@ void GnapEngine::scene12_run() {
 		scene12_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = 15;
 				if (_s12_nextToothGuySequenceId == -1) {
-					if (v18 == 0 && _s12_currBeardGuySequenceId == 0x202 && _s12_currBarkeeperSequenceId == 0x203 && _gnapActionStatus < 0 && _beaverActionStatus < 0) {
+					if (v18 == 0 && _s12_currBeardGuySequenceId == 0x202 && _s12_currBarkeeperSequenceId == 0x203 && _gnapActionStatus < 0 && _platypusActionStatus < 0) {
 						if (getRandom(2) != 0)
 							_s12_nextToothGuySequenceId = 0x1EC;
 						else
@@ -324,8 +324,8 @@ void GnapEngine::scene12_run() {
 			}
 			if (!_timers[5]) {
 				_timers[5] = getRandom(30) + 20;
-				if (_s12_nextBarkeeperSequenceId == -1 && _gnapActionStatus < 0 && _beaverActionStatus < 0) {
-					if (v18 == 0 && _s12_currToothGuySequenceId == 0x200 && _s12_currBeardGuySequenceId == 0x202 && _gnapActionStatus < 0 && _beaverActionStatus < 0) {
+				if (_s12_nextBarkeeperSequenceId == -1 && _gnapActionStatus < 0 && _platypusActionStatus < 0) {
+					if (v18 == 0 && _s12_currToothGuySequenceId == 0x200 && _s12_currBeardGuySequenceId == 0x202 && _gnapActionStatus < 0 && _platypusActionStatus < 0) {
 						if (getRandom(2) != 0)
 							_s12_nextBarkeeperSequenceId = 0x208;
 						else
@@ -337,8 +337,8 @@ void GnapEngine::scene12_run() {
 			}
 			if (!_timers[6]) {
 				_timers[6] = getRandom(30) + 15;
-				if (_s12_nextBeardGuySequenceId == -1 && _gnapActionStatus < 0 && _beaverActionStatus < 0) {
-					if (v18 == 0 && _s12_currToothGuySequenceId == 0x200 && _s12_currBarkeeperSequenceId == 0x203 && _gnapActionStatus < 0 && _beaverActionStatus < 0)
+				if (_s12_nextBeardGuySequenceId == -1 && _gnapActionStatus < 0 && _platypusActionStatus < 0) {
+					if (v18 == 0 && _s12_currToothGuySequenceId == 0x200 && _s12_currBarkeeperSequenceId == 0x203 && _gnapActionStatus < 0 && _platypusActionStatus < 0)
 						_s12_nextBeardGuySequenceId = 0x1F2;
 					else
 						_s12_nextBeardGuySequenceId = 0x202;
@@ -475,7 +475,7 @@ void GnapEngine::scene12_updateAnimations() {
 	
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		switch (_beaverActionStatus) {
+		switch (_platypusActionStatus) {
 		case kASPlatWithToothGuy:
 			_s12_nextToothGuySequenceId = 0x1EB;
 			break;
@@ -523,8 +523,8 @@ void GnapEngine::scene12_updateAnimations() {
 			if (_gnapActionStatus >= kASTalkToothGuy && _gnapActionStatus <= kASQuarterToToothGuy && _s12_currToothGuySequenceId != 0x1E9 &&
 				_s12_currToothGuySequenceId != 0x1EC && _s12_currToothGuySequenceId != 0x200)
 				_gnapActionStatus = -1;
-			if (_beaverActionStatus == kASPlatWithToothGuy)
-				_beaverActionStatus = -1;
+			if (_platypusActionStatus == kASPlatWithToothGuy)
+				_platypusActionStatus = -1;
 		}
 	}
 	
@@ -554,8 +554,8 @@ void GnapEngine::scene12_updateAnimations() {
 		_timers[6] = getRandom(30) + 20;
 		if (_gnapActionStatus >= kASTalkBeardGuy && _gnapActionStatus <= kASShowItemToBeardGuy && _s12_currBeardGuySequenceId != 0x202 && _s12_currBeardGuySequenceId != 0x1F2)
 			_gnapActionStatus = -1;
-		if (_beaverActionStatus == kASPlatWithBeardGuy)
-			_beaverActionStatus = -1;
+		if (_platypusActionStatus == kASPlatWithBeardGuy)
+			_platypusActionStatus = -1;
 	}
 
 }
diff --git a/engines/gnap/scenes/scene13.cpp b/engines/gnap/scenes/scene13.cpp
index cff04bba2f..007c3806b5 100644
--- a/engines/gnap/scenes/scene13.cpp
+++ b/engines/gnap/scenes/scene13.cpp
@@ -108,10 +108,10 @@ void GnapEngine::scene13_run() {
 	
 	if (_prevSceneNum == 14) {
 		initGnapPos(6, 6, kDirBottomLeft);
-		initBeaverPos(9, 8, kDirNone);
+		initPlatypusPos(9, 8, kDirNone);
 	} else {
 		initGnapPos(3, 7, kDirBottomRight);
-		initBeaverPos(2, 7, kDirNone);
+		initPlatypusPos(2, 7, kDirNone);
 	}
 
 	endSceneInit();
@@ -153,7 +153,7 @@ void GnapEngine::scene13_run() {
 				break;
 			case TALK_CURSOR:
 				playGnapBrainPulsating(_platX, _platY);
-				playBeaverSequence(getBeaverSequenceId());
+				playPlatypusSequence(getPlatypusSequenceId());
 				break;
 			case PLAT_CURSOR:
 				break;
@@ -316,7 +316,7 @@ void GnapEngine::scene13_run() {
 		scene13_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			if (_platY == 5 || _platY == 6)
 				platypusWalkTo(-1, 7, -1, -1, 1);
 			if (_gnapActionStatus < 0)
@@ -445,7 +445,7 @@ void GnapEngine::scene13_updateAnimations() {
 	
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		_beaverActionStatus = -1;
+		_platypusActionStatus = -1;
 	}
 
 }
diff --git a/engines/gnap/scenes/scene17.cpp b/engines/gnap/scenes/scene17.cpp
index 37427bd34f..cf5945dde8 100644
--- a/engines/gnap/scenes/scene17.cpp
+++ b/engines/gnap/scenes/scene17.cpp
@@ -94,19 +94,19 @@ void GnapEngine::scene17_update() {
 void GnapEngine::scene17_platHangUpPhone() {
 	int savedGnapActionStatus = _gnapActionStatus;
 
-	if (_beaverActionStatus == kASPlatPhoningAssistant) {
+	if (_platypusActionStatus == kASPlatPhoningAssistant) {
 		_gnapActionStatus = kASPlatHangUpPhone;
 		updateMouseCursor();
 		_s17_platPhoneCtr = 0;
-		_beaverActionStatus = -1;
+		_platypusActionStatus = -1;
 		_gameSys->setAnimation(0x257, 254, 4);
 		_gameSys->insertSequence(0x257, 254, _s17_currPhoneSequenceId, 254, kSeqSyncExists, 0, 0, 0);
 		while (_gameSys->getAnimationStatus(4) != 2)
 			gameUpdateTick();
-		_gameSys->setAnimation(0x25B, _beaverId, 1);
-		_gameSys->insertSequence(0x25B, _beaverId, _beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, kSeqSyncWait, 0, 0, 0);
-		_beaverSequenceId = 0x25B;
-		_beaverSequenceDatNum = 0;
+		_gameSys->setAnimation(0x25B, _platypusId, 1);
+		_gameSys->insertSequence(0x25B, _platypusId, _platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, kSeqSyncWait, 0, 0, 0);
+		_platypusSequenceId = 0x25B;
+		_platypusSequenceDatNum = 0;
 		_s17_currPhoneSequenceId = -1;
 		_s17_nextPhoneSequenceId = -1;
 		clearFlag(kGFPlatypusTalkingToAssistant);
@@ -177,7 +177,7 @@ void GnapEngine::scene17_run() {
 	if (_prevSceneNum == 53 || _prevSceneNum == 18 || _prevSceneNum == 20 || _prevSceneNum == 19) {
 		if (_prevSceneNum == 20) {
 			initGnapPos(4, 6, kDirBottomRight);
-			initBeaverPos(5, 6, kDirNone);
+			initPlatypusPos(5, 6, kDirNone);
 			endSceneInit();
 			platypusWalkTo(5, 9, -1, 0x107C2, 1);
 			gnapWalkTo(4, 8, -1, 0x107B9, 1);
@@ -185,15 +185,15 @@ void GnapEngine::scene17_run() {
 			initGnapPos(3, 9, kDirUpLeft);
 			_platX = _hotspotsWalkPos[2].x;
 			_platY = _hotspotsWalkPos[2].y;
-			_beaverId = 20 * _hotspotsWalkPos[2].y;
+			_platypusId = 20 * _hotspotsWalkPos[2].y;
 			_gameSys->insertSequence(0x25A, 20 * _hotspotsWalkPos[2].y, 0, 0, kSeqNone, 0, 0, 0);
 			_gameSys->insertSequence(0x257, 254, 0, 0, kSeqNone, 0, 0, 0);
-			_beaverSequenceId = 0x25A;
-			_beaverSequenceDatNum = 0;
+			_platypusSequenceId = 0x25A;
+			_platypusSequenceDatNum = 0;
 			endSceneInit();
 			clearFlag(kGFSpringTaken);
 			clearFlag(kGFUnk16);
-			_beaverActionStatus = kASPlatPhoningAssistant;
+			_platypusActionStatus = kASPlatPhoningAssistant;
 			scene17_platHangUpPhone();
 			_gameSys->setAnimation(0, 0, 4);
 			clearFlag(kGFPlatypusTalkingToAssistant);
@@ -202,7 +202,7 @@ void GnapEngine::scene17_run() {
 		} else if (isFlag(kGFUnk25)) {
 			clearFlag(kGFSpringTaken);
 			clearFlag(kGFUnk16);
-			initBeaverPos(7, 9, kDirNone);
+			initPlatypusPos(7, 9, kDirNone);
 			_gnapX = _hotspotsWalkPos[2].x;
 			_gnapY = _hotspotsWalkPos[2].y;
 			_gnapId = 20 * _hotspotsWalkPos[2].y;
@@ -222,30 +222,30 @@ void GnapEngine::scene17_run() {
 			initGnapPos(3, 9, kDirUpLeft);
 			_platX = _hotspotsWalkPos[2].x;
 			_platY = _hotspotsWalkPos[2].y;
-			_beaverId = 20 * _hotspotsWalkPos[2].y;
+			_platypusId = 20 * _hotspotsWalkPos[2].y;
 			_s17_currPhoneSequenceId = 0x251;
 			_gameSys->insertSequence(0x25A, 20 * _hotspotsWalkPos[2].y, 0, 0, kSeqNone, 0, 0, 0);
 			_gameSys->insertSequence(_s17_currPhoneSequenceId, 254, 0, 0, kSeqNone, 0, 0, 0);
-			_beaverSequenceId = 0x25A;
-			_beaverSequenceDatNum = 0;
+			_platypusSequenceId = 0x25A;
+			_platypusSequenceDatNum = 0;
 			endSceneInit();
 			_gameSys->setAnimation(_s17_currPhoneSequenceId, 254, 1);
-			_beaverActionStatus = kASPlatPhoningAssistant;
+			_platypusActionStatus = kASPlatPhoningAssistant;
 			scene17_updateHotspots();
 		} else if (_prevSceneNum == 18) {
 			initGnapPos(6, 6, kDirBottomRight);
-			initBeaverPos(5, 6, kDirNone);
+			initPlatypusPos(5, 6, kDirNone);
 			endSceneInit();
 			platypusWalkTo(5, 9, -1, 0x107C2, 1);
 			gnapWalkTo(4, 8, -1, 0x107B9, 1);
 		} else {
 			if (isFlag(kGFSpringTaken)) {
 				initGnapPos(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, kDirBottomRight);
-				initBeaverPos(1, 9, kDirNone);
+				initPlatypusPos(1, 9, kDirNone);
 				endSceneInit();
 			} else {
 				initGnapPos(3, 7, kDirBottomRight);
-				initBeaverPos(1, 7, kDirNone);
+				initPlatypusPos(1, 7, kDirNone);
 				endSceneInit();
 			}
 			clearFlag(kGFSpringTaken);
@@ -262,16 +262,16 @@ void GnapEngine::scene17_run() {
 		_gameSys->insertSequence(makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, 0, 0, kSeqNone, 0, 0, 0);
 		_platX = -1;
 		_platY = 8;
-		_beaverId = 160;
+		_platypusId = 160;
 		_gameSys->insertSequence(0x241, 160, 0, 0, kSeqNone, 0, 0, 0);
-		_gameSys->insertSequence(0x107C1, _beaverId, 0x241, _beaverId,
+		_gameSys->insertSequence(0x107C1, _platypusId, 0x241, _platypusId,
 			kSeqScale | kSeqSyncWait, 0, 75 * _platX - _platGridX, 48 * _platY - _platGridY);
 		_gameSys->insertSequence(0x22C, 2, 0, 0, kSeqNone, 0, 0, 0);
 		// TODO delayTicksA(2, 9);
 		endSceneInit();
-		_beaverSequenceId = 0x7C1;
-		_beaverSequenceDatNum = 1;
-		_beaverFacing = kDirBottomRight;
+		_platypusSequenceId = 0x7C1;
+		_platypusSequenceDatNum = 1;
+		_platypusFacing = kDirBottomRight;
 		platypusWalkTo(2, 9, -1, 0x107C2, 1);
 	}
 
@@ -298,10 +298,10 @@ void GnapEngine::scene17_run() {
 					if (isFlag(kGFGrassTaken)) {
 						gnapUseJointOnPlatypus();
 					} else {
-						gnapUseDeviceOnBeaver();
+						gnapUseDeviceOnPlatypuss();
 						platypusWalkTo(_hotspotsWalkPos[6].x, _hotspotsWalkPos[6].y, 1, 0x107C2, 1);
 						gnapWalkTo(_hotspotsWalkPos[6].x + 1, _hotspotsWalkPos[6].y, 0, 0x107BA, 1);
-						_beaverActionStatus = kASGetWrench1;
+						_platypusActionStatus = kASGetWrench1;
 						_gnapActionStatus = kASGetWrench1;
 						_timers[5] = getRandom(30) + 80;
 						setGrabCursorSprite(-1);
@@ -317,7 +317,7 @@ void GnapEngine::scene17_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -345,9 +345,9 @@ void GnapEngine::scene17_run() {
 					case PLAT_CURSOR:
 						if (_s17_canTryGetWrench) {
 							scene17_platHangUpPhone();
-							gnapUseDeviceOnBeaver();
+							gnapUseDeviceOnPlatypuss();
 							platypusWalkTo(_hotspotsWalkPos[6].x + 1, _hotspotsWalkPos[6].y, 1, 0x107C2, 1);
-							_beaverActionStatus = kASTryGetWrench;
+							_platypusActionStatus = kASTryGetWrench;
 							_gnapActionStatus = kASTryGetWrench;
 							_timers[5] = getRandom(30) + 80;
 						} else
@@ -385,11 +385,11 @@ void GnapEngine::scene17_run() {
 						if (isFlag(kGFUnk18)) {
 							scene17_platHangUpPhone();
 							_isLeavingScene = true;
-							gnapUseDeviceOnBeaver();
-							_beaverFacing = kDirUpLeft;
+							gnapUseDeviceOnPlatypuss();
+							_platypusFacing = kDirUpLeft;
 							platypusWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 1, 0x107C2, 1);
 							setFlag(kGFUnk16);
-							_beaverActionStatus = kASPlatUsePhone;
+							_platypusActionStatus = kASPlatUsePhone;
 							_gnapActionStatus = kASPlatUsePhone;
 						} else
 							playGnapImpossible(0, 0);
@@ -429,11 +429,11 @@ void GnapEngine::scene17_run() {
 						if (isFlag(kGFUnk18)) {
 							scene17_platHangUpPhone();
 							_isLeavingScene = true;
-							gnapUseDeviceOnBeaver();
-							_beaverFacing = kDirUpLeft;
+							gnapUseDeviceOnPlatypuss();
+							_platypusFacing = kDirUpLeft;
 							platypusWalkTo(_hotspotsWalkPos[2].x, _hotspotsWalkPos[2].y, 1, 0x107C2, 1);
 							setFlag(kGFUnk16);
-							_beaverActionStatus = kASPlatUsePhone;
+							_platypusActionStatus = kASPlatUsePhone;
 							_gnapActionStatus = kASPlatUsePhone;
 						} else
 							playGnapImpossible(0, 0);
@@ -450,7 +450,7 @@ void GnapEngine::scene17_run() {
 				_gnapIdleFacing = kDirUpRight;
 				gnapWalkTo(_hotspotsWalkPos[5].x, _hotspotsWalkPos[5].y, 0, 0x107BB, 1);
 				_gnapActionStatus = kASLeaveScene;
-				if (_beaverActionStatus != kASPlatPhoningAssistant)
+				if (_platypusActionStatus != kASPlatPhoningAssistant)
 					platypusWalkTo(_hotspotsWalkPos[5].x - 1, _hotspotsWalkPos[5].y, -1, 0x107C2, 1);
 			}
 			break;
@@ -488,17 +488,17 @@ void GnapEngine::scene17_run() {
 			playSound(0x10940, true);
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0)
-				beaverSub426234();
+			if (_platypusActionStatus < 0)
+				platypusSub426234();
 			updateGnapIdleSequence2();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(100) + 200;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0)
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0)
 					_gameSys->insertSequence(0x22B, 21, 0, 0, kSeqNone, 0, 0, 0);
 			}
 			if (!_timers[7]) {
 				_timers[7] = getRandom(100) + 100;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0) {
 					switch (getRandom(3)) {
 					case 0:
 						_gameSys->insertSequence(0x25C, 255, 0, 0, kSeqNone, 0, 0, 0);
@@ -512,7 +512,7 @@ void GnapEngine::scene17_run() {
 					}
 				}
 			}
-			if (_beaverActionStatus < 0 && !_timers[5]) {
+			if (_platypusActionStatus < 0 && !_timers[5]) {
 				_timers[5] = getRandom(30) + 80;
 				if (isFlag(kGFGrassTaken) && _s17_nextWrenchSequenceId == -1) {
 					_s17_nextWrenchSequenceId = 0x236;
@@ -643,9 +643,9 @@ void GnapEngine::scene17_updateAnimations() {
 
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		switch (_beaverActionStatus) {
+		switch (_platypusActionStatus) {
 		case kASTryGetWrench:
-			_beaverActionStatus = -1;
+			_platypusActionStatus = -1;
 			++_s17_platTryGetWrenchCtr;
 			if (_s17_platTryGetWrenchCtr % 2 != 0)
 				_s17_nextWrenchSequenceId = 0x233;
@@ -660,16 +660,16 @@ void GnapEngine::scene17_updateAnimations() {
 			_s17_nextCarWindowSequenceId = 0x249;
 			break;
 		case kASGetWrenchDone:
-			_beaverActionStatus = -1;
+			_platypusActionStatus = -1;
 			invAdd(kItemWrench);
 			setGrabCursorSprite(kItemWrench);
 			break;
 		case kASPlatUsePhone:
-			_gameSys->setAnimation(0x24E, _beaverId, 1);
-			_gameSys->insertSequence(0x24E, _beaverId, _beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, kSeqSyncWait, 0, 0, 0);
-			_beaverSequenceDatNum = 0;
-			_beaverSequenceId = 0x24E;
-			_beaverActionStatus = kASLeaveScene;
+			_gameSys->setAnimation(0x24E, _platypusId, 1);
+			_gameSys->insertSequence(0x24E, _platypusId, _platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, kSeqSyncWait, 0, 0, 0);
+			_platypusSequenceDatNum = 0;
+			_platypusSequenceId = 0x24E;
+			_platypusActionStatus = kASLeaveScene;
 			_newSceneNum = 53;
 			break;
 		case kASPlatPhoningAssistant:
@@ -678,10 +678,10 @@ void GnapEngine::scene17_updateAnimations() {
 				_s17_platPhoneCtr = 0;
 				_s17_nextPhoneSequenceId = -1;
 				_s17_currPhoneSequenceId = -1;
-				_gameSys->insertSequence(0x25B, _beaverId, 0x25A, _beaverId, kSeqSyncWait, 0, 0, 0);
-				_beaverSequenceDatNum = 0;
-				_beaverSequenceId = 0x25B;
-				_beaverActionStatus = -1;
+				_gameSys->insertSequence(0x25B, _platypusId, 0x25A, _platypusId, kSeqSyncWait, 0, 0, 0);
+				_platypusSequenceDatNum = 0;
+				_platypusSequenceId = 0x25B;
+				_platypusActionStatus = -1;
 				clearFlag(kGFPlatypusTalkingToAssistant);
 				_sceneWaiting = false;
 				scene17_updateHotspots();
@@ -689,9 +689,9 @@ void GnapEngine::scene17_updateAnimations() {
 				_s17_nextPhoneSequenceId = kPlatPhoneSequenceIds[_s17_platPhoneCtr];
 				_gameSys->setAnimation(_s17_nextPhoneSequenceId, 254, 1);
 				_gameSys->insertSequence(_s17_nextPhoneSequenceId, 254, _s17_currPhoneSequenceId, 254, kSeqSyncWait, 0, 0, 0);
-				_gameSys->insertSequence(0x25A, _beaverId, 0x25A, _beaverId, kSeqSyncWait, 0, 0, 0);
-				_beaverSequenceDatNum = 0;
-				_beaverSequenceId = 0x25A;
+				_gameSys->insertSequence(0x25A, _platypusId, 0x25A, _platypusId, kSeqSyncWait, 0, 0, 0);
+				_platypusSequenceDatNum = 0;
+				_platypusSequenceId = 0x25A;
 				_s17_currPhoneSequenceId = _s17_nextPhoneSequenceId;
 			}
 			break;
@@ -705,27 +705,27 @@ void GnapEngine::scene17_updateAnimations() {
 		switch (_s17_nextWrenchSequenceId) {
 		case 0x233:
 			_gnapActionStatus = -1;
-			_gameSys->insertSequence(0x243, _beaverId,
-				_beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId,
+			_gameSys->insertSequence(0x243, _platypusId,
+				_platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId,
 				kSeqSyncWait, 0, 0, 0);
 			_gameSys->insertSequence(_s17_nextWrenchSequenceId, 40, _s17_currWrenchSequenceId, 40, kSeqSyncWait, 0, 0, 0);
 			_s17_currWrenchSequenceId = _s17_nextWrenchSequenceId;
 			_s17_nextWrenchSequenceId = -1;
-			_beaverSequenceId = 0x243;
-			_beaverSequenceDatNum = 0;
-			_gameSys->setAnimation(0x243, _beaverId, 1);
+			_platypusSequenceId = 0x243;
+			_platypusSequenceDatNum = 0;
+			_gameSys->setAnimation(0x243, _platypusId, 1);
 			break;
 		case 0x234:
 			_gnapActionStatus = -1;
-			_gameSys->insertSequence(0x242, _beaverId,
-				_beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId,
+			_gameSys->insertSequence(0x242, _platypusId,
+				_platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId,
 				kSeqSyncWait, 0, 0, 0);
 			_gameSys->insertSequence(_s17_nextWrenchSequenceId, 40, _s17_currWrenchSequenceId, 40, kSeqSyncWait, 0, 0, 0);
 			_s17_currWrenchSequenceId = _s17_nextWrenchSequenceId;
 			_s17_nextWrenchSequenceId = -1;
-			_beaverSequenceId = 0x242;
-			_beaverSequenceDatNum = 0;
-			_gameSys->setAnimation(0x242, _beaverId, 1);
+			_platypusSequenceId = 0x242;
+			_platypusSequenceDatNum = 0;
+			_gameSys->setAnimation(0x242, _platypusId, 1);
 			break;
 		case 0x231:
 			if (getRandom(2) != 0)
@@ -758,17 +758,17 @@ void GnapEngine::scene17_updateAnimations() {
 					_s17_currWrenchSequenceId = 0x22E;
 					_s17_canTryGetWrench = false;
 				}
-				_gameSys->setAnimation(0x23F, _beaverId, 1);
+				_gameSys->setAnimation(0x23F, _platypusId, 1);
 				_gameSys->insertSequence(0x10875, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
-				_gameSys->insertSequence(0x23F, _beaverId,
-					_beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId,
+				_gameSys->insertSequence(0x23F, _platypusId,
+					_platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId,
 					kSeqSyncWait, 0, 0, 0);
 				_gnapSequenceDatNum = 1;
-				_beaverSequenceDatNum = 0;
+				_platypusSequenceDatNum = 0;
 				_gnapSequenceId = 0x875;
-				_beaverSequenceId = 0x23F;
+				_platypusSequenceId = 0x23F;
 				gnapWalkTo(3, 8, -1, 0x107B9, 1);
-				_beaverActionStatus = kASGetWrench2;
+				_platypusActionStatus = kASGetWrench2;
 			}
 			break;
 		default:
@@ -806,15 +806,15 @@ void GnapEngine::scene17_updateAnimations() {
 			break;
 		case 0x249:
 			_gameSys->setAnimation(0x230, 40, 2);
-			_gameSys->setAnimation(0x240, _beaverId, 1);
+			_gameSys->setAnimation(0x240, _platypusId, 1);
 			_gameSys->insertSequence(0x230, 40, _s17_currWrenchSequenceId, 40, kSeqSyncWait, 0, 0, 0);
 			_gameSys->insertSequence(_s17_nextCarWindowSequenceId, 40, _s17_currCarWindowSequenceId, 40, kSeqSyncWait, 0, 0, 0);
-			_gameSys->insertSequence(0x240, _beaverId, _beaverSequenceId, _beaverId, kSeqSyncWait, 0, 0, 0);
+			_gameSys->insertSequence(0x240, _platypusId, _platypusSequenceId, _platypusId, kSeqSyncWait, 0, 0, 0);
 			_gameSys->insertSequence(0x23E, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
 			_gnapSequenceId = 0x23E;
 			_gnapSequenceDatNum = 0;
-			_beaverSequenceId = 0x240;
-			_beaverSequenceDatNum = 0;
+			_platypusSequenceId = 0x240;
+			_platypusSequenceDatNum = 0;
 			_gameSys->setAnimation(0x24A, 40, 3);
 			_gameSys->insertSequence(0x24A, 40, _s17_nextCarWindowSequenceId, 40, kSeqSyncWait, 0, 0, 0);
 			while (_gameSys->getAnimationStatus(2) != 2) {
@@ -833,7 +833,7 @@ void GnapEngine::scene17_updateAnimations() {
 			_s17_nextWrenchSequenceId = -1;
 			setFlag(kGFGrassTaken);
 			_gnapActionStatus = -1;
-			_beaverActionStatus = 2;
+			_platypusActionStatus = 2;
 			scene17_updateHotspots();
 			_timers[5] = getRandom(30) + 80;
 			break;
diff --git a/engines/gnap/scenes/scene18.cpp b/engines/gnap/scenes/scene18.cpp
index d1683b6380..0e8065cc33 100644
--- a/engines/gnap/scenes/scene18.cpp
+++ b/engines/gnap/scenes/scene18.cpp
@@ -168,9 +168,9 @@ void GnapEngine::scene18_gnapCarryGarbageCanTo(int x, int y, int animationIndex,
 		if (_gnapY == _platY) {
 			if (v12 >= _gnapX) {
 				if (v12 >= _platX && _gnapX <= _platX)
-					beaverMakeRoom();
+					platypusMakeRoom();
 			} else if (v12 <= _platX && _gnapX >= _platX) {
-				beaverMakeRoom();
+				platypusMakeRoom();
 			}
 		}
 		gnapSeqId = _gnapSequenceId;
@@ -261,7 +261,7 @@ void GnapEngine::scene18_platEndPhoning(bool platFl) {
 	if (isFlag(kGFPlatypusTalkingToAssistant)) {
 		_s18_platPhoneIter = 0;
 		_s18_platPhoneCtr = 0;
-		_beaverActionStatus = -1;
+		_platypusActionStatus = -1;
 		if (_s18_currPhoneSequenceId != -1) {
 			_gameSys->setAnimation(0x21E, 254, 3);
 			_gameSys->insertSequence(0x21E, 254, _s18_currPhoneSequenceId, 254, kSeqSyncExists, 0, 0, 0);
@@ -272,7 +272,7 @@ void GnapEngine::scene18_platEndPhoning(bool platFl) {
 		_gameSys->setAnimation(0, 0, 3);
 		clearFlag(kGFPlatypusTalkingToAssistant);
 		if (platFl) {
-			_beaverActionStatus = kASPlatComesHere;
+			_platypusActionStatus = kASPlatComesHere;
 			_timers[6] = 50;
 			_sceneWaiting = true;
 		}
@@ -378,19 +378,19 @@ void GnapEngine::scene18_run() {
 		}
 		if (_prevSceneNum == 17) {
 			initGnapPos(4, 11, kDirBottomRight);
-			initBeaverPos(5, 11, kDirNone);
+			initPlatypusPos(5, 11, kDirNone);
 			endSceneInit();
 			gnapWalkTo(4, 8, -1, 0x107B9, 1);
 			platypusWalkTo(5, 9, -1, 0x107C2, 1);
 		} else if (_prevSceneNum == 19) {
 			initGnapPos(7, 7, kDirBottomRight);
-			initBeaverPos(8, 7, kDirNone);
+			initPlatypusPos(8, 7, kDirNone);
 			endSceneInit();
 			gnapWalkTo(7, 8, -1, 0x107B9, 1);
 			platypusWalkTo(8, 8, -1, 0x107C2, 1);
 		} else {
 			initGnapPos(-1, 10, kDirBottomRight);
-			initBeaverPos(-1, 10, kDirNone);
+			initPlatypusPos(-1, 10, kDirNone);
 			endSceneInit();
 			gnapWalkTo(3, 7, -1, 0x107B9, 1);
 			platypusWalkTo(3, 8, -1, 0x107C2, 1);
@@ -435,7 +435,7 @@ void GnapEngine::scene18_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -726,18 +726,18 @@ void GnapEngine::scene18_run() {
 	
 		if (!_isLeavingScene) {
 			if (!isFlag(kGFPlatypusTalkingToAssistant)) {
-				if (_beaverActionStatus == kASPlatComesHere) {
+				if (_platypusActionStatus == kASPlatComesHere) {
 					if (!_timers[6]) {
-						_beaverActionStatus = -1;
+						_platypusActionStatus = -1;
 						_sceneWaiting = false;
-						initBeaverPos(-1, 10, kDirNone);
+						initPlatypusPos(-1, 10, kDirNone);
 						platypusWalkTo(3, 9, -1, 0x107C2, 1);
 						clearFlag(kGFPlatypusTalkingToAssistant);
 					}
 				} else {
 					_hotspots[kHSWalkArea1]._y2 += 48;
 					_hotspots[kHSWalkArea2]._x1 += 75;
-					updateBeaverIdleSequence();
+					updatePlatypusIdleSequence();
 					_hotspots[kHSWalkArea2]._x1 -= 75;
 					_hotspots[kHSWalkArea1]._y2 -= 48;
 				}
diff --git a/engines/gnap/scenes/scene19.cpp b/engines/gnap/scenes/scene19.cpp
index fd8b421331..4de51f8ca4 100644
--- a/engines/gnap/scenes/scene19.cpp
+++ b/engines/gnap/scenes/scene19.cpp
@@ -127,7 +127,7 @@ void GnapEngine::scene19_run() {
 		_gameSys->insertSequence(_s19_currShopAssistantSequenceId, 20, 0, 0, kSeqNone, 0, 0, 0);
 		_timers[6] = getRandom(40) + 50;
 		initGnapPos(3, 6, kDirBottomRight);
-		initBeaverPos(4, 6, kDirNone);
+		initPlatypusPos(4, 6, kDirNone);
 		endSceneInit();
 		gnapWalkTo(4, 9, -1, 0x107B9, 1);
 		platypusWalkTo(5, 9, -1, 0x107C2, 1);
@@ -168,7 +168,7 @@ void GnapEngine::scene19_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -311,7 +311,7 @@ void GnapEngine::scene19_run() {
 		if (!_isLeavingScene) {
 			updateGnapIdleSequence();
 			if (!isFlag(kGFPlatypusTalkingToAssistant)) {
-				updateBeaverIdleSequence();
+				updatePlatypusIdleSequence();
 				if (!_timers[6] && _s19_nextShopAssistantSequenceId == -1) {
 					_timers[6] = getRandom(40) + 50;
 					if (getRandom(4) != 0) {
diff --git a/engines/gnap/scenes/scene20.cpp b/engines/gnap/scenes/scene20.cpp
index 9298fc1f62..7982b076ec 100644
--- a/engines/gnap/scenes/scene20.cpp
+++ b/engines/gnap/scenes/scene20.cpp
@@ -229,42 +229,42 @@ void GnapEngine::scene20_run() {
 			gameUpdateTick();
 		}
 		initGnapPos(11, 8, kDirBottomLeft);
-		initBeaverPos(11, 9, kDirUnk4);
+		initPlatypusPos(11, 9, kDirUnk4);
 		gnapWalkTo(5, 8, -1, 0x107BA, 1);
 		platypusWalkTo(6, 9, -1, 0x107C2, 1);
 	} else {
 		switch (_prevSceneNum) {
 		case 17:
 			initGnapPos(5, 11, kDirBottomRight);
-			initBeaverPos(6, 11, kDirNone);
+			initPlatypusPos(6, 11, kDirNone);
 			endSceneInit();
 			gnapWalkTo(5, 8, -1, 0x107B9, 1);
 			platypusWalkTo(6, 9, -1, 0x107C2, 1);
 			break;
 		case 18:
 			initGnapPos(11, 8, kDirBottomLeft);
-			initBeaverPos(11, 9, kDirUnk4);
+			initPlatypusPos(11, 9, kDirUnk4);
 			endSceneInit();
 			gnapWalkTo(5, 8, -1, 0x107BA, 1);
 			platypusWalkTo(6, 9, -1, 0x107C2, 1);
 			break;
 		case 21:
 			initGnapPos(-1, 8, kDirBottomLeft);
-			initBeaverPos(-1, 9, kDirUnk4);
+			initPlatypusPos(-1, 9, kDirUnk4);
 			endSceneInit();
 			gnapWalkTo(3, 8, -1, 0x107B9, 1);
 			platypusWalkTo(3, 9, -1, 0x107C2, 1);
 			break;
 		case 22:
 			initGnapPos(7, 6, kDirBottomRight);
-			initBeaverPos(8, 6, kDirNone);
+			initPlatypusPos(8, 6, kDirNone);
 			endSceneInit();
 			gnapWalkTo(8, 8, -1, 0x107B9, 1);
 			platypusWalkTo(9, 9, -1, 0x107C2, 1);
 			break;
 		default:
 			initGnapPos(8, 6, kDirBottomLeft);
-			initBeaverPos(9, 6, kDirUnk4);
+			initPlatypusPos(9, 6, kDirUnk4);
 			endSceneInit();
 			_hotspots[kHSWalkArea2]._flags |= SF_WALKABLE;
 			gnapWalkTo(8, 8, -1, 0x107BA, 1);
@@ -310,7 +310,7 @@ void GnapEngine::scene20_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -329,7 +329,7 @@ void GnapEngine::scene20_run() {
 				gnapWalkTo(_hotspotsWalkPos[kHSExitParkingLot].x, _hotspotsWalkPos[kHSExitParkingLot].y, 0, 0x107AF, 1);
 				_gnapActionStatus = kASLeaveScene;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitParkingLot].x, _hotspotsWalkPos[kHSExitParkingLot].y + 1, -1, 0x107CF, 1);
-				_beaverFacing = kDirUnk4;
+				_platypusFacing = kDirUnk4;
 			}
 			break;
 		
@@ -368,7 +368,7 @@ void GnapEngine::scene20_run() {
 				gnapWalkTo(_hotspotsWalkPos[kHSExitInsideGrubCity].x, _hotspotsWalkPos[kHSExitInsideGrubCity].y - 1, 0, 0x107BB, 1);
 				_gnapActionStatus = kASLeaveScene;
 				platypusWalkTo(_hotspotsWalkPos[kHSExitInsideGrubCity].x + 1, _hotspotsWalkPos[kHSExitInsideGrubCity].y, -1, 0x107C2, 1);
-				_beaverFacing = kDirUnk4;
+				_platypusFacing = kDirUnk4;
 			}
 			break;
 		
@@ -493,9 +493,9 @@ void GnapEngine::scene20_run() {
 			playSound(0x10940, true);
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0) {
+			if (_platypusActionStatus < 0) {
 				_hotspots[kHSWalkArea1]._y2 += 48;
-				updateBeaverIdleSequence();
+				updatePlatypusIdleSequence();
 				_hotspots[kHSWalkArea1]._y2 -= 48;
 			}
 			if (_gnapActionStatus < 0)
@@ -509,7 +509,7 @@ void GnapEngine::scene20_run() {
 			}
 			if (!_timers[7]) {
 				_timers[7] = getRandom(100) + 100;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0) {
 					switch (getRandom(3)) {
 					case 0:
 						_gameSys->insertSequence(0x183, 253, 0, 0, kSeqNone, 0, 0, 0);
diff --git a/engines/gnap/scenes/scene21.cpp b/engines/gnap/scenes/scene21.cpp
index 9d2b1719a8..b04c8c92b5 100644
--- a/engines/gnap/scenes/scene21.cpp
+++ b/engines/gnap/scenes/scene21.cpp
@@ -77,7 +77,7 @@ void GnapEngine::scene21_run() {
 	if (isFlag(kGFTwigTaken)) {
 		if (isFlag(kGFKeysTaken)) {
 			initGnapPos(5, 8, kDirBottomRight);
-			initBeaverPos(6, 8, kDirNone);
+			initPlatypusPos(6, 8, kDirNone);
 			_gameSys->insertSequence(0x8E, 2, 0, 0, kSeqNone, 0, 0, 0);
 			if (!isFlag(kGFUnk04))
 				_gameSys->insertSequence(0x8D, 59, 0, 0, kSeqNone, 0, 0, 0);
@@ -85,7 +85,7 @@ void GnapEngine::scene21_run() {
 			clearFlag(kGFKeysTaken);
 		} else {
 			initGnapPos(5, 11, kDirBottomRight);
-			initBeaverPos(6, 11, kDirNone);
+			initPlatypusPos(6, 11, kDirNone);
 			if (!isFlag(kGFUnk04))
 				_gameSys->insertSequence(0x8D, 59, 0, 0, kSeqNone, 0, 0, 0);
 			endSceneInit();
@@ -94,7 +94,7 @@ void GnapEngine::scene21_run() {
 		}
 	} else {
 		initGnapPos(5, 11, kDirBottomRight);
-		initBeaverPos(6, 11, kDirNone);
+		initPlatypusPos(6, 11, kDirNone);
 		_s21_currOldLadySequenceId = 0x89;
 		_gameSys->setAnimation(0x89, 79, 3);
 		_gameSys->insertSequence(_s21_currOldLadySequenceId, 79, 0, 0, kSeqNone, 0, 0, 0);
@@ -138,7 +138,7 @@ void GnapEngine::scene21_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -234,7 +234,7 @@ void GnapEngine::scene21_run() {
 			playSound(0x10940, true);
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!isFlag(kGFTwigTaken) && !_timers[4] && _s21_nextOldLadySequenceId == -1 && _gnapActionStatus == -1) {
 				_timers[4] = getRandom(30) + 50;
diff --git a/engines/gnap/scenes/scene22.cpp b/engines/gnap/scenes/scene22.cpp
index 3a196dacd5..80f3843f30 100644
--- a/engines/gnap/scenes/scene22.cpp
+++ b/engines/gnap/scenes/scene22.cpp
@@ -72,11 +72,11 @@ void GnapEngine::scene22_run() {
 	
 	if (_prevSceneNum == 20) {
 		initGnapPos(2, 8, kDirBottomRight);
-		initBeaverPos(1, 8, kDirNone);
+		initPlatypusPos(1, 8, kDirNone);
 		endSceneInit();
 	} else {
 		initGnapPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y, kDirBottomRight);
-		initBeaverPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y + 1, kDirNone);
+		initPlatypusPos(11, _hotspotsWalkPos[kHSExitBackGrubCity].y + 1, kDirNone);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107B9, 1);
 		platypusWalkTo(9, 8, -1, 0x107C2, 1);
@@ -150,7 +150,7 @@ void GnapEngine::scene22_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -199,7 +199,7 @@ void GnapEngine::scene22_run() {
 						_gnapActionStatus = kASTalkCashier;
 						break;
 					case PLAT_CURSOR:
-						gnapUseDeviceOnBeaver();
+						gnapUseDeviceOnPlatypuss();
 						break;
 					}
 				}
@@ -223,7 +223,7 @@ void GnapEngine::scene22_run() {
 		scene22_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[6] && _s22_nextCashierSequenceId == -1) {
 				_timers[6] = getRandom(30) + 20;
diff --git a/engines/gnap/scenes/scene23.cpp b/engines/gnap/scenes/scene23.cpp
index 70437eb6c7..a6b4c1fd80 100644
--- a/engines/gnap/scenes/scene23.cpp
+++ b/engines/gnap/scenes/scene23.cpp
@@ -70,7 +70,7 @@ void GnapEngine::scene23_run() {
 	queueInsertDeviceIcon();
 	
 	initGnapPos(-1, 7, kDirBottomRight);
-	initBeaverPos(-2, 7, kDirNone);
+	initPlatypusPos(-2, 7, kDirNone);
 	_gameSys->insertSequence(0xBD, 255, 0, 0, kSeqNone, 0, 0, 0);
 	_gameSys->insertSequence(0xBF, 2, 0, 0, kSeqNone, 0, 0, 0);
 	endSceneInit();
@@ -122,7 +122,7 @@ void GnapEngine::scene23_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -196,7 +196,7 @@ void GnapEngine::scene23_run() {
 		scene23_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[4] && _gnapActionStatus == -1) {
 				_timers[4] = getRandom(100) + 200;
diff --git a/engines/gnap/scenes/scene24.cpp b/engines/gnap/scenes/scene24.cpp
index 1c67c50de0..e244a0d325 100644
--- a/engines/gnap/scenes/scene24.cpp
+++ b/engines/gnap/scenes/scene24.cpp
@@ -85,13 +85,13 @@ void GnapEngine::scene24_run() {
 	
 	if (_prevSceneNum == 20) {
 		initGnapPos(1, 8, kDirBottomRight);
-		initBeaverPos(2, 8, kDirNone);
+		initPlatypusPos(2, 8, kDirNone);
 		endSceneInit();
 		gnapWalkTo(1, 9, -1, 0x107B9, 1);
 		platypusWalkTo(2, 9, -1, 0x107C2, 1);
 	} else {
 		initGnapPos(8, 8, kDirBottomLeft);
-		initBeaverPos(8, 8, kDirUnk4);
+		initPlatypusPos(8, 8, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(2, 8, -1, 0x107BA, 1);
 		platypusWalkTo(3, 8, -1, 0x107C2, 1);
@@ -132,7 +132,7 @@ void GnapEngine::scene24_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -185,7 +185,7 @@ void GnapEngine::scene24_run() {
 			playSound(0x10940, true);
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(20) + 50;
diff --git a/engines/gnap/scenes/scene25.cpp b/engines/gnap/scenes/scene25.cpp
index 427536be1d..fe6c7d85ca 100644
--- a/engines/gnap/scenes/scene25.cpp
+++ b/engines/gnap/scenes/scene25.cpp
@@ -121,13 +121,13 @@ void GnapEngine::scene25_run() {
 	
 	if (_prevSceneNum == 24) {
 		initGnapPos(5, 11, kDirUpLeft);
-		initBeaverPos(6, 11, kDirUnk4);
+		initPlatypusPos(6, 11, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(5, 7, -1, 0x107BA, 1);
 		platypusWalkTo(6, 7, -1, 0x107C2, 1);
 	} else {
 		initGnapPos(5, 6, kDirBottomRight);
-		initBeaverPos(6, 6, kDirNone);
+		initPlatypusPos(6, 6, kDirNone);
 		endSceneInit();
 		gnapWalkTo(5, 8, -1, 0x107B9, 1);
 		platypusWalkTo(6, 8, -1, 0x107C2, 1);
@@ -166,7 +166,7 @@ void GnapEngine::scene25_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -284,7 +284,7 @@ void GnapEngine::scene25_run() {
 		scene25_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[4] && _s25_nextTicketVendorSequenceId == -1 && _gnapActionStatus == -1) {
 				_timers[4] = getRandom(20) + 20;
diff --git a/engines/gnap/scenes/scene26.cpp b/engines/gnap/scenes/scene26.cpp
index f2ced59d2d..b446fbb337 100644
--- a/engines/gnap/scenes/scene26.cpp
+++ b/engines/gnap/scenes/scene26.cpp
@@ -82,13 +82,13 @@ void GnapEngine::scene26_run() {
 	
 	if (_prevSceneNum == 25) {
 		initGnapPos(-1, 8, kDirBottomRight);
-		initBeaverPos(-2, 8, kDirNone);
+		initPlatypusPos(-2, 8, kDirNone);
 		endSceneInit();
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
 	} else {
 		initGnapPos(2, 8, kDirBottomRight);
-		initBeaverPos(3, 8, kDirNone);
+		initPlatypusPos(3, 8, kDirNone);
 		endSceneInit();
 	}
 
@@ -125,7 +125,7 @@ void GnapEngine::scene26_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -201,7 +201,7 @@ void GnapEngine::scene26_run() {
 			playSound(0x1093B, true);
 
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[5] && _s26_nextKidSequenceId == -1) {
 				_timers[5] = getRandom(20) + 50;
diff --git a/engines/gnap/scenes/scene27.cpp b/engines/gnap/scenes/scene27.cpp
index ad25092620..2c5a8f1174 100644
--- a/engines/gnap/scenes/scene27.cpp
+++ b/engines/gnap/scenes/scene27.cpp
@@ -93,28 +93,28 @@ void GnapEngine::scene27_run() {
 	switch (_prevSceneNum) {
 	case 26:
 		initGnapPos(7, 12, kDirBottomRight);
-		initBeaverPos(6, 12, kDirNone);
+		initPlatypusPos(6, 12, kDirNone);
 		endSceneInit();
 		gnapWalkTo(7, 8, -1, 0x107B9, 1);
 		platypusWalkTo(6, 8, -1, 0x107C2, 1);
 		break;
 	case 29:
 		initGnapPos(-1, 8, kDirBottomRight);
-		initBeaverPos(-1, 9, kDirNone);
+		initPlatypusPos(-1, 9, kDirNone);
 		endSceneInit();
 		gnapWalkTo(3, 8, -1, 0x107B9, 1);
 		platypusWalkTo(3, 9, -1, 0x107C2, 1);
 		break;
 	case 31:
 		initGnapPos(12, 8, kDirBottomLeft);
-		initBeaverPos(12, 9, kDirUnk4);
+		initPlatypusPos(12, 9, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(8, 9, -1, 0x107C2, 1);
 		break;
 	default:
 		initGnapPos(6, 8, kDirBottomRight);
-		initBeaverPos(5, 9, kDirNone);
+		initPlatypusPos(5, 9, kDirNone);
 		endSceneInit();
 		break;
 	}
@@ -153,7 +153,7 @@ void GnapEngine::scene27_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -280,7 +280,7 @@ void GnapEngine::scene27_run() {
 			playSound(0x1093B, true);
 
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (_debugLevel == 4)
diff --git a/engines/gnap/scenes/scene28.cpp b/engines/gnap/scenes/scene28.cpp
index 86df88bd1f..93723e65f6 100644
--- a/engines/gnap/scenes/scene28.cpp
+++ b/engines/gnap/scenes/scene28.cpp
@@ -94,12 +94,12 @@ void GnapEngine::scene28_run() {
 			_timers[4] = getRandom(20) + 80;
 		}
 		initGnapPos(8, 8, kDirBottomLeft);
-		initBeaverPos(9, 8, kDirUnk4);
+		initPlatypusPos(9, 8, kDirUnk4);
 		endSceneInit();
 	} else {
 		_gameSys->insertSequence(0x11B, 39, 0, 0, kSeqNone, 0, 0, 0);
 		initGnapPos(8, 8, kDirBottomLeft);
-		initBeaverPos(9, 8, kDirUnk4);
+		initPlatypusPos(9, 8, kDirUnk4);
 		endSceneInit();
 		playSequences(0xF7, 0x121, 0x122, 0x123);
 		_s28_currClownSequenceId = 0x115;
@@ -149,7 +149,7 @@ void GnapEngine::scene28_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -289,7 +289,7 @@ void GnapEngine::scene28_run() {
 			playSound(0x1093C, true);
 
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(20) + 80;
diff --git a/engines/gnap/scenes/scene29.cpp b/engines/gnap/scenes/scene29.cpp
index 6ab5744a93..3528141de4 100644
--- a/engines/gnap/scenes/scene29.cpp
+++ b/engines/gnap/scenes/scene29.cpp
@@ -86,13 +86,13 @@ void GnapEngine::scene29_run() {
 
 	if (_prevSceneNum == 27) {
 		initGnapPos(12, 7, kDirBottomRight);
-		initBeaverPos(12, 8, kDirNone);
+		initPlatypusPos(12, 8, kDirNone);
 		endSceneInit();
 		gnapWalkTo(8, 7, -1, 0x107B9, 1);
 		platypusWalkTo(8, 8, -1, 0x107C2, 1);
 	} else {
 		initGnapPos(-1, 7, kDirBottomRight);
-		initBeaverPos(-2, 7, kDirNone);
+		initPlatypusPos(-2, 7, kDirNone);
 		endSceneInit();
 		gnapWalkTo(2, 7, -1, 0x107B9, 1);
 		platypusWalkTo(1, 7, -1, 0x107C2, 1);
@@ -131,7 +131,7 @@ void GnapEngine::scene29_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -236,7 +236,7 @@ void GnapEngine::scene29_run() {
 		if (!_isLeavingScene) {
 			if (_gnapActionStatus < 0) {
 				updateGnapIdleSequence();
-				updateBeaverIdleSequence();
+				updatePlatypusIdleSequence();
 			}
 			if (!_timers[4]) {
 				if (invHas(kItemHorn)) {
diff --git a/engines/gnap/scenes/scene30.cpp b/engines/gnap/scenes/scene30.cpp
index b394baf7d9..33a374c134 100644
--- a/engines/gnap/scenes/scene30.cpp
+++ b/engines/gnap/scenes/scene30.cpp
@@ -76,7 +76,7 @@ void GnapEngine::scene30_run() {
 
 	_s30_kidSequenceId = 0x101;
 	initGnapPos(7, 12, kDirBottomRight);
-	initBeaverPos(6, 12, kDirNone);
+	initPlatypusPos(6, 12, kDirNone);
 	endSceneInit();
 	gnapWalkTo(7, 8, -1, 0x107B9, 1);
 	platypusWalkTo(6, 8, -1, 0x107C2, 1);
@@ -112,7 +112,7 @@ void GnapEngine::scene30_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -183,7 +183,7 @@ void GnapEngine::scene30_run() {
 			playSound(0x1093B, true);
 
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
diff --git a/engines/gnap/scenes/scene31.cpp b/engines/gnap/scenes/scene31.cpp
index 3adfcbd46e..027a4b5d80 100644
--- a/engines/gnap/scenes/scene31.cpp
+++ b/engines/gnap/scenes/scene31.cpp
@@ -79,13 +79,13 @@ void GnapEngine::scene31_run() {
 
 	if (_prevSceneNum == 27) {
 		initGnapPos(-1, 8, kDirBottomLeft);
-		initBeaverPos(-1, 9, kDirUnk4);
+		initPlatypusPos(-1, 9, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(3, 8, -1, 0x107BA, 1);
 		platypusWalkTo(3, 9, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(7, 12, kDirBottomRight);
-		initBeaverPos(6, 12, kDirNone);
+		initPlatypusPos(6, 12, kDirNone);
 		endSceneInit();
 		gnapWalkTo(7, 8, -1, 0x107BA, 1);
 		platypusWalkTo(6, 8, -1, 0x107D2, 1);
@@ -124,7 +124,7 @@ void GnapEngine::scene31_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(0, 0);
@@ -161,12 +161,12 @@ void GnapEngine::scene31_run() {
 						break;
 					case PLAT_CURSOR:
 						if (!invHas(kItemBucketWithBeer)) {
-							gnapUseDeviceOnBeaver();
+							gnapUseDeviceOnPlatypuss();
 							platypusWalkTo(_hotspotsWalkPos[kHSMeasuringClown].x, _hotspotsWalkPos[kHSMeasuringClown].y + 1, 1, 0x107C2, 1);
 							_hotspots[kHSWalkArea1]._flags |= SF_WALKABLE;
 							platypusWalkTo(_hotspotsWalkPos[kHSMeasuringClown].x, _hotspotsWalkPos[kHSMeasuringClown].y, 1, 0x107C2, 1);
 							_hotspots[kHSWalkArea1]._flags &= ~SF_WALKABLE;
-							_beaverActionStatus = kASPlatMeasuringClown;
+							_platypusActionStatus = kASPlatMeasuringClown;
 							_gnapActionStatus = kASPlatMeasuringClown;
 							_timers[4] = 300;
 						} else
@@ -253,8 +253,8 @@ void GnapEngine::scene31_run() {
 			playSound(0x1093B, true);
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0)
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0)
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
@@ -343,7 +343,7 @@ void GnapEngine::scene31_updateAnimations() {
 
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		if (_beaverActionStatus == kASPlatMeasuringClown) {
+		if (_platypusActionStatus == kASPlatMeasuringClown) {
 			_sceneWaiting = true;
 			_s31_beerGuyDistracted = true;
 			_s28_nextClerkSequenceId = 0xFA;
@@ -364,7 +364,7 @@ void GnapEngine::scene31_updateAnimations() {
 			++_s31_clerkMeasureCtr;
 			if (_s31_clerkMeasureCtr >= _s31_clerkMeasureMaxCtr) {
 				if (_gnapActionStatus != 5)
-					_beaverActionStatus = -1;
+					_platypusActionStatus = -1;
 				_timers[0] = 40;
 				_gameSys->insertSequence(0xFD, 39, _s28_currClerkSequenceId, 39, kSeqSyncWait, 0, 0, 0);
 				_s28_currClerkSequenceId = 0xFD;
diff --git a/engines/gnap/scenes/scene32.cpp b/engines/gnap/scenes/scene32.cpp
index ff526044bc..6eac47ee6e 100644
--- a/engines/gnap/scenes/scene32.cpp
+++ b/engines/gnap/scenes/scene32.cpp
@@ -72,13 +72,13 @@ void GnapEngine::scene32_run() {
 
 	if (_prevSceneNum == 33) {
 		initGnapPos(11, 6, kDirBottomLeft);
-		initBeaverPos(12, 6, kDirUnk4);
+		initPlatypusPos(12, 6, kDirUnk4);
 		endSceneInit();
 		platypusWalkTo(9, 6, -1, 0x107D2, 1);
 		gnapWalkTo(8, 6, -1, 0x107BA, 1);
 	} else {
 		initGnapPos(1, 6, kDirBottomRight);
-		initBeaverPos(1, 7, kDirNone);
+		initPlatypusPos(1, 7, kDirNone);
 		endSceneInit();
 	}
 
@@ -112,7 +112,7 @@ void GnapEngine::scene32_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(_platX, _platY);
@@ -158,8 +158,8 @@ void GnapEngine::scene32_run() {
 			playSound(0x1091C, true);
 
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0)
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0)
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
diff --git a/engines/gnap/scenes/scene33.cpp b/engines/gnap/scenes/scene33.cpp
index bad0f88a4e..3c24dd2088 100644
--- a/engines/gnap/scenes/scene33.cpp
+++ b/engines/gnap/scenes/scene33.cpp
@@ -77,26 +77,26 @@ void GnapEngine::scene33_run() {
 	switch (_prevSceneNum) {
 	case 34:
 		initGnapPos(11, 7, kDirBottomLeft);
-		initBeaverPos(12, 7, kDirUnk4);
+		initPlatypusPos(12, 7, kDirUnk4);
 		endSceneInit();
 		gnapWalkTo(8, 7, -1, 0x107BA, 1);
 		platypusWalkTo(9, 7, -1, 0x107D2, 1);
 		break;
 	case 37:
 		initGnapPos(7, 7, kDirBottomRight);
-		initBeaverPos(8, 7, kDirNone);
+		initPlatypusPos(8, 7, kDirNone);
 		endSceneInit();
 		break;
 	case 32:
 		initGnapPos(-1, 6, kDirBottomRight);
-		initBeaverPos(-1, 7, kDirNone);
+		initPlatypusPos(-1, 7, kDirNone);
 		endSceneInit();
 		platypusWalkTo(2, 7, -1, 0x107C2, 1);
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 		break;
 	default:
 		initGnapPos(3, 7, kDirBottomRight);
-		initBeaverPos(2, 7, kDirNone);
+		initPlatypusPos(2, 7, kDirNone);
 		endSceneInit();
 		break;
 	}
@@ -133,7 +133,7 @@ void GnapEngine::scene33_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(_platX, _platY);
@@ -235,8 +235,8 @@ void GnapEngine::scene33_run() {
 			playSound(0x1091C, true);
 
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0)
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0)
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
diff --git a/engines/gnap/scenes/scene38.cpp b/engines/gnap/scenes/scene38.cpp
index b60c8327e1..ce8f1c700d 100644
--- a/engines/gnap/scenes/scene38.cpp
+++ b/engines/gnap/scenes/scene38.cpp
@@ -72,21 +72,21 @@ void GnapEngine::scene38_updateHotspots() {
 	setHotspot(kHSWalkArea5, 770, 0, 799, 445);
 	setHotspot(kHSWalkArea6, 393, 0, 698, 445, SF_WALKABLE | SF_DISABLED);
 	setDeviceHotspot(kHSDevice, -1, -1, -1, -1);
-	if (_beaverActionStatus == kASBeaverHoldingTrapDoor)
+	if (_platypusActionStatus == kASBeaverHoldingTrapDoor)
 		_hotspots[kHSPlatypus]._flags = SF_WALKABLE | SF_DISABLED;
-	if (_beaverActionStatus == kASBeaverHoldingTrapDoor)
+	if (_platypusActionStatus == kASBeaverHoldingTrapDoor)
 		_hotspots[kHSExitCave]._flags = SF_EXIT_D_CURSOR;
 	else if (_gnapActionStatus == kASHoldingHuntingTrophy)
 		_hotspots[kHSExitCave]._flags = SF_EXIT_D_CURSOR;
-	if (_beaverActionStatus == kASBeaverHoldingTrapDoor)
+	if (_platypusActionStatus == kASBeaverHoldingTrapDoor)
 		_hotspots[kHSTrapDoorLid1]._flags = SF_DISABLED;
 	else if (_gnapActionStatus == kASHoldingHuntingTrophy)
 		_hotspots[kHSTrapDoorLid1]._flags = SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
-	if (_beaverActionStatus == kASBeaverHoldingTrapDoor)
+	if (_platypusActionStatus == kASBeaverHoldingTrapDoor)
 		_hotspots[kHSTrapDoorLid2]._flags = SF_DISABLED;
 	else if (_gnapActionStatus == kASHoldingHuntingTrophy)
 		_hotspots[kHSTrapDoorLid2]._flags = SF_PLAT_CURSOR | SF_TALK_CURSOR | SF_GRAB_CURSOR | SF_LOOK_CURSOR;
-	if (_beaverActionStatus == kASBeaverHoldingTrapDoor)
+	if (_platypusActionStatus == kASBeaverHoldingTrapDoor)
 		_hotspots[kHSWalkArea6]._flags = SF_NONE;
 	_hotspotsCount = 13;
 }
@@ -98,10 +98,10 @@ void GnapEngine::scene38_run() {
 
 	if (_prevSceneNum == 39) {
 		initGnapPos(3, 7, kDirBottomLeft);
-		initBeaverPos(4, 7, kDirUnk4);
+		initPlatypusPos(4, 7, kDirUnk4);
 	} else {
 		initGnapPos(3, 8, kDirBottomRight);
-		initBeaverPos(4, 8, kDirNone);
+		initPlatypusPos(4, 8, kDirNone);
 	}
 	endSceneInit();
 
@@ -135,7 +135,7 @@ void GnapEngine::scene38_run() {
 					break;
 				case TALK_CURSOR:
 					playGnapBrainPulsating(_platX, _platY);
-					playBeaverSequence(getBeaverSequenceId());
+					playPlatypusSequence(getPlatypusSequenceId());
 					break;
 				case PLAT_CURSOR:
 					playGnapImpossible(_platX, _platY);
@@ -158,9 +158,9 @@ void GnapEngine::scene38_run() {
 		case kHSExitCave:
 			if (_gnapActionStatus == kASHoldingHuntingTrophy) {
 				_gnapActionStatus = kASReleaseHuntingTrophy;
-				if (_beaverActionStatus == kASBeaverHoldingTrapDoor)
+				if (_platypusActionStatus == kASBeaverHoldingTrapDoor)
 					_isLeavingScene = true;
-			} else if (_beaverActionStatus == kASBeaverHoldingTrapDoor) {
+			} else if (_platypusActionStatus == kASBeaverHoldingTrapDoor) {
 				_sceneWaiting = false;
 				_isLeavingScene = true;
 				gnapWalkTo(5, 7, 0, 0x107BB, 1);
@@ -172,7 +172,7 @@ void GnapEngine::scene38_run() {
 		case kHSTrapDoorLid1:
 		case kHSTrapDoorLid2:
 			if (_gnapActionStatus == kASHoldingHuntingTrophy) {
-				if (_verbCursor == PLAT_CURSOR && _beaverActionStatus != kASBeaverHoldingTrapDoor)
+				if (_verbCursor == PLAT_CURSOR && _platypusActionStatus != kASBeaverHoldingTrapDoor)
 					_gnapActionStatus = kASUseBeaverWithTrapDoor;
 				else
 					_gnapActionStatus = kASReleaseHuntingTrophy;
@@ -189,7 +189,7 @@ void GnapEngine::scene38_run() {
 						playGnapScratchingHead(0, 0);
 						break;
 					case GRAB_CURSOR:
-						if (_beaverActionStatus == kASBeaverHoldingTrapDoor)
+						if (_platypusActionStatus == kASBeaverHoldingTrapDoor)
 							playGnapImpossible(0, 0);
 						else {
 							gnapWalkTo(3, 6, 0, 0x107BB, 1);
@@ -238,7 +238,7 @@ void GnapEngine::scene38_run() {
 		scene38_updateAnimations();
 
 		if (!_isLeavingScene) {
-			updateBeaverIdleSequence();
+			updatePlatypusIdleSequence();
 			updateGnapIdleSequence();
 		}
 
@@ -265,7 +265,7 @@ void GnapEngine::scene38_updateAnimations() {
 			_sceneDone = true;
 			break;
 		case kASExitCave:
-			_gameSys->removeSequence(_beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, true);
+			_gameSys->removeSequence(_platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, true);
 			_gameSys->insertSequence(0xA3, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
 			_gnapSequenceId = 0xA3;
 			_gnapSequenceDatNum = 0;
@@ -282,7 +282,7 @@ void GnapEngine::scene38_updateAnimations() {
 			scene38_updateHotspots();
 			break;
 		case kASHoldingHuntingTrophy:
-			if (_beaverActionStatus != kASBeaverHoldingTrapDoor)
+			if (_platypusActionStatus != kASBeaverHoldingTrapDoor)
 				_sceneWaiting = true;
 			if (_gnapSequenceId == 0xA4) {
 				_gameSys->insertSequence(0x9D, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
@@ -298,7 +298,7 @@ void GnapEngine::scene38_updateAnimations() {
 			if (_gnapSequenceId == 0x9E) {
 				_gameSys->insertSequence(0x9B, 0, 0, 0, kSeqNone, 0, 0, 0);
 				_gnapActionStatus = -1;
-			} else if (_beaverActionStatus == kASBeaverHoldingTrapDoor) {
+			} else if (_platypusActionStatus == kASBeaverHoldingTrapDoor) {
 				_gameSys->insertSequence(0xA0, _gnapId, makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, kSeqSyncWait, 0, 0, 0);
 				_gnapSequenceId = 0xA0;
 				_gnapSequenceDatNum = 0;
@@ -332,17 +332,17 @@ void GnapEngine::scene38_updateAnimations() {
 			_gnapSequenceDatNum = 0;
 			_gameSys->setAnimation(0x9F, _gnapId, 0);
 			_gnapActionStatus = kASHoldingHuntingTrophy;
-			if (_beaverFacing != kDirNone)
-				playBeaverSequence(0x107D5);
+			if (_platypusFacing != kDirNone)
+				playPlatypusSequence(0x107D5);
 			else
-				playBeaverSequence(0x107D4);
+				playPlatypusSequence(0x107D4);
 			platypusWalkTo(8, 7, -1, 0x107D2, 1);
-			_gameSys->insertSequence(0xA1, _gnapId + 1, _beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, kSeqSyncWait, 0, 0, 0);
-			_beaverSequenceId = 0xA1;
-			_beaverSequenceDatNum = 0;
-			_beaverId = _gnapId + 1;
+			_gameSys->insertSequence(0xA1, _gnapId + 1, _platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, kSeqSyncWait, 0, 0, 0);
+			_platypusSequenceId = 0xA1;
+			_platypusSequenceDatNum = 0;
+			_platypusId = _gnapId + 1;
 			_gameSys->setAnimation(0xA1, _gnapId + 1, 1);
-			_beaverActionStatus = kASBeaverHoldingTrapDoor;
+			_platypusActionStatus = kASBeaverHoldingTrapDoor;
 			scene38_updateHotspots();
 			break;
 		}
@@ -350,10 +350,10 @@ void GnapEngine::scene38_updateAnimations() {
 
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		if (_beaverActionStatus == kASBeaverHoldingTrapDoor) {
-			_gameSys->insertSequence(0xA2, _beaverId, _beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, kSeqSyncWait, 0, 0, 0);
-			_beaverSequenceId = 0xA2;
-			_beaverSequenceDatNum = 0;
+		if (_platypusActionStatus == kASBeaverHoldingTrapDoor) {
+			_gameSys->insertSequence(0xA2, _platypusId, _platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, kSeqSyncWait, 0, 0, 0);
+			_platypusSequenceId = 0xA2;
+			_platypusSequenceDatNum = 0;
 			scene38_updateHotspots();
 			_sceneWaiting = true;
 		}
diff --git a/engines/gnap/scenes/scene39.cpp b/engines/gnap/scenes/scene39.cpp
index a89fea8f0e..bc506c1bcf 100644
--- a/engines/gnap/scenes/scene39.cpp
+++ b/engines/gnap/scenes/scene39.cpp
@@ -71,11 +71,11 @@ void GnapEngine::scene39_run() {
 	_s39_nextGuySequenceId = -1;
 	if (_prevSceneNum == 38) {
 		initGnapPos(3, 7, kDirUpRight);
-		initBeaverPos(2, 7, kDirUpLeft);
+		initPlatypusPos(2, 7, kDirUpLeft);
 		endSceneInit();
 	} else {
 		initGnapPos(4, 7, kDirBottomRight);
-		initBeaverPos(5, 7, kDirNone);
+		initPlatypusPos(5, 7, kDirNone);
 		endSceneInit();
 	}
 	
@@ -116,7 +116,7 @@ void GnapEngine::scene39_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(_platX, _platY);
@@ -183,8 +183,8 @@ void GnapEngine::scene39_run() {
 		scene39_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0)
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0)
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0)
 				updateGnapIdleSequence();
 			if (!_timers[5]) {
diff --git a/engines/gnap/scenes/scene40.cpp b/engines/gnap/scenes/scene40.cpp
index c2b829100a..001a923272 100644
--- a/engines/gnap/scenes/scene40.cpp
+++ b/engines/gnap/scenes/scene40.cpp
@@ -96,7 +96,7 @@ void GnapEngine::scene40_run() {
 						break;
 					case TALK_CURSOR:
 						playGnapBrainPulsating(_platX, _platY);
-						playBeaverSequence(getBeaverSequenceId());
+						playPlatypusSequence(getPlatypusSequenceId());
 						break;
 					case PLAT_CURSOR:
 						playGnapImpossible(_platX, _platY);
diff --git a/engines/gnap/scenes/scene41.cpp b/engines/gnap/scenes/scene41.cpp
index 23ac6ca4de..c7f278990a 100644
--- a/engines/gnap/scenes/scene41.cpp
+++ b/engines/gnap/scenes/scene41.cpp
@@ -138,23 +138,23 @@ void GnapEngine::scene41_run() {
 		_gnapId = 140;
 		_gameSys->insertSequence(0x120, 140, 0, 0, kSeqNone, 0, 0, 0);
 		_gameSys->setAnimation(makeRid(_gnapSequenceDatNum, _gnapSequenceId), _gnapId, 0);
-		initBeaverPos(8, 10, kDirBottomLeft);
+		initPlatypusPos(8, 10, kDirBottomLeft);
 		endSceneInit();
 	} else if (_prevSceneNum == 45) {
 		initGnapPos(-1, 8, kDirUpRight);
-		initBeaverPos(-2, 8, kDirUpLeft);
+		initPlatypusPos(-2, 8, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 	} else if (_prevSceneNum == 42) {
 		initGnapPos(11, 8, kDirUpRight);
-		initBeaverPos(11, 9, kDirUpLeft);
+		initPlatypusPos(11, 9, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 8, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(5, 8, kDirBottomRight);
-		initBeaverPos(6, 8, kDirBottomLeft);
+		initPlatypusPos(6, 8, kDirBottomLeft);
 		endSceneInit();
 	}
 
@@ -236,7 +236,7 @@ void GnapEngine::scene41_run() {
 							break;
 						case TALK_CURSOR:
 							playGnapBrainPulsating(_platX, _platY);
-							playBeaverSequence(getBeaverSequenceId());
+							playPlatypusSequence(getPlatypusSequenceId());
 							break;
 						case PLAT_CURSOR:
 							playGnapImpossible(_platX, _platY);
@@ -384,13 +384,13 @@ void GnapEngine::scene41_run() {
 		scene41_updateAnimations();
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0)
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0)
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(100) + 100;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _toyUfoActionStatus == -1 && _s41_nextToyVendorSequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _toyUfoActionStatus == -1 && _s41_nextToyVendorSequenceId == -1) {
 					switch (getRandom(3)) {
 					case 0:
 						_s41_nextToyVendorSequenceId = 0x113;
@@ -408,7 +408,7 @@ void GnapEngine::scene41_run() {
 			}
 			if (!_timers[5]) {
 				_timers[5] = getRandom(30) + 20;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _toyUfoActionStatus == -1 && _s41_nextKidSequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _toyUfoActionStatus == -1 && _s41_nextKidSequenceId == -1) {
 					if (isFlag(kGFGnapControlsToyUFO))
 						_s41_nextKidSequenceId = 0x11B;
 					else if (getRandom(3) != 0)
diff --git a/engines/gnap/scenes/scene42.cpp b/engines/gnap/scenes/scene42.cpp
index 6b719d2761..2ecce592d6 100644
--- a/engines/gnap/scenes/scene42.cpp
+++ b/engines/gnap/scenes/scene42.cpp
@@ -126,19 +126,19 @@ void GnapEngine::scene42_run() {
 			setGrabCursorSprite(-1);
 	} else if (_prevSceneNum == 41) {
 		initGnapPos(-1, 8, kDirUpRight);
-		initBeaverPos(-1, 9, kDirUpLeft);
+		initPlatypusPos(-1, 9, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
 	} else if (_prevSceneNum == 43) {
 		initGnapPos(11, 8, kDirUpRight);
-		initBeaverPos(11, 9, kDirUpLeft);
+		initPlatypusPos(11, 9, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 8, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(5, 11, kDirUpRight);
-		initBeaverPos(6, 11, kDirUpLeft);
+		initPlatypusPos(6, 11, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(5, 8, -1, 0x107BA, 1);
 		platypusWalkTo(6, 8, -1, 0x107C2, 1);
@@ -214,7 +214,7 @@ void GnapEngine::scene42_run() {
 							break;
 						case TALK_CURSOR:
 							playGnapBrainPulsating(_platX, _platY);
-							playBeaverSequence(getBeaverSequenceId());
+							playPlatypusSequence(getPlatypusSequenceId());
 							break;
 						case PLAT_CURSOR:
 							playGnapImpossible(_platX, _platY);
@@ -318,13 +318,13 @@ void GnapEngine::scene42_run() {
 		toyUfoCheckTimer();
 
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(20) + 30;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s42_nextBBQVendorSequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s42_nextBBQVendorSequenceId == -1) {
 					switch (getRandom(8)) {
 					case 0:
 						_s42_nextBBQVendorSequenceId = 0x14C;
diff --git a/engines/gnap/scenes/scene43.cpp b/engines/gnap/scenes/scene43.cpp
index dcf03cb671..e371d4aa6b 100644
--- a/engines/gnap/scenes/scene43.cpp
+++ b/engines/gnap/scenes/scene43.cpp
@@ -114,27 +114,27 @@ void GnapEngine::scene43_run() {
 		switch (_prevSceneNum) {
 		case 42:
 			initGnapPos(-1, 8, kDirUpRight);
-			initBeaverPos(-1, 9, kDirUpLeft);
+			initPlatypusPos(-1, 9, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(2, 8, -1, 0x107B9, 1);
 			platypusWalkTo(1, 8, -1, 0x107C2, 1);
 			break;
 		case 44:
 			initGnapPos(11, 8, kDirUpRight);
-			initBeaverPos(11, 9, kDirUpLeft);
+			initPlatypusPos(11, 9, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(8, 8, -1, 0x107BA, 1);
 			platypusWalkTo(9, 8, -1, 0x107D2, 1);
 			break;
 		case 54:
 			initGnapPos(4, 7, kDirBottomLeft);
-			initBeaverPos(11, 8, kDirUpLeft);
+			initPlatypusPos(11, 8, kDirUpLeft);
 			endSceneInit();
 			platypusWalkTo(9, 8, -1, 0x107D2, 1);
 			break;
 		default:
 			initGnapPos(5, 11, kDirUpRight);
-			initBeaverPos(6, 11, kDirUpLeft);
+			initPlatypusPos(6, 11, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(5, 8, -1, 0x107BA, 1);
 			platypusWalkTo(6, 8, -1, 0x107C2, 1);
@@ -220,7 +220,7 @@ void GnapEngine::scene43_run() {
 							break;
 						case TALK_CURSOR:
 							playGnapBrainPulsating(_platX, _platY);
-							playBeaverSequence(getBeaverSequenceId());
+							playPlatypusSequence(getPlatypusSequenceId());
 							break;
 						case PLAT_CURSOR:
 							playGnapImpossible(_platX, _platY);
@@ -320,13 +320,13 @@ void GnapEngine::scene43_run() {
 		toyUfoCheckTimer();
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
 				updateGnapIdleSequence();
 			if (!_timers[4] && (!isFlag(kGFGnapControlsToyUFO) || !isFlag(kGFGroceryStoreHatTaken))) {
 				_timers[4] = getRandom(100) + 100;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s43_nextTwoHeadedGuySequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s43_nextTwoHeadedGuySequenceId == -1) {
 					switch (getRandom(5)) {
 					case 0:
 						_s43_nextTwoHeadedGuySequenceId = 0x13C;
diff --git a/engines/gnap/scenes/scene44.cpp b/engines/gnap/scenes/scene44.cpp
index 3b2633bc83..5b53f114ec 100644
--- a/engines/gnap/scenes/scene44.cpp
+++ b/engines/gnap/scenes/scene44.cpp
@@ -128,14 +128,14 @@ void GnapEngine::scene44_run() {
 		switch (_prevSceneNum) {
 		case 43:
 			initGnapPos(-1, 8, kDirUpRight);
-			initBeaverPos(-1, 7, kDirUpLeft);
+			initPlatypusPos(-1, 7, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(2, 8, -1, 0x107B9, 1);
 			platypusWalkTo(1, 8, -1, 0x107C2, 1);
 			break;
 		case 46:
 			initGnapPos(11, 8, kDirUpRight);
-			initBeaverPos(11, 8, kDirUpLeft);
+			initPlatypusPos(11, 8, kDirUpLeft);
 			endSceneInit();
 			gnapWalkTo(6, 8, -1, 0x107BA, 1);
 			platypusWalkTo(7, 8, -1, 0x107D2, 1);
@@ -143,23 +143,23 @@ void GnapEngine::scene44_run() {
 		case 50:
 			initGnapPos(4, 8, kDirBottomRight);
 			if (_sceneSavegameLoaded) {
-				initBeaverPos(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, kDirUnk4);
+				initPlatypusPos(_hotspotsWalkPos[4].x, _hotspotsWalkPos[4].y, kDirUnk4);
 			} else if (!isFlag(kGFUnk13)) {
 				_timers[0] = 50;
 				_timers[1] = 20;
 				_platX = 5;
 				_platY = 8;
-				_beaverSequenceId = 0xFD;
-				_beaverFacing = kDirNone;
-				_beaverId = 160;
-				_beaverSequenceDatNum = 0;
+				_platypusSequenceId = 0xFD;
+				_platypusFacing = kDirNone;
+				_platypusId = 160;
+				_platypusSequenceDatNum = 0;
 				_gameSys->insertSequence(0xFD, 160, 0, 0, kSeqNone, 0, 0, 0);
 			}
 			endSceneInit();
 			break;
 		default:
 			initGnapPos(5, 11, kDirUpRight);
-			initBeaverPos(6, 11, kDirUpLeft);
+			initPlatypusPos(6, 11, kDirUpLeft);
 			endSceneInit();
 			platypusWalkTo(6, 8, -1, 0x107C2, 1);
 			gnapWalkTo(5, 8, -1, 0x107BA, 1);
@@ -231,7 +231,7 @@ void GnapEngine::scene44_run() {
 							break;
 						case TALK_CURSOR:
 							playGnapBrainPulsating(_platX, _platY);
-							playBeaverSequence(getBeaverSequenceId());
+							playPlatypusSequence(getPlatypusSequenceId());
 							break;
 						case PLAT_CURSOR:
 							playGnapImpossible(_platX, _platY);
@@ -282,12 +282,12 @@ void GnapEngine::scene44_run() {
 						_gnapActionStatus = 1;
 						break;
 					case PLAT_CURSOR:
-						gnapUseDeviceOnBeaver();
+						gnapUseDeviceOnPlatypuss();
 						platypusWalkTo(6, 7, 1, 0x107D2, 1);
 						if (_gnapX == 7 && _gnapY == 7)
 							gnapWalkStep();
 						playGnapIdle(5, 7);
-						_beaverActionStatus = 4;
+						_platypusActionStatus = 4;
 						break;
 					}
 				}
@@ -366,13 +366,13 @@ void GnapEngine::scene44_run() {
 		toyUfoCheckTimer();
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO) && _s44_currKissingLadySequenceId != 0xF5)
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO) && _s44_currKissingLadySequenceId != 0xF5)
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(20) + 20;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s44_nextKissingLadySequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s44_nextKissingLadySequenceId == -1) {
 					switch (getRandom(20)) {
 					case 0:
 						_s44_nextKissingLadySequenceId = 0xED;
@@ -399,7 +399,7 @@ void GnapEngine::scene44_run() {
 			}
 			if (!_timers[5]) {
 				_timers[5] = getRandom(20) + 20;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s44_nextSpringGuySequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s44_nextSpringGuySequenceId == -1) {
 					if (getRandom(5) != 0) {
 						if (!isFlag(kGFSpringTaken))
 							_s44_nextSpringGuySequenceId = 0xF9;
@@ -445,15 +445,15 @@ void GnapEngine::scene44_updateAnimations() {
 	
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
-		switch (_beaverActionStatus) {
+		switch (_platypusActionStatus) {
 		case 4:
 			if (_gameSys->getAnimationStatus(2) == 2) {
-				_gameSys->insertSequence(0xFE, _beaverId, _beaverSequenceId | (_beaverSequenceDatNum << 16), _beaverId, kSeqSyncWait, 0, 0, 0);
-				_beaverSequenceId = 0xFE;
-				_beaverSequenceDatNum = 0;
-				_gameSys->setAnimation(0xFE, _beaverId, 1);
+				_gameSys->insertSequence(0xFE, _platypusId, _platypusSequenceId | (_platypusSequenceDatNum << 16), _platypusId, kSeqSyncWait, 0, 0, 0);
+				_platypusSequenceId = 0xFE;
+				_platypusSequenceDatNum = 0;
+				_gameSys->setAnimation(0xFE, _platypusId, 1);
 				_gameSys->removeSequence(_s44_currKissingLadySequenceId, 1, true);
-				_beaverActionStatus = 5;
+				_platypusActionStatus = 5;
 			}
 			break;
 		case 5:
@@ -461,7 +461,7 @@ void GnapEngine::scene44_updateAnimations() {
 			_newSceneNum = 50;
 			break;
 		default:
-			_beaverActionStatus = -1;
+			_platypusActionStatus = -1;
 			break;
 		}
 	}
@@ -469,7 +469,7 @@ void GnapEngine::scene44_updateAnimations() {
 	if (_gameSys->getAnimationStatus(2) == 2) {
 		if (_s44_nextKissingLadySequenceId == 0xF6) {
 			_gameSys->insertSequence(_s44_nextKissingLadySequenceId, 1, _s44_currKissingLadySequenceId, 1, kSeqSyncWait, 0, 0, 0);
-			initBeaverPos(5, 8, kDirNone);
+			initPlatypusPos(5, 8, kDirNone);
 			_s44_currKissingLadySequenceId = _s44_nextKissingLadySequenceId;
 			_s44_nextKissingLadySequenceId = -1;
 			_gameSys->setAnimation(0, 0, 2);
diff --git a/engines/gnap/scenes/scene45.cpp b/engines/gnap/scenes/scene45.cpp
index 8581e551e5..e8d421405a 100644
--- a/engines/gnap/scenes/scene45.cpp
+++ b/engines/gnap/scenes/scene45.cpp
@@ -115,23 +115,23 @@ void GnapEngine::scene45_run() {
 		_gameSys->setAnimation(0x9E, 1, 0);
 		_gnapActionStatus = 1;
 		_gameSys->insertSequence(_gnapSequenceId, _gnapId, 0, 0, kSeqNone, 0, 0, 0);
-		initBeaverPos(4, 8, kDirNone);
+		initPlatypusPos(4, 8, kDirNone);
 		endSceneInit();
 	} else if (_prevSceneNum == 46) {
 		initGnapPos(-1, 8, kDirUpRight);
-		initBeaverPos(-1, 9, kDirUpLeft);
+		initPlatypusPos(-1, 9, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(4, 8, -1, 0x107C2, 1);
 		gnapWalkTo(2, 7, -1, 0x107B9, 1);
 	} else if (_prevSceneNum == 41) {
 		initGnapPos(11, 8, kDirUpRight);
-		initBeaverPos(11, 9, kDirUpLeft);
+		initPlatypusPos(11, 9, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(4, 8, -1, 0x107D2, 1);
 		gnapWalkTo(10, 9, -1, 0x107BA, 1);
 	} else {
 		initGnapPos(2, 11, kDirUpRight);
-		initBeaverPos(6, 11, kDirUpLeft);
+		initPlatypusPos(6, 11, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(4, 8, -1, 0x107C2, 1);
 		gnapWalkTo(2, 7, -1, 0x107B9, 1);
@@ -176,8 +176,8 @@ void GnapEngine::scene45_run() {
 		_gnapSequenceDatNum = 1;
 	}
 	
-	playBeaverSequence(0x9A);
-	_gameSys->setAnimation(_beaverSequenceId, _beaverId, 1);
+	playPlatypusSequence(0x9A);
+	_gameSys->setAnimation(_platypusSequenceId, _platypusId, 1);
 	
 	while (!_sceneDone) {
 		if (!isSoundPlaying(0x1094A))
@@ -240,12 +240,12 @@ void GnapEngine::scene45_run() {
 							break;
 						case GRAB_CURSOR:
 							gnapKissPlatypus(0);
-							playBeaverSequence(0x9A);
-							_gameSys->setAnimation(_beaverSequenceId, _beaverId, 1);
+							playPlatypusSequence(0x9A);
+							_gameSys->setAnimation(_platypusSequenceId, _platypusId, 1);
 							break;
 						case TALK_CURSOR:
 							playGnapBrainPulsating(_platX, _platY);
-							playBeaverSequence(getBeaverSequenceId());
+							playPlatypusSequence(getPlatypusSequenceId());
 							break;
 						case PLAT_CURSOR:
 							playGnapImpossible(_platX, _platY);
@@ -382,10 +382,10 @@ void GnapEngine::scene45_updateAnimations() {
 	if (_gameSys->getAnimationStatus(1) == 2) {
 		_gameSys->setAnimation(0, 0, 1);
 		if (getRandom(2) != 0)
-			playBeaverSequence(0x9B);
+			playPlatypusSequence(0x9B);
 		else
-			playBeaverSequence(0x9C);
-		_gameSys->setAnimation(_beaverSequenceId, _beaverId, 1);
+			playPlatypusSequence(0x9C);
+		_gameSys->setAnimation(_platypusSequenceId, _platypusId, 1);
 	}
 	
 	if (_gameSys->getAnimationStatus(2) == 2) {
diff --git a/engines/gnap/scenes/scene46.cpp b/engines/gnap/scenes/scene46.cpp
index 4a1ba2535f..26a3be0b34 100644
--- a/engines/gnap/scenes/scene46.cpp
+++ b/engines/gnap/scenes/scene46.cpp
@@ -102,19 +102,19 @@ void GnapEngine::scene46_run() {
 		endSceneInit();
 	} else if (_prevSceneNum == 44) {
 		initGnapPos(-1, 8, kDirUpRight);
-		initBeaverPos(-1, 8, kDirUpLeft);
+		initPlatypusPos(-1, 8, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(1, 8, -1, 0x107C2, 1);
 		gnapWalkTo(2, 8, -1, 0x107B9, 1);
 	} else if (_prevSceneNum == 45) {
 		initGnapPos(11, 8, kDirUpRight);
-		initBeaverPos(12, 8, kDirUpLeft);
+		initPlatypusPos(12, 8, kDirUpLeft);
 		endSceneInit();
 		gnapWalkTo(8, 8, -1, 0x107BA, 1);
 		platypusWalkTo(9, 8, -1, 0x107D2, 1);
 	} else {
 		initGnapPos(5, 11, kDirUpRight);
-		initBeaverPos(6, 11, kDirUpLeft);
+		initPlatypusPos(6, 11, kDirUpLeft);
 		endSceneInit();
 		platypusWalkTo(5, 8, -1, 0x107C2, 1);
 		gnapWalkTo(6, 8, -1, 0x107BA, 1);
@@ -183,7 +183,7 @@ void GnapEngine::scene46_run() {
 							break;
 						case TALK_CURSOR:
 							playGnapBrainPulsating(_platX, _platY);
-							playBeaverSequence(getBeaverSequenceId());
+							playPlatypusSequence(getPlatypusSequenceId());
 							break;
 						case PLAT_CURSOR:
 							playGnapImpossible(_platX, _platY);
@@ -280,13 +280,13 @@ void GnapEngine::scene46_run() {
 		toyUfoCheckTimer();
 	
 		if (!_isLeavingScene) {
-			if (_beaverActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
-				updateBeaverIdleSequence();
+			if (_platypusActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
+				updatePlatypusIdleSequence();
 			if (_gnapActionStatus < 0 && !isFlag(kGFGnapControlsToyUFO))
 				updateGnapIdleSequence();
 			if (!_timers[4]) {
 				_timers[4] = getRandom(50) + 80;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s46_nextItchyGuySequenceId == -1) {
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s46_nextItchyGuySequenceId == -1) {
 					if (getRandom(2) != 0)
 						_s46_nextItchyGuySequenceId = 0x49;
 					else
@@ -295,7 +295,7 @@ void GnapEngine::scene46_run() {
 			}
 			if (!_timers[5]) {
 				_timers[5] = getRandom(50) + 80;
-				if (_gnapActionStatus < 0 && _beaverActionStatus < 0 && _s46_nextSackGuySequenceId == -1)
+				if (_gnapActionStatus < 0 && _platypusActionStatus < 0 && _s46_nextSackGuySequenceId == -1)
 					_s46_nextSackGuySequenceId = 0x4C;
 			}
 		}