LASTEXPRESS: Rename Alexei logic functions

4 files changed, 146 insertions, 146 deletions

diff --git a/engines/lastexpress/entities/alexei.cpp b/engines/lastexpress/entities/alexei.cpp
index 115c890f6f..b8ae62e7c4 100644
--- a/engines/lastexpress/entities/alexei.cpp
+++ b/engines/lastexpress/entities/alexei.cpp
@@ -48,40 +48,40 @@ Alexei::Alexei(LastExpressEngine *engine) : Entity(engine, kEntityAlexei) {
 	ADD_CALLBACK_FUNCTION(Alexei, updateEntity);
 	ADD_CALLBACK_FUNCTION(Alexei, draw2);
 	ADD_CALLBACK_FUNCTION(Alexei, callbackActionRestaurantOrSalon);
-	ADD_CALLBACK_FUNCTION(Alexei, function13);
-	ADD_CALLBACK_FUNCTION(Alexei, function14);
-	ADD_CALLBACK_FUNCTION(Alexei, function15);
-	ADD_CALLBACK_FUNCTION(Alexei, function16);
+	ADD_CALLBACK_FUNCTION(Alexei, enterComparment);
+	ADD_CALLBACK_FUNCTION(Alexei, exitCompartment);
+	ADD_CALLBACK_FUNCTION(Alexei, pacingAtWindow);
+	ADD_CALLBACK_FUNCTION(Alexei, compartmentLogic);
 	ADD_CALLBACK_FUNCTION(Alexei, chapter1);
-	ADD_CALLBACK_FUNCTION(Alexei, chapter1Handler);
-	ADD_CALLBACK_FUNCTION(Alexei, function19);
-	ADD_CALLBACK_FUNCTION(Alexei, function20);
-	ADD_CALLBACK_FUNCTION(Alexei, function21);
-	ADD_CALLBACK_FUNCTION(Alexei, function22);
-	ADD_CALLBACK_FUNCTION(Alexei, function23);
-	ADD_CALLBACK_FUNCTION(Alexei, function24);
-	ADD_CALLBACK_FUNCTION(Alexei, function25);
+	ADD_CALLBACK_FUNCTION(Alexei, atDinner);
+	ADD_CALLBACK_FUNCTION(Alexei, returnCompartment);
+	ADD_CALLBACK_FUNCTION(Alexei, goSalon);
+	ADD_CALLBACK_FUNCTION(Alexei, sitting);
+	ADD_CALLBACK_FUNCTION(Alexei, standingAtWindow);
+	ADD_CALLBACK_FUNCTION(Alexei, waitingForTatiana);
+	ADD_CALLBACK_FUNCTION(Alexei, upset);
+	ADD_CALLBACK_FUNCTION(Alexei, returnCompartmentNight);
 	ADD_CALLBACK_FUNCTION(Alexei, function26);
 	ADD_CALLBACK_FUNCTION(Alexei, function27);
 	ADD_CALLBACK_FUNCTION(Alexei, chapter2);
-	ADD_CALLBACK_FUNCTION(Alexei, chapter2Handler);
-	ADD_CALLBACK_FUNCTION(Alexei, function30);
-	ADD_CALLBACK_FUNCTION(Alexei, function31);
+	ADD_CALLBACK_FUNCTION(Alexei, inCompartment2);
+	ADD_CALLBACK_FUNCTION(Alexei, atBreakfast);
+	ADD_CALLBACK_FUNCTION(Alexei, returnCompartment2);
 	ADD_CALLBACK_FUNCTION(Alexei, chapter3);
-	ADD_CALLBACK_FUNCTION(Alexei, chapter3Handler);
-	ADD_CALLBACK_FUNCTION(Alexei, function34);
-	ADD_CALLBACK_FUNCTION(Alexei, function35);
-	ADD_CALLBACK_FUNCTION(Alexei, function36);
+	ADD_CALLBACK_FUNCTION(Alexei, playingChess);
+	ADD_CALLBACK_FUNCTION(Alexei, inPart3);
+	ADD_CALLBACK_FUNCTION(Alexei, pacing3);
+	ADD_CALLBACK_FUNCTION(Alexei, goSalon3);
 	ADD_CALLBACK_FUNCTION(Alexei, chapter4);
-	ADD_CALLBACK_FUNCTION(Alexei, chapter4Handler);
-	ADD_CALLBACK_FUNCTION(Alexei, function39);
-	ADD_CALLBACK_FUNCTION(Alexei, function40);
-	ADD_CALLBACK_FUNCTION(Alexei, function41);
-	ADD_CALLBACK_FUNCTION(Alexei, function42);
-	ADD_CALLBACK_FUNCTION(Alexei, function43);
-	ADD_CALLBACK_FUNCTION(Alexei, function44);
-	ADD_CALLBACK_FUNCTION(Alexei, function45);
-	ADD_CALLBACK_FUNCTION(Alexei, function46);
+	ADD_CALLBACK_FUNCTION(Alexei, inCompartment4);
+	ADD_CALLBACK_FUNCTION(Alexei, meetTatiana);
+	ADD_CALLBACK_FUNCTION(Alexei, leavePlatform);
+	ADD_CALLBACK_FUNCTION(Alexei, inCompartmentAgain);
+	ADD_CALLBACK_FUNCTION(Alexei, goSalon4);
+	ADD_CALLBACK_FUNCTION(Alexei, pacing);
+	ADD_CALLBACK_FUNCTION(Alexei, goToPlatform);
+	ADD_CALLBACK_FUNCTION(Alexei, returnCompartment4);
+	ADD_CALLBACK_FUNCTION(Alexei, bombPlanB);
 	ADD_CALLBACK_FUNCTION(Alexei, function47);
 	ADD_CALLBACK_FUNCTION(Alexei, chapter5);
 }
