HOPKINS: Renamed fields and methods in ObjectsManager

5 files changed, 162 insertions, 162 deletions

diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index ea772304ed..bf9509c0d4 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -206,7 +206,7 @@ bool HopkinsEngine::runWin95Demo() {
 		case 1:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 2, true);
+			_objectsMan->sceneControl2("IM01", "IM01", "ANIM01", "IM01", 2, true);
 			break;
 
 		case 3:
@@ -243,7 +243,7 @@ bool HopkinsEngine::runWin95Demo() {
 			}
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2, false);
+			_objectsMan->sceneControl2("IM03", "IM03", "ANIM03", "IM03", 2, false);
 			break;
 
 		case 4:
@@ -258,48 +258,48 @@ bool HopkinsEngine::runWin95Demo() {
 
 			if (_globals->_saveData->_data[svFreedHostageFl]) {
 				if (_globals->_saveData->_data[svFreedHostageFl] == 1)
-					_objectsMan->PERSONAGE2("IM05", "IM05A", "ANIM05B", "IM05", 3, false);
+					_objectsMan->sceneControl2("IM05", "IM05A", "ANIM05B", "IM05", 3, false);
 			} else {
-				_objectsMan->PERSONAGE2("IM05", "IM05", "ANIM05", "IM05", 3, false);
+				_objectsMan->sceneControl2("IM05", "IM05", "ANIM05", "IM05", 3, false);
 			}
 			break;
 
 		case 6:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 460;
-			_objectsMan->PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2, true);
+			_objectsMan->sceneControl2("IM06", "IM06", "ANIM06", "IM06", 2, true);
 			break;
 
 		case 7:
 			if (_globals->_saveData->_data[svBombBoxOpenedFl])
-				_objectsMan->PERSONAGE("BOMBEB", "BOMBE", "BOMBE", "BOMBE", 2, true);
+				_objectsMan->sceneControl("BOMBEB", "BOMBE", "BOMBE", "BOMBE", 2, true);
 			else
-				_objectsMan->PERSONAGE("BOMBEA", "BOMBE", "BOMBE", "BOMBE", 2, true);
+				_objectsMan->sceneControl("BOMBEA", "BOMBE", "BOMBE", "BOMBE", 2, true);
 			break;
 
 		case 8:
 			_linesMan->setMaxLineIdx(15);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2, true);
+			_objectsMan->sceneControl2("IM08", "IM08", "ANIM08", "IM08", 2, true);
 			break;
 
 		case 9:
 			_globals->_characterMaxPosY = 440;
 			_linesMan->setMaxLineIdx(20);
 			if (_globals->_saveData->_data[svBombDisarmedFl])
-			  _objectsMan->PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10, true);
+			  _objectsMan->sceneControl2("IM09", "IM09", "ANIM09", "IM09", 10, true);
 			else
 			  bombExplosion();
 			break;
 
 		case 10:
-			_objectsMan->PERSONAGE("IM10", "IM10", "ANIM10", "IM10", 9, false);
+			_objectsMan->sceneControl("IM10", "IM10", "ANIM10", "IM10", 9, false);
 			break;
 
 		case 11:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM11", "IM11", "ANIM11", "IM11", 2, false);
+			_objectsMan->sceneControl2("IM11", "IM11", "ANIM11", "IM11", 2, false);
 			break;
 
 		case 12:
@@ -347,11 +347,11 @@ bool HopkinsEngine::runWin95Demo() {
 			break;
 
 		case 111:
-			_objectsMan->PERSONAGE("IM111", "IM111", "ANIM111", "IM111", 10, false);
+			_objectsMan->sceneControl("IM111", "IM111", "ANIM111", "IM111", 10, false);
 			break;
 
 		case 112:
-			_objectsMan->PERSONAGE("IM112", "IM112", "ANIM112", "IM112", 10, false);
+			_objectsMan->sceneControl("IM112", "IM112", "ANIM112", "IM112", 10, false);
 			break;
 
 		case 113:
@@ -502,7 +502,7 @@ bool HopkinsEngine::runLinuxDemo() {
 		case 1:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 1, true);
+			_objectsMan->sceneControl2("IM01", "IM01", "ANIM01", "IM01", 1, true);
 			break;
 
 		case 3:
@@ -542,7 +542,7 @@ bool HopkinsEngine::runLinuxDemo() {
 
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2, false);
+			_objectsMan->sceneControl2("IM03", "IM03", "ANIM03", "IM03", 2, false);
 			break;
 
 		case 4:
@@ -555,28 +555,28 @@ bool HopkinsEngine::runLinuxDemo() {
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 455;
 			if (_globals->_saveData->_data[svFreedHostageFl] == 1)
-					_objectsMan->PERSONAGE2("IM05", "IM05A", "ANIM05B", "IM05", 3, false);
+					_objectsMan->sceneControl2("IM05", "IM05A", "ANIM05B", "IM05", 3, false);
 			else
-				_objectsMan->PERSONAGE2("IM05", "IM05", "ANIM05", "IM05", 3, false);
+				_objectsMan->sceneControl2("IM05", "IM05", "ANIM05", "IM05", 3, false);
 			break;
 
 		case 6:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 460;
-			_objectsMan->PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2, true);
+			_objectsMan->sceneControl2("IM06", "IM06", "ANIM06", "IM06", 2, true);
 			break;
 
 		case 7:
 			if (_globals->_saveData->_data[svBombBoxOpenedFl])
-				_objectsMan->PERSONAGE("BOMBEB", "BOMBE", "BOMBE", "BOMBE", 2, true);
+				_objectsMan->sceneControl("BOMBEB", "BOMBE", "BOMBE", "BOMBE", 2, true);
 			else
-				_objectsMan->PERSONAGE("BOMBEA", "BOMBE", "BOMBE", "BOMBE", 2, true);
+				_objectsMan->sceneControl("BOMBEA", "BOMBE", "BOMBE", "BOMBE", 2, true);
 			break;
 
 		case 8:
 			_linesMan->setMaxLineIdx(15);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2, true);
+			_objectsMan->sceneControl2("IM08", "IM08", "ANIM08", "IM08", 2, true);
 			break;
 
 		case 9:
@@ -586,24 +586,24 @@ bool HopkinsEngine::runLinuxDemo() {
 			if (!_globals->_saveData->_data[svBombDisarmedFl])
 				bombExplosion();
 			else
-				_objectsMan->PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10, true);
+				_objectsMan->sceneControl2("IM09", "IM09", "ANIM09", "IM09", 10, true);
 			break;
 
 		case 10:
-			_objectsMan->PERSONAGE("IM10", "IM10", "ANIM10", "IM10", 9, false);
+			_objectsMan->sceneControl("IM10", "IM10", "ANIM10", "IM10", 9, false);
 			break;
 
 		case 11:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM11", "IM11", "ANIM11", "IM11", 2, false);
+			_objectsMan->sceneControl2("IM11", "IM11", "ANIM11", "IM11", 2, false);
 			break;
 
 		case 12:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 450;
 			if (_globals->_saveData->_data[svBombDisarmedFl])
-				_objectsMan->PERSONAGE2("IM12", "IM12", "ANIM12", "IM12", 1, false);
+				_objectsMan->sceneControl2("IM12", "IM12", "ANIM12", "IM12", 1, false);
 			else
 				bombExplosion();
 			break;
@@ -611,17 +611,17 @@ bool HopkinsEngine::runLinuxDemo() {
 		case 13:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM13", "IM13", "ANIM13", "IM13", 1, true);
+			_objectsMan->sceneControl2("IM13", "IM13", "ANIM13", "IM13", 1, true);
 			break;
 
 		case 14:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM14", "IM14", "ANIM14", "IM14", 1, true);
+			_objectsMan->sceneControl2("IM14", "IM14", "ANIM14", "IM14", 1, true);
 			break;
 
 		case 15:
-			_objectsMan->PERSONAGE("IM15", "IM15", "ANIM15", "IM15", 29, false);
+			_objectsMan->sceneControl("IM15", "IM15", "ANIM15", "IM15", 29, false);
 			break;
 
 		case 16:
@@ -629,25 +629,25 @@ bool HopkinsEngine::runLinuxDemo() {
 			_globals->_characterMaxPosY = 450;
 
 			if (_globals->_saveData->_data[svForestAvailableFl] == 1) {
-				_objectsMan->PERSONAGE2("IM16", "IM16A", "ANIM16", "IM16", 7, true);
+				_objectsMan->sceneControl2("IM16", "IM16A", "ANIM16", "IM16", 7, true);
 			} else if (!_globals->_saveData->_data[svForestAvailableFl]) {
-				_objectsMan->PERSONAGE2("IM16", "IM16", "ANIM16", "IM16", 7, true);
+				_objectsMan->sceneControl2("IM16", "IM16", "ANIM16", "IM16", 7, true);
 			}
 			break;
 
 		case 25:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM25", "IM25", "ANIM25", "IM25", 30, true);
+			_objectsMan->sceneControl2("IM25", "IM25", "ANIM25", "IM25", 30, true);
 			break;
 
 		case 26:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM26", "IM26", "ANIM26", "IM26", 30, true);
+			_objectsMan->sceneControl2("IM26", "IM26", "ANIM26", "IM26", 30, true);
 
 		case 33:
-			_objectsMan->PERSONAGE("IM33", "IM33", "ANIM33", "IM33", 8, false);
+			_objectsMan->sceneControl("IM33", "IM33", "ANIM33", "IM33", 8, false);
 			break;
 
 		case 35:
@@ -655,11 +655,11 @@ bool HopkinsEngine::runLinuxDemo() {
 			break;
 
 		case 111:
-			_objectsMan->PERSONAGE("IM111", "IM111", "ANIM111", "IM111", 10, false);
+			_objectsMan->sceneControl("IM111", "IM111", "ANIM111", "IM111", 10, false);
 			break;
 
 		case 112:
-			_objectsMan->PERSONAGE("IM112", "IM112", "ANIM112", "IM112", 10, false);
+			_objectsMan->sceneControl("IM112", "IM112", "ANIM112", "IM112", 10, false);
 			break;
 
 		case 113:
@@ -841,7 +841,7 @@ bool HopkinsEngine::runFull() {
 		case 1:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM01", "IM01", "ANIM01", "IM01", 1, true);
+			_objectsMan->sceneControl2("IM01", "IM01", "ANIM01", "IM01", 1, true);
 			break;
 
 		case 3:
@@ -894,7 +894,7 @@ bool HopkinsEngine::runFull() {
 			}
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM03", "IM03", "ANIM03", "IM03", 2, false);
+			_objectsMan->sceneControl2("IM03", "IM03", "ANIM03", "IM03", 2, false);
 			break;
 
 		case 4:
@@ -907,54 +907,54 @@ bool HopkinsEngine::runFull() {
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 455;
 			if (_globals->_saveData->_data[svFreedHostageFl] == 1)
-				_objectsMan->PERSONAGE2("IM05", "IM05A", "ANIM05B", "IM05", 3, false);
+				_objectsMan->sceneControl2("IM05", "IM05A", "ANIM05B", "IM05", 3, false);
 			else
-				_objectsMan->PERSONAGE2("IM05", "IM05", "ANIM05", "IM05", 3, false);
+				_objectsMan->sceneControl2("IM05", "IM05", "ANIM05", "IM05", 3, false);
 			break;
 
 		case 6:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 460;
-			_objectsMan->PERSONAGE2("IM06", "IM06", "ANIM06", "IM06", 2, true);
+			_objectsMan->sceneControl2("IM06", "IM06", "ANIM06", "IM06", 2, true);
 			break;
 
 		case 7:
 			if (_globals->_saveData->_data[svBombBoxOpenedFl])
-				_objectsMan->PERSONAGE("BOMBEB", "BOMBE", "BOMBE", "BOMBE", 2, true);
+				_objectsMan->sceneControl("BOMBEB", "BOMBE", "BOMBE", "BOMBE", 2, true);
 			else
-				_objectsMan->PERSONAGE("BOMBEA", "BOMBE", "BOMBE", "BOMBE", 2, true);
+				_objectsMan->sceneControl("BOMBEA", "BOMBE", "BOMBE", "BOMBE", 2, true);
 			break;
 
 		case 8:
 			_linesMan->setMaxLineIdx(15);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM08", "IM08", "ANIM08", "IM08", 2, true);
+			_objectsMan->sceneControl2("IM08", "IM08", "ANIM08", "IM08", 2, true);
 			break;
 
 		case 9:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 440;
 			if (_globals->_saveData->_data[svBombDisarmedFl])
-				_objectsMan->PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10, true);
+				_objectsMan->sceneControl2("IM09", "IM09", "ANIM09", "IM09", 10, true);
 			else
 				bombExplosion();
 			break;
 
 		case 10:
-			_objectsMan->PERSONAGE("IM10", "IM10", "ANIM10", "IM10", 9, false);
+			_objectsMan->sceneControl("IM10", "IM10", "ANIM10", "IM10", 9, false);
 			break;
 
 		case 11:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 450;
-			_objectsMan->PERSONAGE2("IM11", "IM11", "ANIM11", "IM11", 2, false);
+			_objectsMan->sceneControl2("IM11", "IM11", "ANIM11", "IM11", 2, false);
 			break;
 
 		case 12:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 450;
 			if (_globals->_saveData->_data[svBombDisarmedFl])
-				_objectsMan->PERSONAGE2("IM12", "IM12", "ANIM12", "IM12", 1, false);
+				_objectsMan->sceneControl2("IM12", "IM12", "ANIM12", "IM12", 1, false);
 			else
 				bombExplosion();
 			break;
@@ -962,38 +962,38 @@ bool HopkinsEngine::runFull() {
 		case 13:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM13", "IM13", "ANIM13", "IM13", 1, true);
+			_objectsMan->sceneControl2("IM13", "IM13", "ANIM13", "IM13", 1, true);
 			break;
 
 		case 14:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM14", "IM14", "ANIM14", "IM14", 1, true);
+			_objectsMan->sceneControl2("IM14", "IM14", "ANIM14", "IM14", 1, true);
 			break;
 
 		case 15:
 			if (getPlatform() == Common::kPlatformLinux || getPlatform() == Common::kPlatformWindows)
-				_objectsMan->PERSONAGE("IM15", "IM15", "ANIM15", "IM15", 29, false);
+				_objectsMan->sceneControl("IM15", "IM15", "ANIM15", "IM15", 29, false);
 			else
-				_objectsMan->PERSONAGE("IM15", "IM15", "ANIM15", "IM15", 18, false);
+				_objectsMan->sceneControl("IM15", "IM15", "ANIM15", "IM15", 18, false);
 			break;
 
 		case 16:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 450;
 			if (_globals->_saveData->_data[svForestAvailableFl] == 1)
-				_objectsMan->PERSONAGE2("IM16", "IM16A", "ANIM16", "IM16", 7, true);
+				_objectsMan->sceneControl2("IM16", "IM16A", "ANIM16", "IM16", 7, true);
 			else
-				_objectsMan->PERSONAGE2("IM16", "IM16", "ANIM16", "IM16", 7, true);
+				_objectsMan->sceneControl2("IM16", "IM16", "ANIM16", "IM16", 7, true);
 			break;
 
 		case 17:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 440;
 			if (_globals->_saveData->_data[svHutBurningFl] == 1)
-				_objectsMan->PERSONAGE2("IM17", "IM17A", "ANIM17", "IM17", 11, true);
+				_objectsMan->sceneControl2("IM17", "IM17A", "ANIM17", "IM17", 11, true);
 			else if (!_globals->_saveData->_data[svHutBurningFl])
-				_objectsMan->PERSONAGE2("IM17", "IM17", "ANIM17", "IM17", 11, true);
+				_objectsMan->sceneControl2("IM17", "IM17", "ANIM17", "IM17", 11, true);
 			if (_globals->_exitId == 18) {
 				_globals->_eventMode = EVENTMODE_IGNORE;
 				_graphicsMan->clearScreen();
@@ -1020,24 +1020,24 @@ bool HopkinsEngine::runFull() {
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 450;
 			if (getPlatform() == Common::kPlatformLinux || getPlatform() == Common::kPlatformWindows)
-				_objectsMan->PERSONAGE2("IM18", "IM18", "ANIM18", "IM18", 29, false);
+				_objectsMan->sceneControl2("IM18", "IM18", "ANIM18", "IM18", 29, false);
 			else
-				_objectsMan->PERSONAGE2("IM18", "IM18", "ANIM18", "IM18", 6, false);
+				_objectsMan->sceneControl2("IM18", "IM18", "ANIM18", "IM18", 6, false);
 			break;
 
 		case 19:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 440;
 			if (_globals->_saveData->_data[svHeavenGuardGoneFl])
-				_objectsMan->PERSONAGE2("IM19", "IM19A", "ANIM19", "IM19", 6, true);
+				_objectsMan->sceneControl2("IM19", "IM19A", "ANIM19", "IM19", 6, true);
 			else
-				_objectsMan->PERSONAGE2("IM19", "IM19", "ANIM19", "IM19", 6, true);
+				_objectsMan->sceneControl2("IM19", "IM19", "ANIM19", "IM19", 6, true);
 			break;
 
 		case 20:
 			_linesMan->setMaxLineIdx(10);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM20", "IM20", "ANIM20", "IM20", 6, true);
+			_objectsMan->sceneControl2("IM20", "IM20", "ANIM20", "IM20", 6, true);
 			if (_globals->_exitId == 17) {
 				_globals->_eventMode = EVENTMODE_IGNORE;
 				_soundMan->stopSound();
@@ -1056,88 +1056,88 @@ bool HopkinsEngine::runFull() {
 		case 22:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM22", "IM22", "ANIM22", "IM22", 6, true);
+			_objectsMan->sceneControl2("IM22", "IM22", "ANIM22", "IM22", 6, true);
 			break;
 
 		case 23:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM23", "IM23", "ANIM23", "IM23", 6, true);
+			_objectsMan->sceneControl2("IM23", "IM23", "ANIM23", "IM23", 6, true);
 			break;
 
 		case 24:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 450;
 			if (_globals->_saveData->_data[svCinemaDogGoneFl] == 1)
-				_objectsMan->PERSONAGE2("IM24", "IM24A", "ANIM24", "IM24", 1, true);
+				_objectsMan->sceneControl2("IM24", "IM24A", "ANIM24", "IM24", 1, true);
 			else
-				_objectsMan->PERSONAGE2("IM24", "IM24", "ANIM24", "IM24", 1, true);
+				_objectsMan->sceneControl2("IM24", "IM24", "ANIM24", "IM24", 1, true);
 			break;
 
 		case 25:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 445;
 			if (getPlatform() == Common::kPlatformLinux || getPlatform() == Common::kPlatformWindows)
-				_objectsMan->PERSONAGE2("IM25", "IM25", "ANIM25", "IM25", 30, true);
+				_objectsMan->sceneControl2("IM25", "IM25", "ANIM25", "IM25", 30, true);
 			else
-				_objectsMan->PERSONAGE2("IM25", "IM25", "ANIM25", "IM25", 8, true);
+				_objectsMan->sceneControl2("IM25", "IM25", "ANIM25", "IM25", 8, true);
 			break;
 
 		case 26:
 			_linesMan->setMaxLineIdx(40);
 			_globals->_characterMaxPosY = 435;
 			if (getPlatform() == Common::kPlatformLinux || getPlatform() == Common::kPlatformWindows)
-				_objectsMan->PERSONAGE2("IM26", "IM26", "ANIM26", "IM26", 30, true);
+				_objectsMan->sceneControl2("IM26", "IM26", "ANIM26", "IM26", 30, true);
 			else
-				_objectsMan->PERSONAGE2("IM26", "IM26", "ANIM26", "IM26", 8, true);
+				_objectsMan->sceneControl2("IM26", "IM26", "ANIM26", "IM26", 8, true);
 			break;
 
 		case 27:
 			_linesMan->setMaxLineIdx(15);
 			_globals->_characterMaxPosY = 440;
 			if (_globals->_saveData->_data[svPoolDogGoneFl] == 1)
-				_objectsMan->PERSONAGE2("IM27", "IM27A", "ANIM27", "IM27", 27, true);
+				_objectsMan->sceneControl2("IM27", "IM27A", "ANIM27", "IM27", 27, true);
 			else
-				_objectsMan->PERSONAGE2("IM27", "IM27", "ANIM27", "IM27", 27, true);
+				_objectsMan->sceneControl2("IM27", "IM27", "ANIM27", "IM27", 27, true);
 			break;
 
 		case 28:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 450;
 			if (_globals->_saveData->_data[svCinemaCurtainCond1] != 1 || _globals->_saveData->_data[svCinemaCurtainCond2] != 1)
-				_objectsMan->PERSONAGE2("IM28", "IM28", "ANIM28", "IM28", 1, false);
+				_objectsMan->sceneControl2("IM28", "IM28", "ANIM28", "IM28", 1, false);
 			else
-				_objectsMan->PERSONAGE2("IM28A", "IM28", "ANIM28", "IM28", 1, false);
+				_objectsMan->sceneControl2("IM28A", "IM28", "ANIM28", "IM28", 1, false);
 			break;
 
 		case 29:
 			_linesMan->setMaxLineIdx(50);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM29", "IM29", "ANIM29", "IM29", 1, true);
+			_objectsMan->sceneControl2("IM29", "IM29", "ANIM29", "IM29", 1, true);
 			break;
 
 		case 30:
 			_linesMan->setMaxLineIdx(15);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM30", "IM30", "ANIM30", "IM30", 24, false);
+			_objectsMan->sceneControl2("IM30", "IM30", "ANIM30", "IM30", 24, false);
 			break;
 
 		case 31:
-			_objectsMan->PERSONAGE("IM31", "IM31", "ANIM31", "IM31", 10, true);
+			_objectsMan->sceneControl("IM31", "IM31", "ANIM31", "IM31", 10, true);
 			break;
 
 		case 32:
 			_linesMan->setMaxLineIdx(20);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM32", "IM32", "ANIM32", "IM32", 2, true);
+			_objectsMan->sceneControl2("IM32", "IM32", "ANIM32", "IM32", 2, true);
 			break;
 
 		case 33:
-			_objectsMan->PERSONAGE("IM33", "IM33", "ANIM33", "IM33", 8, false);
+			_objectsMan->sceneControl("IM33", "IM33", "ANIM33", "IM33", 8, false);
 			break;
 
 		case 34:
-			_objectsMan->PERSONAGE("IM34", "IM34", "ANIM34", "IM34", 2, false);
+			_objectsMan->sceneControl("IM34", "IM34", "ANIM34", "IM34", 2, false);
 			break;
 
 		case 35:
@@ -1157,7 +1157,7 @@ bool HopkinsEngine::runFull() {
 				_objectsMan->_forestSprite = _objectsMan->loadSprite("HOPDEG.SPR");
 				_soundMan->loadSample(1, "SOUND41.WAV");
 			}
-			_objectsMan->PERSONAGE2(im, im, "BANDIT", im, 13, false);
+			_objectsMan->sceneControl2(im, im, "BANDIT", im, 13, false);
 			if (_globals->_exitId < 35 || _globals->_exitId > 49) {
 				_objectsMan->_forestSprite = _globals->freeMemory(_objectsMan->_forestSprite);
 				_objectsMan->_forestFl = false;
@@ -1174,130 +1174,130 @@ bool HopkinsEngine::runFull() {
 		case 51:
 			_linesMan->setMaxLineIdx(10);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM51", "IM51", "ANIM51", "IM51", 14, true);
+			_objectsMan->sceneControl2("IM51", "IM51", "ANIM51", "IM51", 14, true);
 			break;
 
 		case 52:
 			_linesMan->setMaxLineIdx(15);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM52", "IM52", "ANIM52", "IM52", 14, true);
+			_objectsMan->sceneControl2("IM52", "IM52", "ANIM52", "IM52", 14, true);
 			break;
 
 		case 54:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM54", "IM54", "ANIM54", "IM54", 14, true);
+			_objectsMan->sceneControl2("IM54", "IM54", "ANIM54", "IM54", 14, true);
 			break;
 
 		case 55:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 460;
-			_objectsMan->PERSONAGE2("IM55", "IM55", "ANIM55", "IM55", 14, false);
+			_objectsMan->sceneControl2("IM55", "IM55", "ANIM55", "IM55", 14, false);
 			break;
 
 		case 56:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM56", "IM56", "ANIM56", "IM56", 14, false);
+			_objectsMan->sceneControl2("IM56", "IM56", "ANIM56", "IM56", 14, false);
 			break;
 
 		case 57:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM57", "IM57", "ANIM57", "IM57", 14, true);
+			_objectsMan->sceneControl2("IM57", "IM57", "ANIM57", "IM57", 14, true);
 			break;
 
 		case 58:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM58", "IM58", "ANIM58", "IM58", 14, false);
+			_objectsMan->sceneControl2("IM58", "IM58", "ANIM58", "IM58", 14, false);
 			break;
 
 		case 59:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM59", "IM59", "ANIM59", "IM59", 21, false);
+			_objectsMan->sceneControl2("IM59", "IM59", "ANIM59", "IM59", 21, false);
 			break;
 
 		case 60:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM60", "IM60", "ANIM60", "IM60", 21, false);
+			_objectsMan->sceneControl2("IM60", "IM60", "ANIM60", "IM60", 21, false);
 			break;
 
 		case 61:
 			if (_globals->_saveData->_data[svBaseElevatorCond1] == 1 && !_globals->_saveData->_data[svBaseFireFl])
 				handleConflagration();
-			_objectsMan->PERSONAGE("IM61", "IM61", "ANIM61", "IM61", 21, false);
+			_objectsMan->sceneControl("IM61", "IM61", "ANIM61", "IM61", 21, false);
 			break;
 
 		case 62:
 			_linesMan->setMaxLineIdx(8);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM62", "IM62", NULL, "IM62", 21, false);
+			_objectsMan->sceneControl2("IM62", "IM62", NULL, "IM62", 21, false);
 			break;
 
 		case 63:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM63", "IM63", "ANIM63", "IM63", 21, false);
+			_objectsMan->sceneControl2("IM63", "IM63", "ANIM63", "IM63", 21, false);
 			break;
 
 		case 64:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM64", "IM64", "ANIM64", "IM64", 21, true);
+			_objectsMan->sceneControl2("IM64", "IM64", "ANIM64", "IM64", 21, true);
 			break;
 
 		case 65:
 			_linesMan->setMaxLineIdx(30);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM65", "IM65", "ANIM65", "IM65", 21, false);
+			_objectsMan->sceneControl2("IM65", "IM65", "ANIM65", "IM65", 21, false);
 			break;
 
 		case 66:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM66", "IM66", "ANIM66", "IM66", 21, false);
+			_objectsMan->sceneControl2("IM66", "IM66", "ANIM66", "IM66", 21, false);
 			break;
 
 		case 67:
 			_linesMan->setMaxLineIdx(8);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM67", "IM67", NULL, "IM67", 21, false);
+			_objectsMan->sceneControl2("IM67", "IM67", NULL, "IM67", 21, false);
 			break;
 
 		case 68:
 			_linesMan->setMaxLineIdx(8);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM68", "IM68", "ANIM68", "IM68", 21, true);
+			_objectsMan->sceneControl2("IM68", "IM68", "ANIM68", "IM68", 21, true);
 			break;
 
 		case 69:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM69", "IM69", "ANIM69", "IM69", 21, false);
+			_objectsMan->sceneControl2("IM69", "IM69", "ANIM69", "IM69", 21, false);
 			break;
 
 		case 70:
 			_linesMan->setMaxLineIdx(8);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM70", "IM70", NULL, "IM70", 21, false);
+			_objectsMan->sceneControl2("IM70", "IM70", NULL, "IM70", 21, false);
 			break;
 
 		case 71:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 445;
-			_objectsMan->PERSONAGE2("IM71", "IM71", "ANIM71", "IM71", 21, false);
+			_objectsMan->sceneControl2("IM71", "IM71", "ANIM71", "IM71", 21, false);
 			break;
 
 		case 73:
 			_linesMan->setMaxLineIdx(15);
 			_globals->_characterMaxPosY = 445;
 			if (_globals->_saveData->_data[svSecondElevatorAvailableFl] == 1)
-				_objectsMan->PERSONAGE2("IM73", "IM73A", "ANIM73", "IM73", 21, true);
+				_objectsMan->sceneControl2("IM73", "IM73A", "ANIM73", "IM73", 21, true);
 			else
-				_objectsMan->PERSONAGE2("IM73", "IM73", "ANIM73", "IM73", 21, true);
+				_objectsMan->sceneControl2("IM73", "IM73", "ANIM73", "IM73", 21, true);
 			break;
 
 		case 75:
@@ -1369,39 +1369,39 @@ bool HopkinsEngine::runFull() {
 			_globals->_characterMaxPosY = 445;
 			if (_globals->_saveData->_data[svEscapeLeftJailFl]) {
 				if (getPlatform() == Common::kPlatformLinux || getPlatform() == Common::kPlatformWindows)
-					_objectsMan->PERSONAGE2("IM93", "IM93C", "ANIM93", "IM93", 29, true);
+					_objectsMan->sceneControl2("IM93", "IM93C", "ANIM93", "IM93", 29, true);
 				else
-					_objectsMan->PERSONAGE2("IM93", "IM93C", "ANIM93", "IM93", 26, true);
+					_objectsMan->sceneControl2("IM93", "IM93C", "ANIM93", "IM93", 26, true);
 			} else {
 				if (getPlatform() == Common::kPlatformLinux || getPlatform() == Common::kPlatformWindows)
-					_objectsMan->PERSONAGE2("IM93", "IM93", "ANIM93", "IM93", 29, true);
+					_objectsMan->sceneControl2("IM93", "IM93", "ANIM93", "IM93", 29, true);
 				else
-					_objectsMan->PERSONAGE2("IM93", "IM93", "ANIM93", "IM93", 26, true);
+					_objectsMan->sceneControl2("IM93", "IM93", "ANIM93", "IM93", 26, true);
 			}
 			break;
 
 		case 94:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 440;
-			_objectsMan->PERSONAGE2("IM94", "IM94", "ANIM94", "IM94", 19, true);
+			_objectsMan->sceneControl2("IM94", "IM94", "ANIM94", "IM94", 19, true);
 			break;
 
 		case 95:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM95", "IM95", "ANIM95", "IM95", 19, false);
+			_objectsMan->sceneControl2("IM95", "IM95", "ANIM95", "IM95", 19, false);
 			break;
 
 		case 96:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM96", "IM96", "ANIM96", "IM96", 19, false);
+			_objectsMan->sceneControl2("IM96", "IM96", "ANIM96", "IM96", 19, false);
 			break;
 
 		case 97:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM97", "IM97", "ANIM97", "IM97", 19, false);
+			_objectsMan->sceneControl2("IM97", "IM97", "ANIM97", "IM97", 19, false);
 			if (_globals->_exitId == 18) {
 				_globals->_eventMode = EVENTMODE_IGNORE;
 				_soundMan->stopSound();
@@ -1417,13 +1417,13 @@ bool HopkinsEngine::runFull() {
 		case 98:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM98", "IM98", "ANIM98", "IM98", 19, true);
+			_objectsMan->sceneControl2("IM98", "IM98", "ANIM98", "IM98", 19, true);
 			break;
 
 		case 99:
 			_linesMan->setMaxLineIdx(5);
 			_globals->_characterMaxPosY = 435;
-			_objectsMan->PERSONAGE2("IM99", "IM99", "ANIM99", "IM99", 19, true);
+			_objectsMan->sceneControl2("IM99", "IM99", "ANIM99", "IM99", 19, true);
 			break;
 
 		case 100:
@@ -1431,11 +1431,11 @@ bool HopkinsEngine::runFull() {
 			break;
 
 		case 111:
-			_objectsMan->PERSONAGE("IM111", "IM111", "ANIM111", "IM111", 10, false);
+			_objectsMan->sceneControl("IM111", "IM111", "ANIM111", "IM111", 10, false);
 			break;
 
 		case 112:
-			_objectsMan->PERSONAGE("IM112", "IM112", "ANIM112", "IM112", 10, false);
+			_objectsMan->sceneControl("IM112", "IM112", "ANIM112", "IM112", 10, false);
 			break;
 
 		case 113:
diff --git a/engines/hopkins/objects.cpp b/engines/hopkins/objects.cpp
index 2fca0a2979..f139ee55ab 100644
--- a/engines/hopkins/objects.cpp
+++ b/engines/hopkins/objects.cpp
@@ -45,7 +45,7 @@ ObjectsManager::ObjectsManager(HopkinsEngine *vm) {
 		Common::fill((byte *)&_bob[i], (byte *)&_bob[i] + sizeof(BobItem), 0);
 
 	for (int i = 0; i < 30; ++i) {
-		Common::fill((byte *)&VBob[i], (byte *)&VBob[i] + sizeof(VBobItem), 0);
+		Common::fill((byte *)&_vBob[i], (byte *)&_vBob[i] + sizeof(VBobItem), 0);
 		Common::fill((byte *)&_lockedAnims[i], (byte *)&_lockedAnims[i] + sizeof(LockAnimItem), 0);
 	}
 
@@ -63,10 +63,10 @@ ObjectsManager::ObjectsManager(HopkinsEngine *vm) {
 		_hidingItemData[i] = NULL;
 
 	for (int i = 0; i < 6; ++i)
-		Common::fill((byte *)&Liste[i], (byte *)&Liste[i] + sizeof(ListeItem), 0);
+		Common::fill((byte *)&_liste[i], (byte *)&_liste[i] + sizeof(ListeItem), 0);
 
 	for (int i = 0; i < 35; ++i)
-		Common::fill((byte *)&Liste2[i], (byte *)&Liste2[i] + sizeof(ListeItem), 0);
+		Common::fill((byte *)&_liste2[i], (byte *)&_liste2[i] + sizeof(ListeItem), 0);
 
 	_helicopterFl = false;
 	_priorityFl = false;
@@ -400,7 +400,7 @@ void ObjectsManager::displaySprite() {
 
 	if (!_charactersEnabledFl) {
 		for (int idx = 0; idx < MAX_SPRITE; ++idx) {
-			ListeItem *curList = &Liste[idx];
+			ListeItem *curList = &_liste[idx];
 			if (curList->_visibleFl) {
 				clipX = curList->_posX - 2;
 				if (clipX < _vm->_graphicsMan->_minX)
@@ -423,7 +423,7 @@ void ObjectsManager::displaySprite() {
 	if (!_charactersEnabledFl) {
 		// Handle drawing characters on the screen
 		for (int idx = 0; idx < MAX_SPRITE; ++idx) {
-			Liste[idx]._visibleFl = false;
+			_liste[idx]._visibleFl = false;
 			SpriteItem *curSpr = &_sprite[idx];
 			if (curSpr->_animationType == 1) {
 				computeSprite(idx);
@@ -570,7 +570,7 @@ void ObjectsManager::displaySprite() {
 
 void ObjectsManager::resetBob(int idx) {
 	BobItem &bob = _bob[idx];
-	ListeItem &item = Liste2[idx];
+	ListeItem &item = _liste2[idx];
 
 	bob._bobMode = 0;
 	bob._spriteData = NULL;
@@ -615,7 +615,7 @@ void ObjectsManager::setBobInfo(int idx) {
 			curBob->_spriteData, xp + 300, yp + 300, curBob->_frameIndex,
 			curBob->_zoomOutFactor, curBob->_zooInmFactor, curBob->_flipFl);
 
-	ListeItem *curLst = &Liste2[idx];
+	ListeItem *curLst = &_liste2[idx];
 	curLst->_visibleFl = true;
 	curLst->_posX = xp;
 	curLst->_posY = yp;
@@ -788,7 +788,7 @@ void ObjectsManager::initBobVariables(int idx) {
 	bob->_zooInmFactor = posZoom;
 	bob->_zoomOutFactor = negZoom;
 
-	ListeItem *curList = &Liste2[idx];
+	ListeItem *curList = &_liste2[idx];
 	curList->_visibleFl = true;
 	curList->_posX = newX;
 	curList->_posY = newY;
@@ -866,7 +866,7 @@ void ObjectsManager::showSprite(int idx) {
 		_vm->_graphicsMan->drawCompressedSprite(_vm->_graphicsMan->_frontBuffer, spr->_spriteData,
 		    spr->_destX + 300, spr->_destY + 300,  spr->_spriteIndex, spr->_reducePct, spr->_zoomPct, spr->_flipFl);
 
-	ListeItem *list = &Liste[idx];
+	ListeItem *list = &_liste[idx];
 	list->_width = spr->_width;
 	list->_height = spr->_height;
 
@@ -965,9 +965,9 @@ void ObjectsManager::computeSprite(int idx) {
 	spr->_zoomPct = zoomPercent;
 	spr->_reducePct = reducePercent;
 
-	Liste[idx]._visibleFl = true;
-	Liste[idx]._posX = newPosX;
-	Liste[idx]._posY = newPosY;
+	_liste[idx]._visibleFl = true;
+	_liste[idx]._posX = newPosX;
+	_liste[idx]._posY = newPosY;
 
 	int width = getWidth(spr->_spriteData, spr->_spriteIndex);
 	int height = getHeight(spr->_spriteData, spr->_spriteIndex);
@@ -1100,7 +1100,7 @@ void ObjectsManager::displayBobAnim() {
 
 	for (int i = 1; i <= 35; i++) {
 		BobItem *curBob = &_bob[i];
-		ListeItem *curList = &Liste2[i];
+		ListeItem *curList = &_liste2[i];
 		if (i > 20 || !_charactersEnabledFl) {
 			if ((curBob->_bobMode == 10) && (curBob->_bobMode10)) {
 				if ((curBob->_bobModeChange != 2) && (curBob->_bobModeChange != 4)) {
@@ -1145,7 +1145,7 @@ void ObjectsManager::displayVBob() {
 	int width, height;
 
 	for (int idx = 0; idx <= 29; idx++) {
-		VBobItem *vbob = &VBob[idx];
+		VBobItem *vbob = &_vBob[idx];
 		if (vbob->_displayMode == 4) {
 			width = getWidth(vbob->_spriteData, vbob->_frameIndex);
 			height = getHeight(vbob->_spriteData, vbob->_frameIndex);
@@ -1250,7 +1250,7 @@ void ObjectsManager::clearSprite() {
 	}
 
 	for (int idx = 0; idx < MAX_SPRITE; idx++) {
-		ListeItem *list = &Liste[idx];
+		ListeItem *list = &_liste[idx];
 		list->_visibleFl = false;
 		list->_posX = 0;
 		list->_posY = 0;
@@ -1331,7 +1331,7 @@ void ObjectsManager::setFlipSprite(int idx, bool flipFl) {
 		_sprite[idx]._flipFl = flipFl;
 }
 
-void ObjectsManager::GOHOME() {
+void ObjectsManager::goHome() {
 	if (_vm->_linesMan->_route == NULL)
 		return;
 
@@ -1650,7 +1650,7 @@ void ObjectsManager::GOHOME() {
 	_oldCharacterPosY = newPosY;
 }
 
-void ObjectsManager::GOHOME2() {
+void ObjectsManager::goHome2() {
 	if (_vm->_linesMan->_route == NULL)
 		return;
 
@@ -1874,10 +1874,10 @@ void ObjectsManager::handleCityMap() {
 		}
 
 		_vm->_linesMan->checkZone();
-		GOHOME2();
+		goHome2();
 
 		if (_vm->_linesMan->_route == NULL && _vm->_globals->_actionMoveTo)
-			PARADISE();
+			paradise();
 		_vm->_events->refreshScreenAndEvents();
 
 		if (_vm->_globals->_exitId)
@@ -2037,7 +2037,7 @@ void ObjectsManager::handleLeftButton() {
 	}
 }
 
-void ObjectsManager::PARADISE() {
+void ObjectsManager::paradise() {
 	char result = _vm->_globals->_saveData->_data[svLastMouseCursor];
 	if (result && _vm->_globals->_saveData->_data[svLastZoneNum] && result != 4 && result > 3) {
 		_vm->_fontMan->hideText(5);
@@ -2788,7 +2788,7 @@ void ObjectsManager::initVbob(const byte *src, int idx, int xp, int yp, int fram
 	if (idx > 29)
 		error("MAX_VBOB exceeded");
 
-	VBobItem *vbob = &VBob[idx];
+	VBobItem *vbob = &_vBob[idx];
 	if (vbob->_displayMode <= 1) {
 		vbob->_displayMode = 1;
 		vbob->_xp = xp;
@@ -2817,7 +2817,7 @@ void ObjectsManager::disableVbob(int idx) {
 	if (idx > 29)
 		error("MAX_VBOB exceeded");
 
-	VBobItem *vbob = &VBob[idx];
+	VBobItem *vbob = &_vBob[idx];
 	if (vbob->_displayMode <= 1)
 		vbob->_displayMode = 0;
 	else
@@ -3735,7 +3735,7 @@ void ObjectsManager::lockAnimX(int idx, int x) {
 /**
  * Game scene control method
  */
-void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile,
+void ObjectsManager::sceneControl(const Common::String &backgroundFile, const Common::String &linkFile,
 							   const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen) {
 	_vm->_dialog->_inventFl = false;
 	_vm->_events->_gameKey = KEY_NONE;
@@ -3786,7 +3786,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
 		_vm->_linesMan->_route = _vm->_linesMan->findRoute(getSpriteX(0), getSpriteY(0), 330, 345);
 		_vm->_globals->_checkDistanceFl = true;
 		do {
-			GOHOME();
+			goHome();
 			_vm->_events->refreshScreenAndEvents();
 		} while (_vm->_linesMan->_route);
 		setSpriteIndex(0, 64);
@@ -3801,7 +3801,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
 		_vm->_dialog->testDialogOpening();
 		_vm->_linesMan->checkZone();
 		if (_vm->_globals->_actionMoveTo)
-			PARADISE();
+			paradise();
 		if (!_vm->_globals->_exitId)
 			_vm->_events->refreshScreenAndEvents();
 
@@ -3823,7 +3823,7 @@ void ObjectsManager::PERSONAGE(const Common::String &backgroundFile, const Commo
 /**
  * Game scene control method
  */
-void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile,
+void ObjectsManager::sceneControl2(const Common::String &backgroundFile, const Common::String &linkFile,
 								const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen) {
 	_vm->_dialog->_inventFl = false;
 	_vm->_events->_gameKey = KEY_NONE;
@@ -3922,7 +3922,7 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
 
 					if ((xCheck == xp) && (yCheck == yp)) {
 						_vm->_linesMan->_route = NULL;
-						PARADISE();
+						paradise();
 						if (_vm->_globals->_exitId)
 							breakFlag = true;
 					}
@@ -3938,9 +3938,9 @@ void ObjectsManager::PERSONAGE2(const Common::String &backgroundFile, const Comm
 			_vm->_dialog->testDialogOpening();
 			_vm->_linesMan->checkZone();
 			if (_vm->_linesMan->_route == NULL
-					|| (GOHOME(), _vm->_linesMan->_route == NULL)) {
+					|| (goHome(), _vm->_linesMan->_route == NULL)) {
 				if (_vm->_globals->_actionMoveTo)
-					PARADISE();
+					paradise();
 			}
 			handleSpecialGames();
 			_vm->_events->refreshScreenAndEvents();
@@ -4018,7 +4018,7 @@ void ObjectsManager::loadHidingItems(const Common::String &file) {
 
 void ObjectsManager::initVBob() {
 	for (int idx = 0; idx < 30; ++idx) {
-		VBobItem *vbob = &VBob[idx];
+		VBobItem *vbob = &_vBob[idx];
 		vbob->_displayMode = 0;
 		vbob->_xp = 0;
 		vbob->_yp = 0;
@@ -4031,7 +4031,7 @@ void ObjectsManager::initVBob() {
 
 void ObjectsManager::clearVBob() {
 	for (int idx = 0; idx < 30; ++idx) {
-		VBobItem *vbob = &VBob[idx];
+		VBobItem *vbob = &_vBob[idx];
 		vbob->_displayMode = 0;
 		vbob->_xp = 0;
 		vbob->_yp = 0;
diff --git a/engines/hopkins/objects.h b/engines/hopkins/objects.h
index 0562af9ba7..a5e309344b 100644
--- a/engines/hopkins/objects.h
+++ b/engines/hopkins/objects.h
@@ -173,9 +173,9 @@ private:
 	int _curObjectFileNum;
 	byte *_objectDataBuf;
 
-	VBobItem VBob[30];
-	ListeItem Liste[6];
-	ListeItem Liste2[35];
+	VBobItem _vBob[30];
+	ListeItem _liste[6];
+	ListeItem _liste2[35];
 
 	void initVBob();
 	void clearVBob();
@@ -203,7 +203,7 @@ private:
 
 	void loadZone(const Common::String &file);
 	void changeCharacterHead(PlayerCharacter oldCharacter, PlayerCharacter newCharacter);
-	void GOHOME2();
+	void goHome2();
 
 	void nextVerbIcon();
 	void handleForest(int screenId, int minX, int maxX, int minY, int maxY, int idx);
@@ -325,12 +325,12 @@ public:
 	void disableVbob(int idx);
 	void setAndPlayAnim(int idx, int animIdx, int destPosi, bool animAction);
 
-	void PERSONAGE(const Common::String &backgroundFile, const Common::String &linkFile,
+	void sceneControl(const Common::String &backgroundFile, const Common::String &linkFile,
 		const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen);
-	void PERSONAGE2(const Common::String &backgroundFile, const Common::String &linkFile,
+	void sceneControl2(const Common::String &backgroundFile, const Common::String &linkFile,
 		const Common::String &animFile, const Common::String &s4, int soundNum, bool initializeScreen);
-	void GOHOME();
-	void PARADISE();
+	void goHome();
+	void paradise();
 };
 
 } // End of namespace Hopkins
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index ce60377c5c..6167ac4c23 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -766,7 +766,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_objectsMan->removeSprite(0);
@@ -991,7 +991,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_objectsMan->removeSprite(0);
@@ -1107,7 +1107,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_objectsMan->removeSprite(0);
@@ -1433,7 +1433,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_objectsMan->removeSprite(0);
@@ -1671,7 +1671,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_globals->_exitId = 59;
@@ -1699,7 +1699,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_globals->_exitId = 59;
@@ -1886,7 +1886,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_objectsMan->setSpriteIndex(0, 64);
@@ -1917,7 +1917,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_objectsMan->setSpriteIndex(0, 64);
@@ -2006,7 +2006,7 @@ int ScriptManager::handleOpcode(const byte *dataP) {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
 
-				_vm->_objectsMan->GOHOME();
+				_vm->_objectsMan->goHome();
 				_vm->_events->refreshScreenAndEvents();
 			} while (_vm->_linesMan->_route != (RouteItem *)NULL);
 			_vm->_objectsMan->removeSprite(0);
diff --git a/engines/hopkins/talk.cpp b/engines/hopkins/talk.cpp
index b3d4061a6a..736ec9865c 100644
--- a/engines/hopkins/talk.cpp
+++ b/engines/hopkins/talk.cpp
@@ -1029,7 +1029,7 @@ void TalkManager::animateObject(const Common::String &filename) {
 
 		_vm->_linesMan->checkZone();
 		if (_vm->_globals->_actionMoveTo)
-			_vm->_objectsMan->PARADISE();
+			_vm->_objectsMan->paradise();
 		_vm->_events->refreshScreenAndEvents();
 	} while (!_vm->_globals->_exitId);
 	dialogEndTalk();