@@ -169,7 +169,7 @@ IMPLEMENT_FUNCTION(12, Alexei, callbackActionRestaurantOrSalon)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(13, Alexei, function13)
+IMPLEMENT_FUNCTION(13, Alexei, enterComparment)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -216,7 +216,7 @@ IMPLEMENT_FUNCTION(13, Alexei, function13)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(14, Alexei, function14)
+IMPLEMENT_FUNCTION(14, Alexei, exitCompartment)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -245,7 +245,7 @@ IMPLEMENT_FUNCTION(14, Alexei, function14)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(15, Alexei, function15)
+IMPLEMENT_FUNCTION(15, Alexei, pacingAtWindow)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -297,7 +297,7 @@ IMPLEMENT_FUNCTION(15, Alexei, function15)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION_IS(16, Alexei, function16, TimeValue)
+IMPLEMENT_FUNCTION_IS(16, Alexei, compartmentLogic, TimeValue)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -446,7 +446,7 @@ IMPLEMENT_FUNCTION(17, Alexei, chapter1)
 		break;
 
 	case kActionNone:
-		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Alexei, setup_chapter1Handler));
+		Entity::timeCheck(kTimeChapter1, params->param1, WRAP_SETUP_FUNCTION(Alexei, setup_atDinner));
 		break;
 
 	case kActionDefault:
@@ -462,7 +462,7 @@ IMPLEMENT_FUNCTION(17, Alexei, chapter1)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler)
+IMPLEMENT_FUNCTION(18, Alexei, atDinner)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -519,7 +519,7 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler)
 
 		case 1:
 			getEntities()->updatePositionExit(kEntityAlexei, kCarRestaurant, 63);
-			setup_function19();
+			setup_returnCompartment();
 			break;
 
 		case 2:
@@ -533,7 +533,7 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler)
 			getInventory()->get(kItem17)->location = kObjectLocation1;
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 63);
 
-			setup_function19();
+			setup_returnCompartment();
 			break;
 		}
 		break;
@@ -553,7 +553,7 @@ IMPLEMENT_FUNCTION(18, Alexei, chapter1Handler)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(19, Alexei, function19)
+IMPLEMENT_FUNCTION(19, Alexei, returnCompartment)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -620,7 +620,7 @@ IMPLEMENT_FUNCTION(19, Alexei, function19)
 
 		case 9:
 			setCallback(10);
-			setup_function13();
+			setup_enterComparment();
 			break;
 
 		case 10:
@@ -628,11 +628,11 @@ IMPLEMENT_FUNCTION(19, Alexei, function19)
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
 
 			setCallback(11);
-			setup_function16(kTime1098000, "411");
+			setup_compartmentLogic(kTime1098000, "411");
 			break;
 
 		case 11:
-			setup_function20();
+			setup_goSalon();
 			break;
 		}
 		break;
@@ -640,14 +640,14 @@ IMPLEMENT_FUNCTION(19, Alexei, function19)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(20, Alexei, function20)
+IMPLEMENT_FUNCTION(20, Alexei, goSalon)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function14();
+		setup_exitCompartment();
 		break;
 
 	case kActionCallback:
@@ -683,7 +683,7 @@ IMPLEMENT_FUNCTION(20, Alexei, function20)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(21, Alexei, function21)
+IMPLEMENT_FUNCTION(21, Alexei, sitting)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -720,7 +720,7 @@ IMPLEMENT_FUNCTION(21, Alexei, function21)
 
 		case 1:
 			getData()->location = kLocationInsideCompartment;
-			setup_function22();
+			setup_standingAtWindow();
 			break;
 
 		case 2:
@@ -745,7 +745,7 @@ IMPLEMENT_FUNCTION(21, Alexei, function21)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(22, Alexei, function22)
+IMPLEMENT_FUNCTION(22, Alexei, standingAtWindow)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -779,7 +779,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22)
 
 		getData()->inventoryItem = kItemNone;
 
-		setup_function23();
+		setup_waitingForTatiana();
 		break;
 
 	case kAction1:
@@ -801,7 +801,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22)
 
 		case 1:
 			getData()->location = kLocationInsideCompartment;
-			setup_function21();
+			setup_sitting();
 			break;
 
 		case 2:
@@ -821,7 +821,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22)
 			getEntities()->updatePositionExit(kEntityAlexei, kCarRestaurant, 52);
 			getData()->location = kLocationInsideCompartment;
 
-			setup_function21();
+			setup_standingAtWindow();
 			break;
 		}
 		break;
@@ -829,7 +829,7 @@ IMPLEMENT_FUNCTION(22, Alexei, function22)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(23, Alexei, function23)
+IMPLEMENT_FUNCTION(23, Alexei, waitingForTatiana)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -861,7 +861,7 @@ IMPLEMENT_FUNCTION(23, Alexei, function23)
 			getEntities()->drawSequenceLeft(kEntityAlexei, "103F");
 			getScenes()->processScene();
 
-			setup_function24();
+			setup_upset();
 			break;
 
 		case 2:
@@ -879,18 +879,18 @@ IMPLEMENT_FUNCTION(23, Alexei, function23)
 			setCallback(1);
 			setup_savegame(kSavegameTypeEvent, kEventAlexeiSalonVassili);
 		} else {
-			setup_function24();
+			setup_upset();
 		}
 		break;
 
 	case kAction188784532:
-		setup_function24();
+		setup_upset();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(24, Alexei, function24)
+IMPLEMENT_FUNCTION(24, Alexei, upset)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -917,11 +917,11 @@ IMPLEMENT_FUNCTION(24, Alexei, function24)
 			getData()->entityPosition = kPosition_9460;
 			getEntities()->clearSequences(kEntityAlexei);
 			getScenes()->loadSceneFromPosition(kCarRestaurant, 55);
-			setup_function25();
+			setup_returnCompartmentNight();
 			break;
 
 		case 2:
-			setup_function25();
+			setup_returnCompartmentNight();
 			break;
 		}
 		break;
@@ -935,14 +935,14 @@ IMPLEMENT_FUNCTION(24, Alexei, function24)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(25, Alexei, function25)
+IMPLEMENT_FUNCTION(25, Alexei, returnCompartmentNight)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function13();
+		setup_enterComparment();
 		break;
 
 	case kActionCallback:
@@ -955,12 +955,12 @@ IMPLEMENT_FUNCTION(25, Alexei, function25)
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
 
 			setCallback(2);
-			setup_function16(kTime1179000, "411");
+			setup_compartmentLogic(kTime1179000, "411");
 			break;
 
 		case 2:
 			setCallback(3);
-			setup_function16(kTime1323000, "412");
+			setup_compartmentLogic(kTime1323000, "412");
 			break;
 
 		case 3:
@@ -1017,7 +1017,7 @@ IMPLEMENT_FUNCTION(28, Alexei, chapter2)
 		break;
 
 	case kActionNone:
-		setup_chapter2Handler();
+		setup_inCompartment2();
 		break;
 
 	case kActionDefault:
@@ -1037,14 +1037,14 @@ IMPLEMENT_FUNCTION(28, Alexei, chapter2)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(29, Alexei, chapter2Handler)
+IMPLEMENT_FUNCTION(29, Alexei, inCompartment2)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function16(kTime1791000, "411");
+		setup_compartmentLogic(kTime1791000, "411");
 		break;
 
 	case kActionCallback:
@@ -1054,7 +1054,7 @@ IMPLEMENT_FUNCTION(29, Alexei, chapter2Handler)
 
 		case 1:
 			setCallback(2);
-			setup_function14();
+			setup_exitCompartment();
 			break;
 
 		case 2:
@@ -1085,7 +1085,7 @@ IMPLEMENT_FUNCTION(29, Alexei, chapter2Handler)
 		case 6:
 			getEntities()->updatePositionExit(kEntityAlexei, kCarRestaurant, 63);
 			getSavePoints()->push(kEntityAlexei, kEntityTatiana, kAction290869168);
-			setup_function30();
+			setup_atBreakfast();
 			break;
 		}
 		break;
@@ -1093,7 +1093,7 @@ IMPLEMENT_FUNCTION(29, Alexei, chapter2Handler)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(30, Alexei, function30)
+IMPLEMENT_FUNCTION(30, Alexei, atBreakfast)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1134,7 +1134,7 @@ IMPLEMENT_FUNCTION(30, Alexei, function30)
 
 		case 3:
 			getEntities()->updatePositionExit(kEntityAlexei, kCarRestaurant, 63);
-			setup_function31();
+			setup_returnCompartment2();
 			break;
 		}
 		break;
@@ -1154,7 +1154,7 @@ IMPLEMENT_FUNCTION(30, Alexei, function30)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(31, Alexei, function31)
+IMPLEMENT_FUNCTION(31, Alexei, returnCompartment2)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1175,7 +1175,7 @@ IMPLEMENT_FUNCTION(31, Alexei, function31)
 
 		case 1:
 			setCallback(2);
-			setup_function13();
+			setup_enterComparment();
 			break;
 
 		case 2:
@@ -1183,7 +1183,7 @@ IMPLEMENT_FUNCTION(31, Alexei, function31)
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
 
 			setCallback(3);
-			setup_function16(kTimeEnd, "411");
+			setup_compartmentLogic(kTimeEnd, "411");
 			break;
 		}
 		break;
@@ -1197,7 +1197,7 @@ IMPLEMENT_FUNCTION(32, Alexei, chapter3)
 		break;
 
 	case kActionNone:
-		setup_chapter3Handler();
+		setup_playingChess();
 		break;
 
 	case kActionDefault:
@@ -1216,14 +1216,14 @@ IMPLEMENT_FUNCTION(32, Alexei, chapter3)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(33, Alexei, chapter3Handler)
+IMPLEMENT_FUNCTION(33, Alexei, playingChess)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionCallback:
 		if (getCallback() == 1)
-			setup_function34();
+			setup_inPart3();
 		break;
 
 	case kAction122288808:
@@ -1232,7 +1232,7 @@ IMPLEMENT_FUNCTION(33, Alexei, chapter3Handler)
 		getData()->car = kCarRedSleeping;
 
 		setCallback(1);
-		setup_function13();
+		setup_enterComparment();
 		break;
 
 	case kAction122358304:
@@ -1242,7 +1242,7 @@ IMPLEMENT_FUNCTION(33, Alexei, chapter3Handler)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(34, Alexei, function34)
+IMPLEMENT_FUNCTION(34, Alexei, inPart3)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1252,7 +1252,7 @@ IMPLEMENT_FUNCTION(34, Alexei, function34)
 			getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
 
 		setCallback(1);
-		setup_function16(kTime2083500, "411");
+		setup_compartmentLogic(kTime2083500, "411");
 		break;
 
 	case kActionCallback:
@@ -1262,7 +1262,7 @@ IMPLEMENT_FUNCTION(34, Alexei, function34)
 
 		case 1:
 			setCallback(2);
-			setup_function14();
+			setup_exitCompartment();
 			break;
 
 		case 2:
@@ -1285,12 +1285,12 @@ IMPLEMENT_FUNCTION(34, Alexei, function34)
 
 		case 5:
 			setCallback(6);
-			setup_function35();
+			setup_pacing3();
 			break;
 
 		case 6:
 			setCallback(7);
-			setup_function13();
+			setup_enterComparment();
 			break;
 
 		case 7:
@@ -1299,17 +1299,17 @@ IMPLEMENT_FUNCTION(34, Alexei, function34)
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 66);
 
 			setCallback(8);
-			setup_function16(kTime2124000, "NONE");
+			setup_compartmentLogic(kTime2124000, "NONE");
 			break;
 
 		case 8:
 			setCallback(9);
-			setup_function14();
+			setup_exitCompartment();
 			break;
 
 		case 9:
 			setCallback(10);
-			setup_function36();
+			setup_goSalon3();
 			break;
 
 		case 10:
@@ -1318,7 +1318,7 @@ IMPLEMENT_FUNCTION(34, Alexei, function34)
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
 
 			setCallback(11);
-			setup_function16(kTime16451100, "411");
+			setup_compartmentLogic(kTime16451100, "411");
 			break;
 		}
 		break;
@@ -1326,7 +1326,7 @@ IMPLEMENT_FUNCTION(34, Alexei, function34)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(35, Alexei, function35)
+IMPLEMENT_FUNCTION(35, Alexei, pacing3)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1345,7 +1345,7 @@ IMPLEMENT_FUNCTION(35, Alexei, function35)
 		if (Entity::updateParameter(params->param3, getState()->time, params->param1)) {
 			if (getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 				setCallback(3);
-				setup_function15();
+				setup_pacingAtWindow();
 				break;
 			}
 		}
@@ -1392,7 +1392,7 @@ label_callback_3:
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(36, Alexei, function36)
+IMPLEMENT_FUNCTION(36, Alexei, goSalon3)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1457,7 +1457,7 @@ IMPLEMENT_FUNCTION(36, Alexei, function36)
 
 	case kAction122288808:
 		setCallback(4);
-		setup_function13();
+		setup_enterComparment();
 		break;
 
 	case kAction122358304:
@@ -1474,7 +1474,7 @@ IMPLEMENT_FUNCTION(37, Alexei, chapter4)
 		break;
 
 	case kActionNone:
-		setup_chapter4Handler();
+		setup_inCompartment4();
 		break;
 
 	case kActionDefault:
@@ -1493,25 +1493,25 @@ IMPLEMENT_FUNCTION(37, Alexei, chapter4)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(38, Alexei, chapter4Handler)
+IMPLEMENT_FUNCTION(38, Alexei, inCompartment4)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function16(kTime2354400, "411");
+		setup_compartmentLogic(kTime2354400, "411");
 		break;
 
 	case kActionCallback:
 		if (getCallback() == 1)
-			setup_function39();
+			setup_meetTatiana();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(39, Alexei, function39)
+IMPLEMENT_FUNCTION(39, Alexei, meetTatiana)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1547,7 +1547,7 @@ IMPLEMENT_FUNCTION(39, Alexei, function39)
 					getScenes()->loadSceneFromPosition(kCarGreenSleeping, 72);
 			}
 
-			setup_function40();
+			setup_leavePlatform();
 		}
 		break;
 
@@ -1571,7 +1571,7 @@ IMPLEMENT_FUNCTION(39, Alexei, function39)
 				break;
 			}
 
-			setup_function40();
+			setup_leavePlatform();
 		}
 		break;
 
@@ -1616,7 +1616,7 @@ IMPLEMENT_FUNCTION(39, Alexei, function39)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(40, Alexei, function40)
+IMPLEMENT_FUNCTION(40, Alexei, leavePlatform)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1653,7 +1653,7 @@ IMPLEMENT_FUNCTION(40, Alexei, function40)
 			getData()->location = kLocationInsideCompartment;
 			getEntities()->clearSequences(kEntityAlexei);
 
-			setup_function41();
+			setup_inCompartmentAgain();
 			break;
 		}
 		break;
@@ -1661,7 +1661,7 @@ IMPLEMENT_FUNCTION(40, Alexei, function40)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(41, Alexei, function41)
+IMPLEMENT_FUNCTION(41, Alexei, inCompartmentAgain)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1671,25 +1671,25 @@ IMPLEMENT_FUNCTION(41, Alexei, function41)
 			getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
 
 		setCallback(1);
-		setup_function16(kTime2403000, "411");
+		setup_compartmentLogic(kTime2403000, "411");
 		break;
 
 	case kActionCallback:
 		if (getCallback() == 1)
-			setup_function42();
+			setup_goSalon4();
 		break;
 	}
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(42, Alexei, function42)
+IMPLEMENT_FUNCTION(42, Alexei, goSalon4)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function14();
+		setup_exitCompartment();
 		break;
 
 	case kActionCallback:
@@ -1711,7 +1711,7 @@ IMPLEMENT_FUNCTION(42, Alexei, function42)
 
 		case 3:
 			getData()->location = kLocationInsideCompartment;
-			setup_function43();
+			setup_pacing();
 			break;
 		}
 		break;
@@ -1719,7 +1719,7 @@ IMPLEMENT_FUNCTION(42, Alexei, function42)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(43, Alexei, function43)
+IMPLEMENT_FUNCTION(43, Alexei, pacing)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1731,7 +1731,7 @@ IMPLEMENT_FUNCTION(43, Alexei, function43)
 
 			if (getEntities()->isSomebodyInsideRestaurantOrSalon()) {
 				setCallback(1);
-				setup_function15();
+				setup_pacingAtWindow();
 				break;
 			}
 		}
@@ -1768,7 +1768,7 @@ label_callback_1:
 			break;
 
 		case 3:
-			setup_function44();
+			setup_goToPlatform();
 			break;
 		}
 		break;
@@ -1776,7 +1776,7 @@ label_callback_1:
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(44, Alexei, function44)
+IMPLEMENT_FUNCTION(44, Alexei, goToPlatform)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1794,7 +1794,7 @@ IMPLEMENT_FUNCTION(44, Alexei, function44)
 				if (getEntities()->isPlayerPosition(kCarGreenSleeping, 62))
 					getScenes()->loadSceneFromPosition(kCarGreenSleeping, 72);
 
-				setup_function45();
+				setup_returnCompartment4();
 			}
 		}
 		break;
@@ -1843,14 +1843,14 @@ IMPLEMENT_FUNCTION(44, Alexei, function44)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(45, Alexei, function45)
+IMPLEMENT_FUNCTION(45, Alexei, returnCompartment4)
 	switch (savepoint.action) {
 	default:
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function13();
+		setup_enterComparment();
 		break;
 
 	case kActionCallback:
@@ -1859,10 +1859,10 @@ IMPLEMENT_FUNCTION(45, Alexei, function45)
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
 
 			if (getInventory()->hasItem(kItemBomb)) {
-				setup_function46();
+				setup_bombPlanB();
 			} else {
 				setCallback(2);
-				setup_function16(kTimeEnd, "412");
+				setup_compartmentLogic(kTimeEnd, "412");
 			}
 		}
 		break;
@@ -1870,7 +1870,7 @@ IMPLEMENT_FUNCTION(45, Alexei, function45)
 IMPLEMENT_FUNCTION_END
 
 //////////////////////////////////////////////////////////////////////////
-IMPLEMENT_FUNCTION(46, Alexei, function46)
+IMPLEMENT_FUNCTION(46, Alexei, bombPlanB)
 	switch (savepoint.action) {
 	default:
 		break;
@@ -1899,12 +1899,12 @@ IMPLEMENT_FUNCTION(46, Alexei, function46)
 		}
 
 		setCallback(4);
-		setup_function13();
+		setup_enterComparment();
 		break;
 
 	case kActionDefault:
 		setCallback(1);
-		setup_function16(kTime2488500, "411");
+		setup_compartmentLogic(kTime2488500, "411");
 		break;
 
 	case kActionCallback:
@@ -1914,7 +1914,7 @@ IMPLEMENT_FUNCTION(46, Alexei, function46)
 
 		case 1:
 			setCallback(2);
-			setup_function14();
+			setup_exitCompartment();
 			break;
 
 		case 2:
@@ -1927,7 +1927,7 @@ IMPLEMENT_FUNCTION(46, Alexei, function46)
 				getScenes()->loadSceneFromPosition(kCarGreenSleeping, 49);
 
 			setCallback(5);
-			setup_function16(kTime2507400, "412");
+			setup_compartmentLogic(kTime2507400, "412");
 			break;
 
 		case 5:
diff --git a/engines/lastexpress/entities/alexei.h b/engines/lastexpress/entities/alexei.h
index 9792385863..9a316ec574 100644
--- a/engines/lastexpress/entities/alexei.h
+++ b/engines/lastexpress/entities/alexei.h
@@ -123,9 +123,9 @@ public:
 	 */
 	DECLARE_FUNCTION(callbackActionRestaurantOrSalon)
 
-	DECLARE_FUNCTION(function13)
-	DECLARE_FUNCTION(function14)
-	DECLARE_FUNCTION(function15)
+	DECLARE_FUNCTION(enterComparment)
+	DECLARE_FUNCTION(exitCompartment)
+	DECLARE_FUNCTION(pacingAtWindow)
 
 	/**
 	 * ???
@@ -133,7 +133,7 @@ public:
 	 * @param timeValue          The time value
 	 * @param sequence           The sequence to draw
 	 */
-	DECLARE_FUNCTION_2(function16, TimeValue timeValue, const char *sequence)
+	DECLARE_FUNCTION_2(compartmentLogic, TimeValue timeValue, const char *sequence)
 
 	/**
 	 * Setup Chapter 1
@@ -143,14 +143,14 @@ public:
 	/**
 	 * Handle Chapter 1 events
 	 */
-	DECLARE_FUNCTION(chapter1Handler)
-	DECLARE_FUNCTION(function19)
-	DECLARE_FUNCTION(function20)
-	DECLARE_FUNCTION(function21)
-	DECLARE_FUNCTION(function22)
-	DECLARE_FUNCTION(function23)
-	DECLARE_FUNCTION(function24)
-	DECLARE_FUNCTION(function25)
+	DECLARE_FUNCTION(atDinner)
+	DECLARE_FUNCTION(returnCompartment)
+	DECLARE_FUNCTION(goSalon)
+	DECLARE_FUNCTION(sitting)
+	DECLARE_FUNCTION(standingAtWindow)
+	DECLARE_FUNCTION(waitingForTatiana)
+	DECLARE_FUNCTION(upset)
+	DECLARE_FUNCTION(returnCompartmentNight)
 	DECLARE_FUNCTION(function26)
 	DECLARE_FUNCTION(function27)
 
@@ -162,9 +162,9 @@ public:
 	/**
 	 * Handle Chapter 2 events
 	 */
-	DECLARE_FUNCTION(chapter2Handler)
-	DECLARE_FUNCTION(function30)
-	DECLARE_FUNCTION(function31)
+	DECLARE_FUNCTION(inCompartment2)
+	DECLARE_FUNCTION(atBreakfast)
+	DECLARE_FUNCTION(returnCompartment2)
 
 	/**
 	 * Setup Chapter 3
@@ -174,10 +174,10 @@ public:
 	/**
 	 * Handle Chapter 3 events
 	 */
-	DECLARE_FUNCTION(chapter3Handler)
-	DECLARE_FUNCTION(function34)
-	DECLARE_FUNCTION(function35)
-	DECLARE_FUNCTION(function36)
+	DECLARE_FUNCTION(playingChess)
+	DECLARE_FUNCTION(inPart3)
+	DECLARE_FUNCTION(pacing3)
+	DECLARE_FUNCTION(goSalon3)
 
 	/**
 	 * Setup Chapter 4
@@ -187,15 +187,15 @@ public:
 	/**
 	 * Handle Chapter 4 events
 	 */
-	DECLARE_FUNCTION(chapter4Handler)
-	DECLARE_FUNCTION(function39)
-	DECLARE_FUNCTION(function40)
-	DECLARE_FUNCTION(function41)
-	DECLARE_FUNCTION(function42)
-	DECLARE_FUNCTION(function43)
-	DECLARE_FUNCTION(function44)
-	DECLARE_FUNCTION(function45)
-	DECLARE_FUNCTION(function46)
+	DECLARE_FUNCTION(inCompartment4)
+	DECLARE_FUNCTION(meetTatiana)
+	DECLARE_FUNCTION(leavePlatform)
+	DECLARE_FUNCTION(inCompartmentAgain)
+	DECLARE_FUNCTION(goSalon4)
+	DECLARE_FUNCTION(pacing)
+	DECLARE_FUNCTION(goToPlatform)
+	DECLARE_FUNCTION(returnCompartment4)
+	DECLARE_FUNCTION(bombPlanB)
 	DECLARE_FUNCTION(function47)
 
 	/**
diff --git a/engines/lastexpress/entities/august.cpp b/engines/lastexpress/entities/august.cpp
index b0bc0732d4..da0e64f4f8 100644
--- a/engines/lastexpress/entities/august.cpp
+++ b/engines/lastexpress/entities/august.cpp
@@ -3249,7 +3249,7 @@ IMPLEMENT_FUNCTION(63, August, function63)
 
 	case kAction1:
 		if (getEntities()->isInSalon(kEntityAlexei)) {
-			RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_function44);
+			RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_goToPlatform);
 		}
 
 		getData()->inventoryItem = kItemNone;
diff --git a/engines/lastexpress/entities/tatiana.cpp b/engines/lastexpress/entities/tatiana.cpp
index 432def6253..199da1409c 100644
--- a/engines/lastexpress/entities/tatiana.cpp
+++ b/engines/lastexpress/entities/tatiana.cpp
@@ -835,7 +835,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27)
 			break;
 
 		case 1:
-			RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_function30);
+			RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_atBreakfast);
 			getAction()->playAnimation(kEventTatianaBreakfastAlexei);
 			getInventory()->addItem(kItemParchemin);
 			getInventory()->setLocationAndProcess(kItem11, kObjectLocation1);
@@ -843,7 +843,7 @@ IMPLEMENT_FUNCTION(27, Tatiana, function27)
 			break;
 
 		case 2:
-			RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_function30);
+			RESET_ENTITY_STATE(kEntityAlexei, Alexei, setup_atBreakfast);
 			getAction()->playAnimation(kEventTatianaBreakfast);
 			if (getInventory()->hasItem(kItemParchemin)) {
 				getAction()->playAnimation(kEventTatianaBreakfastGivePoem);