diff --git a/engines/chewy/chewy.cpp b/engines/chewy/chewy.cpp
index a3185317337..464cf188e77 100644
--- a/engines/chewy/chewy.cpp
+++ b/engines/chewy/chewy.cpp
@@ -126,7 +126,7 @@ Common::Error ChewyEngine::loadGameStream(Common::SeekableReadStream *stream) {
 		_G(obj)->sort();
 
 		for (int i = 0; i < MAX_PERSON; i++) {
-			set_person_pos(_G(spieler).X[i], _G(spieler).Y[i], i, _G(spieler).Phase[i]);
+			setPersonPos(_G(spieler).X[i], _G(spieler).Y[i], i, _G(spieler).Phase[i]);
 		}
 
 		_G(auto_obj) = 0;
diff --git a/engines/chewy/detail.cpp b/engines/chewy/detail.cpp
index 1efd26cb3ab..d63b9681e44 100644
--- a/engines/chewy/detail.cpp
+++ b/engines/chewy/detail.cpp
@@ -502,7 +502,7 @@ void Detail::plot_static_details(int16 scrx, int16 scry, int16 start, int16 end)
 	}
 }
 
-void Detail::start_detail(int16 nr, int16 rep, int16 reverse) {
+void Detail::startDetail(int16 nr, int16 rep, int16 reverse) {
 	if (nr != -1) {
 		AniDetailInfo *adiptr;
 		adiptr = &_rdi.Ainfo[nr];
diff --git a/engines/chewy/detail.h b/engines/chewy/detail.h
index 1b2a66c5899..f2707b8e657 100644
--- a/engines/chewy/detail.h
+++ b/engines/chewy/detail.h
@@ -215,7 +215,7 @@ public:
 
 	void del_static_ani(int16 ani_nr);
 	void set_ani_delay(int16 nr, int16 del);
-	void start_detail(int16 nr, int16 rep, int16 reverse);
+	void startDetail(int16 nr, int16 rep, int16 reverse);
 	void stop_detail(int16 nr);
 	void plot_ani_details(int16 scrx, int16 scry, int16 start, int16 end,
 	                      int16 zoomx, int16 zoomy);
diff --git a/engines/chewy/dialogs/inventory.cpp b/engines/chewy/dialogs/inventory.cpp
index c347fd849df..d79636d10e6 100644
--- a/engines/chewy/dialogs/inventory.cpp
+++ b/engines/chewy/dialogs/inventory.cpp
@@ -288,7 +288,7 @@ void Inventory::menu() {
 				if (!menuFirstFl) {
 					_G(cur)->show_cur();
 					while (_G(in)->get_switch_code() == Common::KEYCODE_ESCAPE) {
-						set_up_screen(NO_SETUP);
+						setupScreen(NO_SETUP);
 						inv_rand_x = -1;
 						inv_rand_y = -1;
 						plot_menu();
@@ -342,7 +342,7 @@ void Inventory::menu() {
 		}
 
 		if (_G(show_invent_menu) != 2) {
-			set_up_screen(NO_SETUP);
+			setupScreen(NO_SETUP);
 			_G(cur)->move(_G(minfo).x, _G(minfo).y);
 			_G(cur)->show_cur();
 			if (menu_flag1 != MENU_AUSBLENDEN) {
@@ -369,7 +369,7 @@ void Inventory::menu() {
 	_G(minfo).x = _G(maus_old_x);
 	_G(minfo).y = _G(maus_old_y);
 	while (_G(in)->get_switch_code() == Common::KEYCODE_ESCAPE && !SHOULD_QUIT) {
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		_G(cur)->plot_cur();
 		_G(out)->back2screen(_G(workpage));
 	}
@@ -494,7 +494,7 @@ int16 Inventory::look(int16 invent_nr, int16 mode, int16 ats_nr) {
 		}
 
 		_G(kbinfo).scan_code = Common::KEYCODE_INVALID;
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		plot_menu();
 		_G(fontMgr)->setFont(_G(font8));
 
@@ -536,7 +536,7 @@ int16 Inventory::look(int16 invent_nr, int16 mode, int16 ats_nr) {
 	}
 
 	while (_G(in)->get_switch_code() == Common::KEYCODE_ESCAPE) {
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		plot_menu();
 		_G(cur)->plot_cur();
 		_G(out)->back2screen(_G(workpage));
@@ -586,7 +586,7 @@ void Inventory::look_screen(int16 txt_mode, int16 txt_nr) {
 					atsAction(txt_nr, m_mode, ATS_ACTION_VOR);
 				}
 				if (ok) {
-					start_ats_wait(txt_nr, m_mode, 14, ATS_DATA);
+					startAtsWait(txt_nr, m_mode, 14, ATS_DATA);
 				}
 
 				if (_G(atds)->get_steuer_bit(txt_nr, ATS_ACTION_BIT, ATS_DATA))
@@ -668,7 +668,7 @@ void Inventory::showDiary() {
 	_G(room)->load_tgp(_G(spieler).PersonRoomNr[P_CHEWY], &_G(room_blk), EPISODE1_TGP, GED_LOAD, EPISODE1);
 	_G(spieler).scrollx = scrollx;
 	_G(spieler).scrolly = scrolly;
-	set_up_screen(NO_SETUP);
+	setupScreen(NO_SETUP);
 	plot_menu();
 	_G(out)->setPointer(nullptr);
 	_G(room)->set_ak_pal(&_G(room_blk));
diff --git a/engines/chewy/dialogs/main_menu.cpp b/engines/chewy/dialogs/main_menu.cpp
index 433fb234bc9..bc5227a2c3a 100644
--- a/engines/chewy/dialogs/main_menu.cpp
+++ b/engines/chewy/dialogs/main_menu.cpp
@@ -159,7 +159,7 @@ void MainMenu::animate() {
 		_G(out)->setPointer(_G(workptr));
 	}
 
-	sprite_engine();
+	spriteEngine();
 	kb_mov(1);
 	calcMouseText(_G(minfo).x, _G(minfo).y, 1);
 	_G(cur)->plot_cur();
@@ -218,7 +218,7 @@ void MainMenu::startGame() {
 
 	_G(spieler_vector)[P_CHEWY].Phase = 6;
 	_G(spieler_vector)[P_CHEWY].PhAnz = _G(chewy_ph_anz)[6];
-	set_person_pos(160, 80, P_CHEWY, P_RIGHT);
+	setPersonPos(160, 80, P_CHEWY, P_RIGHT);
 	_G(fx_blend) = BLEND3;
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	_G(menu_item) = CUR_WALK;
diff --git a/engines/chewy/globals.h b/engines/chewy/globals.h
index ac71af8647a..07a19187eff 100644
--- a/engines/chewy/globals.h
+++ b/engines/chewy/globals.h
@@ -297,7 +297,6 @@ public:
 	int16 _z_count = 0;
 	ZObjSort _z_obj_sort[MAX_ZOBJ];
 	char _new_vector = false;
-	int16 _tmp_maus_links = 0;
 
 	// timer.cpp
 	bool _timer_int = false;
@@ -320,7 +319,7 @@ void free_buffers();
 
 bool mainLoop(int16 mode);
 
-void set_up_screen(SetupScreenMode mode);
+void setupScreen(SetupScreenMode mode);
 
 void kb_mov(int16 mode);
 
@@ -467,20 +466,20 @@ bool calc_inv_no_use(int16 test_nr, int16 mode);
 int16 calc_person_txt(int16 p_nr);
 int16 calc_person_click(int16 p_nr);
 void calc_person_dia(int16 p_nr);
-void sprite_engine();
+void spriteEngine();
 
 void calc_z_ebene();
 
-void start_ani_block(int16 anz, const AniBlock *ab);
+void startAniBlock(int16 nr, const AniBlock *ab);
 
-void start_detail_wait(int16 ani_nr, int16 rep, int16 mode);
+void startSetailWait(int16 aniNr, int16 rep, int16 mode);
 
-void start_detail_frame(int16 ani_nr, int16 rep, int16 mode,
+void startDetailFrame(int16 aniNr, int16 rep, int16 mode,
                         int16 frame);
 
-void wait_detail(int16 det_nr);
+void waitDetail(int16 detNr);
 
-void wait_show_screen(int16 frames);
+void waitShowScreen(int16 frames);
 
 void zoom_mov_anpass(ObjMov *om, MovInfo *mi);
 
@@ -489,13 +488,13 @@ void calc_zoom(int16 y, int16 zoomFactorX, int16 zoomFactorY,
 
 void load_chewy_taf(int16 taf_nr);
 
-bool start_ats_wait(int16 txt_nr, int16 txt_mode, int16 col, int16 mode);
-void start_aad_wait(int16 dia_nr, int16 str_nr);
+bool startAtsWait(int16 txtNr, int16 txtMode, int16 col, int16 mode);
+void startAadWait(int16 diaNr, int16 strNr);
 
-void start_aad(int16 dia_nr);
-void aad_wait(int16 str_nr);
-void start_ads_wait(int16 dia_nr);
-void start_aad(int16 dia_nr, int16 ssi_nr);
+void start_aad(int16 diaNr);
+void aadWait(int16 strNr);
+void start_ads_wait(int16 diaNr);
+void start_aad(int16 diaNr, int16 ssiNr);
 void wait_auto_obj(int16 nr);
 
 void stop_auto_obj(int16 nr);
@@ -522,11 +521,11 @@ void stop_spz();
 
 void calc_person_spz_ani(ObjMov *om);
 
-void set_person_pos(int16 x, int16 y, int16 p_nr, int16 richtung);
+void setPersonPos(int16 x, int16 y, int16 personNr, int16 direction);
 
-void set_person_spr(int16 nr, int16 p_nr);
+void setPersonSpr(int16 nr, int16 personNr);
 
-void stop_person(int16 p_nr);
+void stopPerson(int16 personNr);
 
 void mov_objekt(ObjMov *om, MovInfo *mi);
 
diff --git a/engines/chewy/main.cpp b/engines/chewy/main.cpp
index d57bada9e89..0f4da3f0de6 100644
--- a/engines/chewy/main.cpp
+++ b/engines/chewy/main.cpp
@@ -463,7 +463,7 @@ bool mainLoop(int16 mode) {
 
 	_G(kbinfo).scan_code = Common::KEYCODE_INVALID;
 	if (mode == DO_SETUP)
-		set_up_screen(DO_MAIN_LOOP);
+		setupScreen(DO_MAIN_LOOP);
 
 	return retValue;
 }
@@ -489,7 +489,7 @@ static void showWalkAreas() {
 	}
 }
 
-void set_up_screen(SetupScreenMode mode) {
+void setupScreen(SetupScreenMode mode) {
 	int16 i;
 	int16 txt_nr;
 
@@ -518,7 +518,7 @@ void set_up_screen(SetupScreenMode mode) {
 		_G(out)->setPointer(_G(workptr));
 	}
 
-	sprite_engine();
+	spriteEngine();
 	if (_G(menu_display) == MENU_EINBLENDEN || _G(flags).InventMenu) {
 		if (!_G(flags).InventMenu)
 			plot_main_menu();
@@ -784,7 +784,7 @@ void kb_mov(int16 mode) {
 		if (mode)
 			ende = true;
 		else
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN;
 	}
 }
@@ -1229,7 +1229,7 @@ bool autoMove(int16 movNr, int16 playerNum) {
 							movingFl = false;
 						}
 					}
-					set_up_screen(DO_SETUP);
+					setupScreen(DO_SETUP);
 				}
 			}
 			if (_G(flags).ChAutoMov) {
@@ -1251,14 +1251,14 @@ bool autoMove(int16 movNr, int16 playerNum) {
 						if (movingFl) {
 							if (_G(flags).ExitMov == false && _G(flags).ChAutoMov) {
 
-								set_person_pos(_G(spieler_mi)[playerNum].XyzEnd[0],
+								setPersonPos(_G(spieler_mi)[playerNum].XyzEnd[0],
 								               _G(spieler_mi)[playerNum].XyzEnd[1],
 								               playerNum, _G(Rdi)->AutoMov[movNr].SprNr);
 							}
 						}
 						endLoopFl = true;
 					}
-					set_up_screen(DO_SETUP);
+					setupScreen(DO_SETUP);
 					SHOULD_QUIT_RETURN0;
 				}
 			}
@@ -1297,12 +1297,12 @@ void goAutoXy(int16 x, int16 y, int16 personNum, int16 mode) {
 				}
 				if (!_G(spieler_vector)[personNum].Count) {
 					if (move_status) {
-						set_person_pos(_G(spieler_mi)[personNum].XyzEnd[0],
+						setPersonPos(_G(spieler_mi)[personNum].XyzEnd[0],
 						               _G(spieler_mi)[personNum].XyzEnd[1], personNum, -1);
 					}
 					endLoopFl = true;
 				}
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 				SHOULD_QUIT_RETURN;
 			}
 		}
@@ -1381,9 +1381,9 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
 					if (!_G(atds)->get_steuer_bit(txtNr, ATS_AKTIV_BIT, ATS_DATA)) {
 						if (_G(menu_item) != CUR_WALK && _G(menu_item) != CUR_USE) {
 							if (x + _G(spieler).scrollx > _G(spieler_vector)[P_CHEWY].Xypos[0])
-								set_person_spr(P_RIGHT, P_CHEWY);
+								setPersonSpr(P_RIGHT, P_CHEWY);
 							else
-								set_person_spr(P_LEFT, P_CHEWY);
+								setPersonSpr(P_LEFT, P_CHEWY);
 						}
 					}
 
@@ -1392,7 +1392,7 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
 					}
 					
 					if (ok && !_G(atds)->get_steuer_bit(txtNr, ATS_AKTIV_BIT, ATS_DATA)) {
-						if (start_ats_wait(txtNr, txtMode, 14, ATS_DATA))
+						if (startAtsWait(txtNr, txtMode, 14, ATS_DATA))
 							dispFl = false;
 					} else {
 						ret = -1;
@@ -1417,12 +1417,12 @@ int16 calcMouseText(int16 x, int16 y, int16 mode) {
 						if (!_G(atds)->get_steuer_bit(txtNr, ATS_AKTIV_BIT, ATS_DATA)) {
 							if (_G(menu_item) != CUR_WALK) {
 								if (x + _G(spieler).scrollx > _G(spieler_vector)[P_CHEWY].Xypos[0])
-									set_person_spr(P_RIGHT, P_CHEWY);
+									setPersonSpr(P_RIGHT, P_CHEWY);
 								else
-									set_person_spr(P_LEFT, P_CHEWY);
+									setPersonSpr(P_LEFT, P_CHEWY);
 							}
 							int16 r_val = g_engine->_rnd.getRandomNumber(MAX_RAND_NO_USE - 1);
-							actionFl = start_ats_wait(RAND_NO_USE[r_val], TXT_MARK_USE, 14, INV_USE_DEF);
+							actionFl = startAtsWait(RAND_NO_USE[r_val], TXT_MARK_USE, 14, INV_USE_DEF);
 							if (actionFl)
 								ret = txtNr;
 						}
@@ -1577,20 +1577,20 @@ void calc_mouse_person(int16 x, int16 y) {
 							if (txt_nr != 30000) {
 								if (_G(menu_item) != CUR_WALK) {
 									if (x + _G(spieler).scrollx > _G(spieler_vector)[P_CHEWY].Xypos[0])
-										set_person_spr(P_RIGHT, P_CHEWY);
+										setPersonSpr(P_RIGHT, P_CHEWY);
 									else
-										set_person_spr(P_LEFT, P_CHEWY);
+										setPersonSpr(P_LEFT, P_CHEWY);
 								}
-								if (!start_ats_wait(txt_nr, mode, 14, ATS_DATA))
-									start_ats_wait(def_nr, TXT_MARK_USE, 14, INV_USE_DEF);
+								if (!startAtsWait(txt_nr, mode, 14, ATS_DATA))
+									startAtsWait(def_nr, TXT_MARK_USE, 14, INV_USE_DEF);
 							}
 						}
 					} else {
 						if (_G(menu_item) != CUR_WALK) {
 							if (x + _G(spieler).scrollx > _G(spieler_vector)[P_CHEWY].Xypos[0])
-								set_person_spr(P_RIGHT, P_CHEWY);
+								setPersonSpr(P_RIGHT, P_CHEWY);
 							else
-								set_person_spr(P_LEFT, P_CHEWY);
+								setPersonSpr(P_LEFT, P_CHEWY);
 						}
 						calc_inv_no_use(p_nr, SPIELER_OBJ);
 					}
@@ -1674,7 +1674,7 @@ void clear_prog_ani() {
 void set_ani_screen() {
 	if (_G(flags).AniUserAction)
 		get_user_key(NO_SETUP);
-	set_up_screen(DO_SETUP);
+	setupScreen(DO_SETUP);
 }
 
 void del_inventar(int16 nr) {
@@ -1745,12 +1745,12 @@ void calc_ausgang(int16 x, int16 y) {
 				_G(flags).ShowAtsInvTxt = false;
 				_G(menu_item) = CUR_DISK;
 				cursorChoice(CUR_DISK);
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 				_G(cur_hide_flag) = true;
 				exit_room(nr);
 				_G(spieler).PersonRoomNr[P_CHEWY] = _G(spieler).room_e_obj[nr].Exit;
 				_G(room)->load_room(&_G(room_blk), _G(spieler).PersonRoomNr[P_CHEWY], &_G(spieler));
-				set_person_pos(_G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov].X -
+				setPersonPos(_G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov].X -
 				               _G(spieler_mi)[_G(auto_p_nr)].HotMovX,
 				               _G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov].Y - _G(spieler_mi)[_G(auto_p_nr)].HotMovY
 				               , P_CHEWY, -1);
@@ -1765,7 +1765,7 @@ void calc_ausgang(int16 x, int16 y) {
 				                               _G(room)->_gedXAnz[_G(room_blk).AkAblage],
 				                               _G(ged_mem)[_G(room_blk).AkAblage]);
 				check_shad(u_idx, 0);
-				set_person_spr(_G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov].SprNr, P_CHEWY);
+				setPersonSpr(_G(Rdi)->AutoMov[_G(spieler).room_e_obj[nr].ExitMov].SprNr, P_CHEWY);
 				_G(spieler_vector)[P_CHEWY].DelayCount = 0;
 				_G(fx_blend) = BLEND1;
 				_G(auto_obj) = 0;
@@ -1778,7 +1778,7 @@ void calc_ausgang(int16 x, int16 y) {
 				enter_room(nr);
 			}
 			_G(flags).ExitMov = false;
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		}
 	}
 }
@@ -1862,7 +1862,7 @@ void auto_scroll(int16 scrx, int16 scry) {
 			_G(spieler).scrolly += _G(spieler).ScrollyStep;
 		if (scrx == _G(spieler).scrollx && scry == _G(spieler).scrolly)
 			endLoopFl = true;
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN;
 	}
 	_G(maus_links_click) = tmpMouseClick;
diff --git a/engines/chewy/menus.cpp b/engines/chewy/menus.cpp
index 245d9c449f6..5a56d5f6436 100644
--- a/engines/chewy/menus.cpp
+++ b/engines/chewy/menus.cpp
@@ -304,7 +304,7 @@ void ads_menu() {
 }
 
 void stop_ads_dialog() {
-	aad_wait(-1);
+	aadWait(-1);
 	_G(spieler).DispFlag = _G(ads_tmp_dsp);
 	_G(cur_display) = true;
 	_G(flags).ShowAtsInvTxt = true;
diff --git a/engines/chewy/object.cpp b/engines/chewy/object.cpp
index f9b9c0852e9..013f5d7cc8c 100644
--- a/engines/chewy/object.cpp
+++ b/engines/chewy/object.cpp
@@ -346,9 +346,9 @@ void Object::calc_static_detail(int16 det_nr) {
 							n = nr - 40;
 							AniDetailInfo *adi = _G(det)->getAniDetail(n);
 							if (adi->repeat)
-								_G(det)->start_detail(n, 0, ANI_FRONT);
+								_G(det)->startDetail(n, 0, ANI_FRONT);
 							else
-								_G(det)->start_detail(n, 1, ANI_FRONT);
+								_G(det)->startDetail(n, 1, ANI_FRONT);
 						} else
 							_G(det)->showStaticSpr(nr);
 						++i;
@@ -358,9 +358,9 @@ void Object::calc_static_detail(int16 det_nr) {
 				n = nr - 40;
 				AniDetailInfo *adi = _G(det)->getAniDetail(n);
 				if (adi->repeat)
-					_G(det)->start_detail(n, 0, ANI_FRONT);
+					_G(det)->startDetail(n, 0, ANI_FRONT);
 				else
-					_G(det)->start_detail(n, 1, ANI_FRONT);
+					_G(det)->startDetail(n, 1, ANI_FRONT);
 			} else {
 				_G(det)->showStaticSpr(nr);
 			}
diff --git a/engines/chewy/r_event.cpp b/engines/chewy/r_event.cpp
index 1617f5d6a0d..fe00f364784 100644
--- a/engines/chewy/r_event.cpp
+++ b/engines/chewy/r_event.cpp
@@ -56,7 +56,7 @@ void play_scene_ani(int16 nr, int16 mode) {
 
 	case ROOM_8_17:
 		start_aad(100, 0);
-		_G(det)->start_detail(21, 4, ANI_FRONT);
+		_G(det)->startDetail(21, 4, ANI_FRONT);
 		break;
 
 	case ROOM_18_20:
@@ -67,7 +67,7 @@ void play_scene_ani(int16 nr, int16 mode) {
 		break;
 	}
 
-	start_detail_wait(nr, 1, mode);
+	startSetailWait(nr, 1, mode);
 
 	switch (r_nr) {
 	case ROOM_1_1:
@@ -125,7 +125,7 @@ void timer_action(int16 t_nr) {
 #undef TIMER
 
 	if (default_flag && _G(flags).AutoAniPlay == false) {
-		_G(det)->start_detail(_G(room)->_roomTimer.ObjNr[ani_nr], 1, ANI_FRONT);
+		_G(det)->startDetail(_G(room)->_roomTimer.ObjNr[ani_nr], 1, ANI_FRONT);
 		_G(uhr)->resetTimer(t_nr, 0);
 	}
 
@@ -501,7 +501,7 @@ void exit_room(int16 eib_nr) {
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		switch (_G(spieler).R23GleiterExit) {
 		case 16:
-			set_person_pos(126, 110, P_CHEWY, P_RIGHT);
+			setPersonPos(126, 110, P_CHEWY, P_RIGHT);
 			break;
 
 		case 25:
@@ -633,9 +633,9 @@ void exit_room(int16 eib_nr) {
 	case 50:
 	case 65:
 	case 126:
-		set_person_pos(_G(spieler_vector)[P_CHEWY].Xypos[0],
+		setPersonPos(_G(spieler_vector)[P_CHEWY].Xypos[0],
 		               _G(spieler_vector)[P_CHEWY].Xypos[1], P_CHEWY, P_RIGHT);
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		break;
 
 	case 8:
@@ -649,9 +649,9 @@ void exit_room(int16 eib_nr) {
 	case 36:
 	case 71:
 	case 96:
-		set_person_pos(_G(spieler_vector)[P_CHEWY].Xypos[0],
+		setPersonPos(_G(spieler_vector)[P_CHEWY].Xypos[0],
 		               _G(spieler_vector)[P_CHEWY].Xypos[1], P_CHEWY, P_LEFT);
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		break;
 
 	case 62:
@@ -1193,7 +1193,7 @@ uint16 exit_flip_flop(int16 ani_nr, int16 eib_nr1, int16 eib_nr2,
                         int16 ats_nr1, int16 ats_nr2, int16 sib_nr,
                         int16 spr_nr1, int16 spr_nr2, int16 flag) {
 	if (ani_nr != -1)
-		_G(det)->start_detail(ani_nr, 1, flag);
+		_G(det)->startDetail(ani_nr, 1, flag);
 	flag ^= 1;
 	if (ats_nr1 != -1)
 		_G(atds)->set_ats_str(ats_nr1, flag, ATS_DATA);
@@ -1341,7 +1341,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
 
 		if (_G(spieler).R13Bandlauf) {
 			for (int i = 0; i < 5; ++i)
-				_G(det)->start_detail(i, 255, ANI_FRONT);
+				_G(det)->startDetail(i, 255, ANI_FRONT);
 		} else {
 			for (int i = 0; i < 5; ++i)
 				_G(det)->stop_detail(i);
@@ -1379,21 +1379,21 @@ int16 sib_event_no_inv(int16 sib_nr) {
 		break;
 
 	case SIB_SCHALTER1_R21:
-		_G(det)->start_detail(0, 1, _G(spieler).R21Hebel1);
+		_G(det)->startDetail(0, 1, _G(spieler).R21Hebel1);
 		_G(spieler).R21Hebel1 ^= 1;
 		Room21::calc_laser();
 		_G(atds)->set_ats_str(126, TXT_MARK_LOOK, _G(spieler).R21Hebel1, ATS_DATA);
 		break;
 
 	case SIB_SCHALTER2_R21:
-		_G(det)->start_detail(1, 1, _G(spieler).R21Hebel2);
+		_G(det)->startDetail(1, 1, _G(spieler).R21Hebel2);
 		_G(spieler).R21Hebel2 ^= 1;
 		Room21::calc_laser();
 		_G(atds)->set_ats_str(127, TXT_MARK_LOOK, _G(spieler).R21Hebel2, ATS_DATA);
 		break;
 
 	case SIB_SCHALTER3_R21:
-		_G(det)->start_detail(2, 1, _G(spieler).R21Hebel3);
+		_G(det)->startDetail(2, 1, _G(spieler).R21Hebel3);
 		_G(spieler).R21Hebel3 ^= 1;
 		Room21::calc_laser();
 		_G(atds)->set_ats_str(128, TXT_MARK_LOOK, _G(spieler).R21Hebel3, ATS_DATA);
@@ -1482,7 +1482,7 @@ int16 sib_event_no_inv(int16 sib_nr) {
 		_G(room)->set_timer_status(6, TIMER_STOP);
 		_G(spieler).R40Geld = true;
 		start_spz(CH_PUMP_TALK, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(201, -1);
+		startAadWait(201, -1);
 		break;
 
 	case SIB_VISIT_R53:
@@ -1515,9 +1515,9 @@ int16 sib_event_no_inv(int16 sib_nr) {
 		_G(det)->showStaticSpr(7);
 		_G(cur_hide_flag) = false;
 		hideCur();
-		start_aad_wait(406, -1);
+		startAadWait(406, -1);
 		if (_G(spieler).PersonRoomNr[P_HOWARD] == 66)
-			start_aad_wait(613, -1);
+			startAadWait(613, -1);
 		showCur();
 		break;
 
@@ -1542,7 +1542,7 @@ void sib_event_inv(int16 sib_nr) {
 			cur_2_inventory();
 			del_inventar(RED_CARD_INV);
 			start_aad(103, -1);
-			_G(det)->start_detail(6, 255, ANI_FRONT);
+			_G(det)->startDetail(6, 255, ANI_FRONT);
 			_G(atds)->set_ats_str(27, 1, ATS_DATA);
 			_G(atds)->set_ats_str(30, 1, ATS_DATA);
 		}
@@ -1637,7 +1637,7 @@ void sib_event_inv(int16 sib_nr) {
 		del_inventar(_G(spieler).AkInvent);
 		_G(atds)->set_ats_str(118, TXT_MARK_LOOK, 1, ATS_DATA);
 		start_spz(CH_TALK6, 255, false, P_CHEWY);
-		start_aad_wait(115, 0);
+		startAadWait(115, 0);
 
 		if (_G(spieler).R12TransOn)
 			Room12::use_linke_rohr();
@@ -1660,9 +1660,9 @@ void sib_event_inv(int16 sib_nr) {
 		if (_G(spieler).R18CartTerminal) {
 			_G(spieler).R18CartSave = true;
 			_G(atds)->set_ats_str(26, 1, INV_ATS_DATA);
-			start_aad_wait(120, -1);
+			startAadWait(120, -1);
 		} else {
-			start_aad_wait(121, -1);
+			startAadWait(121, -1);
 		}
 		break;
 
diff --git a/engines/chewy/room.cpp b/engines/chewy/room.cpp
index 9a2d157940b..7dd131d76bc 100644
--- a/engines/chewy/room.cpp
+++ b/engines/chewy/room.cpp
@@ -101,23 +101,23 @@ static const uint8 CHEWY_JM_PHASEN[8][8] = {
 void JungleRoom::topEntry() {
 	_G(cur_hide_flag) = 0;
 	hideCur();
-	set_person_pos(236, 110, P_CHEWY, P_RIGHT);
-	set_person_pos(263, 85, P_NICHELLE, P_RIGHT);
-	set_person_pos(285, 78, P_HOWARD, P_RIGHT);
+	setPersonPos(236, 110, P_CHEWY, P_RIGHT);
+	setPersonPos(263, 85, P_NICHELLE, P_RIGHT);
+	setPersonPos(285, 78, P_HOWARD, P_RIGHT);
 	goAutoXy(266, 113, P_HOWARD, ANI_WAIT);
 	showCur();
 }
 
 void JungleRoom::leftEntry() {
-	set_person_pos(31, 118, P_CHEWY, P_RIGHT);
-	set_person_pos(71, 104, P_NICHELLE, P_RIGHT);
-	set_person_pos(6, 111, P_HOWARD, P_RIGHT);
+	setPersonPos(31, 118, P_CHEWY, P_RIGHT);
+	setPersonPos(71, 104, P_NICHELLE, P_RIGHT);
+	setPersonPos(6, 111, P_HOWARD, P_RIGHT);
 }
 
 void JungleRoom::rightEntry() {
-	set_person_pos(587, 114, P_CHEWY, P_LEFT);
-	set_person_pos(613, 103, P_NICHELLE, P_LEFT);
-	set_person_pos(561, 112, P_HOWARD, P_LEFT);
+	setPersonPos(587, 114, P_CHEWY, P_LEFT);
+	setPersonPos(613, 103, P_NICHELLE, P_LEFT);
+	setPersonPos(561, 112, P_HOWARD, P_LEFT);
 }
 
 void JungleRoom::setup_func() {
@@ -217,7 +217,7 @@ void Room::add_timer_new_room() {
 		if (adi->timer_start != 0) {
 			set_timer(i, adi->timer_start);
 		} else if (adi->start_flag || adi->repeat) {
-			_G(det)->start_detail(i, 0, ANI_FRONT);
+			_G(det)->startDetail(i, 0, ANI_FRONT);
 		}
 	}
 }
@@ -550,7 +550,7 @@ void switch_room(int16 nr) {
 	_G(spieler).PersonRoomNr[P_CHEWY] = nr;
 	_G(room)->load_room(&_G(room_blk), _G(spieler).PersonRoomNr[P_CHEWY], &_G(spieler));
 	enter_room(-1);
-	set_up_screen(DO_SETUP);
+	setupScreen(DO_SETUP);
 }
 
 void calc_person_look() {
diff --git a/engines/chewy/rooms/room00.cpp b/engines/chewy/rooms/room00.cpp
index 7a120eaaba0..07461f531c1 100644
--- a/engines/chewy/rooms/room00.cpp
+++ b/engines/chewy/rooms/room00.cpp
@@ -54,17 +54,17 @@ void Room0::entry() {
 		_G(det)->hideStaticSpr(6);
 
 	if (!_G(flags).LoadGame) {
-		set_person_pos(150, 100, P_CHEWY, P_RIGHT);
+		setPersonPos(150, 100, P_CHEWY, P_RIGHT);
 		_G(cur_hide_flag) = 0;
 		hideCur();
 		_G(timer_nr)[0] = _G(room)->set_timer(255, 3);
 
 		while (!_G(ani_timer)[_G(timer_nr)[0]]._timeFlag && !SHOULD_QUIT) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		}
 
 		start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(2, -1);
+		startAadWait(2, -1);
 
 		showCur();
 	}
@@ -82,32 +82,32 @@ bool Room0::timer(int16 t_nr, int16 ani_nr) {
 
 			_G(flags).AutoAniPlay = true;
 			if (!_G(spieler).R0SlimeUsed) {
-				start_aad_wait(42, -1);
+				startAadWait(42, -1);
 				autoMove(5, P_CHEWY);
-				set_person_spr(P_LEFT, P_CHEWY);
+				setPersonSpr(P_LEFT, P_CHEWY);
 
 				if (_G(spieler).R0FueterLab < 3) {
 					start_spz(CH_TALK3, 255, false, P_CHEWY);
 					if (_G(spieler).R0FueterLab)
-						start_aad_wait(618, -1);
+						startAadWait(618, -1);
 					else
-						start_aad_wait(43, -1);
+						startAadWait(43, -1);
 
 					++_G(spieler).R0FueterLab;
 				}
 
 				eyeAnim();
 			} else if (!_G(spieler).R0PillowThrow) {
-				start_aad_wait(42, -1);
+				startAadWait(42, -1);
 				start_spz(CH_TALK3, 255, false, P_CHEWY);
 
 				if (_G(spieler).R0FueterLab < 3) {
-					start_aad_wait(43, -1);
+					startAadWait(43, -1);
 					++_G(spieler).R0FueterLab;
 				}
 
 				autoMove(3, P_CHEWY);
-				set_person_pos(191, 120, P_CHEWY, P_LEFT);
+				setPersonPos(191, 120, P_CHEWY, P_LEFT);
 			}
 
 			if (!_G(spieler).R0PillowThrow)
@@ -152,9 +152,9 @@ bool Room0::pullSlime() {
 		_G(flags).AutoAniPlay = true;
 		autoMove(2, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(3, 1, ANI_FRONT);
-		start_detail_wait(17, 2, ANI_FRONT);
-		set_person_pos(222, 106, P_CHEWY, P_LEFT);
+		startSetailWait(3, 1, ANI_FRONT);
+		startSetailWait(17, 2, ANI_FRONT);
+		setPersonPos(222, 106, P_CHEWY, P_LEFT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		invent_2_slot(1);
 		_G(menu_item) = CUR_WALK;
@@ -181,10 +181,10 @@ void Room0::eyeAnim() {
 			checkSlimeEye();
 			eyeSlimeBack();
 			autoMove(FUETTER_POS, P_CHEWY);
-			set_person_pos(199 - CH_HOT_MOV_X, 145 - CH_HOT_MOV_Y, P_CHEWY, P_LEFT);
+			setPersonPos(199 - CH_HOT_MOV_X, 145 - CH_HOT_MOV_Y, P_CHEWY, P_LEFT);
 		} else {
 			eyeShoot();
-			set_person_pos(199 - CH_HOT_MOV_X, 145 - CH_HOT_MOV_Y, P_CHEWY, P_LEFT);
+			setPersonPos(199 - CH_HOT_MOV_X, 145 - CH_HOT_MOV_Y, P_CHEWY, P_LEFT);
 			eyeStart(EYE_END);
 		}
 	}
@@ -233,7 +233,7 @@ void Room0::eyeStart(EyeMode mode) {
 		_G(spr_info)[3] = _G(det)->plot_detail_sprite(0, 0, SCHLAUCH_DETAIL, adi->ani_count, ANI_HIDE);
 		_G(spr_info)[3].ZEbene = 193;
 		get_user_key(NO_SETUP);
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		SHOULD_QUIT_RETURN;
 
 		_G(cur)->plot_cur();
@@ -280,7 +280,7 @@ void Room0::eyeWait() {
 		_G(spr_info)[2] = _G(det)->plot_detail_sprite(0, 0, SCHLAUCH_DETAIL, adi->ani_count, ANI_HIDE);
 		_G(spr_info)[2].ZEbene = 192;
 		get_user_key(NO_SETUP);
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		_G(cur)->plot_cur();
 		calcEyeClick(2);
 		_G(out)->back2screen(_G(workpage));
@@ -318,7 +318,7 @@ void Room0::calcEyeClick(int16 ani_nr) {
 				del_inventar(_G(spieler).AkInvent);
 				_G(spieler).R0SlimeUsed = true;
 			} else if (is_cur_inventar(PILLOW_INV)) {
-				start_ats_wait(172, TXT_MARK_WALK, 14, ATS_DATA);
+				startAtsWait(172, TXT_MARK_WALK, 14, ATS_DATA);
 			}
 		}
 	}
@@ -329,7 +329,7 @@ void Room0::eyeShoot() {
 	adi->ani_count = 47;
 
 	bool ende = false;
-	_G(det)->start_detail(CH_BLITZ, 1, ANI_FRONT);
+	_G(det)->startDetail(CH_BLITZ, 1, ANI_FRONT);
 
 	while (!ende) {
 		clear_prog_ani();
@@ -349,7 +349,7 @@ void Room0::eyeShoot() {
 				ende = true;
 		}
 
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN;
 
 		if (adi->delay_count > 0)
@@ -360,7 +360,7 @@ void Room0::eyeShoot() {
 		}
 	}
 
-	_G(det)->start_detail(STERNE_STEHEN, 255, ANI_FRONT);
+	_G(det)->startDetail(STERNE_STEHEN, 255, ANI_FRONT);
 	clear_prog_ani();
 	_G(spr_info)[0] = _G(det)->plot_detail_sprite(0, 0, FLAP_DETAIL, FLAP_SPRITE, ANI_HIDE);
 	_G(spr_info)[0].ZEbene = 190;
@@ -369,9 +369,9 @@ void Room0::eyeShoot() {
 	_G(spr_info)[2] = _G(det)->plot_detail_sprite(0, 0, SCHLAUCH_DETAIL, KOPF2, ANI_HIDE);
 	_G(spr_info)[2].ZEbene = 192;
 
-	wait_show_screen(30);
+	waitShowScreen(30);
 	clear_prog_ani();
-	set_person_pos(199 - CH_HOT_MOV_X, 145 - CH_HOT_MOV_Y, P_CHEWY, P_LEFT);
+	setPersonPos(199 - CH_HOT_MOV_X, 145 - CH_HOT_MOV_Y, P_CHEWY, P_LEFT);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 }
 
@@ -433,7 +433,7 @@ void Room0::checkSlimeEye() {
 		_G(spr_info)[2].ZEbene = 192;
 		_G(spr_info)[3] = _G(det)->plot_detail_sprite(0, 0, CH_WIRFT_SCHLEIM, adi->ani_count, ANI_HIDE);
 		_G(spr_info)[3].ZEbene = 193;
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 
 		if (adi->delay_count > 0)
 			--adi->delay_count;
@@ -488,7 +488,7 @@ void Room0::feederStart(int16 mode) {
 		EVENTS_UPDATE;
 		SHOULD_QUIT_RETURN;
 
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		_G(cur)->plot_cur();
 		if (!mode)
 			calcPillowClick(1);
@@ -514,7 +514,7 @@ void Room0::feederStart(int16 mode) {
 	_G(flags).AniUserAction = false;
 
 	if (mode) {
-		_G(det)->start_detail(FLAP_DETAIL, 1, ANI_BACK);
+		_G(det)->startDetail(FLAP_DETAIL, 1, ANI_BACK);
 		while (_G(det)->get_ani_status(FLAP_DETAIL))
 			set_ani_screen();
 
@@ -529,7 +529,7 @@ void Room0::feederExtend() {
 		_G(spr_info)[1] = _G(det)->plot_detail_sprite(0, 0, FUETTER_SCHLAUCH, 136, ANI_HIDE);
 		_G(spr_info)[1].ZEbene = 191;
 		get_user_key(NO_SETUP);
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		_G(cur)->plot_cur();
 		calcPillowClick(1);
 		_G(out)->back2screen(_G(workpage));
@@ -556,7 +556,7 @@ void Room0::calcPillowClick(int16 ani_nr) {
 				del_inventar(_G(spieler).AkInvent);
 				_G(spieler).R0PillowThrow = true;
 			} else if (is_cur_inventar(SLIME_INV)) {
-				start_ats_wait(173, TXT_MARK_WALK, 14, ATS_DATA);
+				startAtsWait(173, TXT_MARK_WALK, 14, ATS_DATA);
 			}
 		}
 	}
@@ -616,7 +616,7 @@ void Room0::checkFeed() {
 	}
 
 	adi->ani_count = 138;
-	_G(det)->start_detail(CH_NACH_FUETTERN, 2, ANI_FRONT);
+	_G(det)->startDetail(CH_NACH_FUETTERN, 2, ANI_FRONT);
 
 	ende = false;
 	while (!ende) {
@@ -662,7 +662,7 @@ void Room0::checkPillow() {
 
 	bool ende = false;
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	_G(det)->start_detail(CH_WIRFT_KISSEN, 1, ANI_FRONT);
+	_G(det)->startDetail(CH_WIRFT_KISSEN, 1, ANI_FRONT);
 	bool mode = false;
 
 	while (!ende) {
@@ -670,7 +670,7 @@ void Room0::checkPillow() {
 		if (!_G(det)->get_ani_status(CH_WIRFT_KISSEN)) {
 			mode = true;
 			_G(spieler).PersonHide[P_CHEWY] = false;
-			set_person_pos(228 - CH_HOT_MOV_X, 143 - CH_HOT_MOV_Y, P_CHEWY, P_LEFT);
+			setPersonPos(228 - CH_HOT_MOV_X, 143 - CH_HOT_MOV_Y, P_CHEWY, P_LEFT);
 		}
 
 		_G(spr_info)[0] = _G(det)->plot_detail_sprite(0, 0, FLAP_DETAIL, FLAP_SPRITE, ANI_HIDE);
@@ -683,7 +683,7 @@ void Room0::checkPillow() {
 			_G(spr_info)[2].ZEbene = 192;
 		}
 
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN;
 
 		if (mode) {
@@ -702,7 +702,7 @@ void Room0::checkPillow() {
 }
 
 void Room0::trapDoorOpen() {
-	_G(det)->start_detail(FLAP_DETAIL, 1, ANI_FRONT);
+	_G(det)->startDetail(FLAP_DETAIL, 1, ANI_FRONT);
 	while (_G(det)->get_ani_status(FLAP_DETAIL)) {
 		set_ani_screen();
 		SHOULD_QUIT_RETURN;
@@ -723,7 +723,7 @@ void Room0::trapDoorOpen() {
 }
 
 void Room0::trapDoorClose() {
-	_G(det)->start_detail(FLAP_DETAIL, 1, ANI_BACK);
+	_G(det)->startDetail(FLAP_DETAIL, 1, ANI_BACK);
 
 	while (_G(det)->get_ani_status(FLAP_DETAIL)) {
 		set_ani_screen();
@@ -742,7 +742,7 @@ void Room0::feederAni() {
 			checkPillow();
 			feederStart(1);
 			autoMove(VERSTECK_POS, P_CHEWY);
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 			_G(out)->cls();
 			flic_cut(FCUT_000);
 
@@ -750,13 +750,13 @@ void Room0::feederAni() {
 
 			_G(spieler).PersonRoomNr[P_CHEWY] = 1;
 			_G(room)->load_room(&_G(room_blk), _G(spieler).PersonRoomNr[P_CHEWY], &_G(spieler));
-			set_person_pos(_G(Rdi)->AutoMov[4].X - CH_HOT_MOV_X,
+			setPersonPos(_G(Rdi)->AutoMov[4].X - CH_HOT_MOV_X,
 			               _G(Rdi)->AutoMov[4].Y - CH_HOT_MOV_Y, P_CHEWY, P_RIGHT);
 			_G(spieler_vector)[P_CHEWY].DelayCount = 0;
 
 			check_shad(4, 0);
 			_G(fx_blend) = BLEND1;
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		} else {
 			action = true;
 		}
diff --git a/engines/chewy/rooms/room01.cpp b/engines/chewy/rooms/room01.cpp
index 230c733c1d9..4bb7da6255f 100644
--- a/engines/chewy/rooms/room01.cpp
+++ b/engines/chewy/rooms/room01.cpp
@@ -30,7 +30,7 @@ namespace Rooms {
 
 void Room1::gottenCard() {
 	_G(det)->hideStaticSpr(2);
-	start_detail_wait(4, 1, ANI_FRONT);
+	startSetailWait(4, 1, ANI_FRONT);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	_G(atds)->del_steuer_bit(7, ATS_COUNT_BIT, ATS_DATA);
 	int16 tmp;
@@ -52,7 +52,7 @@ void Room1::gedAction(int index) {
 		}
 
 		if (flag) {
-			start_aad_wait(54, -1);
+			startAadWait(54, -1);
 			_G(atds)->set_ats_str(8, TXT_MARK_LOOK, 0, ATS_DATA);
 			_G(spieler).room_s_obj[KABELABDECKUNG].ZustandFlipFlop = 2;
 			_G(obj)->calc_rsi_flip_flop(KABELABDECKUNG);
diff --git a/engines/chewy/rooms/room02.cpp b/engines/chewy/rooms/room02.cpp
index 012d3070702..54bc1279ea8 100644
--- a/engines/chewy/rooms/room02.cpp
+++ b/engines/chewy/rooms/room02.cpp
@@ -39,15 +39,15 @@ static const AniBlock ABLOCK4[2] = {
 
 void Room2::entry() {
 	if (!_G(spieler).R2ElectrocutedBork)
-		_G(det)->start_detail(5, 255, ANI_FRONT);
+		_G(det)->startDetail(5, 255, ANI_FRONT);
 }
 
 void Room2::jump_out_r1(int16 nr) {
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	start_detail_wait(nr, 1, ANI_FRONT);
-	set_up_screen(DO_SETUP);
+	startSetailWait(nr, 1, ANI_FRONT);
+	setupScreen(DO_SETUP);
 	_G(det)->stop_detail(6);
-	set_person_pos(32, 127, P_CHEWY, P_LEFT);
+	setPersonPos(32, 127, P_CHEWY, P_LEFT);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	clear_prog_ani();
 	switch_room(1);
@@ -55,12 +55,12 @@ void Room2::jump_out_r1(int16 nr) {
 }
 
 void Room2::electrifyWalkway1() {
-	_G(det)->start_detail(ANI_5, 255, ANI_FRONT);
+	_G(det)->startDetail(ANI_5, 255, ANI_FRONT);
 	start_spz(CH_TALK6, 255, false, ANI_FRONT);
-	start_aad_wait(49, -1);
+	startAadWait(49, -1);
 	_G(det)->stop_detail(ANI_5);
 
-	_G(det)->start_detail(GITTER_BLITZEN, 12, ANI_FRONT);
+	_G(det)->startDetail(GITTER_BLITZEN, 12, ANI_FRONT);
 	_G(spieler).R2ElectrocutedBork = true;
 	del_inventar(_G(spieler).AkInvent);
 
@@ -74,16 +74,16 @@ void Room2::electrifyWalkway1() {
 
 void Room2::electrifyWalkway2() {
 	start_spz(CH_TALK12, 255, false, P_CHEWY);
-	start_aad_wait(47, -1);
+	startAadWait(47, -1);
 }
 
 void Room2::gedAction(int index) {
 	if (index == 0) {
 		_G(det)->stop_detail(5);
 		if (!_G(spieler).R2ElectrocutedBork)
-			_G(det)->start_detail(6, 2, ANI_FRONT);
+			_G(det)->startDetail(6, 2, ANI_FRONT);
 		else
-			start_ani_block(2, ABLOCK4);
+			startAniBlock(2, ABLOCK4);
 
 		jump_out_r1(9);
 	}
diff --git a/engines/chewy/rooms/room03.cpp b/engines/chewy/rooms/room03.cpp
index 237774ace47..a1b41eec228 100644
--- a/engines/chewy/rooms/room03.cpp
+++ b/engines/chewy/rooms/room03.cpp
@@ -107,34 +107,34 @@ void Room3::terminal() {
 
 		if (!_G(spieler).R2ElectrocutedBork) {
 			_G(det)->stop_detail(5);
-			start_ani_block(2, ABLOCK3);
+			startAniBlock(2, ABLOCK3);
 			if (_G(spieler).R2FussSchleim) {
 				_G(spieler).R2FussSchleim = false;
 				_G(spieler).room_s_obj[SIB_SCHLEIM].ZustandFlipFlop = 1;
 			}
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_detail_wait(8, 1, ANI_FRONT);
-			set_up_screen(DO_SETUP);
+			startSetailWait(8, 1, ANI_FRONT);
+			setupScreen(DO_SETUP);
 			_G(det)->stop_detail(6);
 			clear_prog_ani();
 			switch_room(1);
-			start_ani_block(2, ABLOCK0);
-			set_person_pos(92, 131, P_CHEWY, P_LEFT);
+			startAniBlock(2, ABLOCK0);
+			setPersonPos(92, 131, P_CHEWY, P_LEFT);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 		} else if (!_G(spieler).R2FussSchleim) {
-			start_ani_block(2, ABLOCK2);
+			startAniBlock(2, ABLOCK2);
 			Room2::jump_out_r1(9);
-			start_aad_wait(45, -1);
+			startAadWait(45, -1);
 		} else {
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_ani_block(2, ABLOCK1);
+			startAniBlock(2, ABLOCK1);
 			_G(spieler).PersonRoomNr[P_CHEWY] = 5;
 			clear_prog_ani();
 			_G(auto_obj) = 0;
 			_G(room)->load_room(&_G(room_blk), _G(spieler).PersonRoomNr[P_CHEWY], &_G(spieler));
 			_G(fx_blend) = BLEND1;
-			start_ani_block(3, ablock5);
-			set_person_pos(91, 107, P_CHEWY, P_LEFT);
+			startAniBlock(3, ablock5);
+			setPersonPos(91, 107, P_CHEWY, P_LEFT);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 		}
 		clear_prog_ani();
@@ -144,10 +144,10 @@ void Room3::terminal() {
 		_G(auto_obj) = 1;
 		_G(maus_links_click) = false;
 		_G(minfo).button = 0;
-		stop_person(P_CHEWY);
+		stopPerson(P_CHEWY);
 		start_spz(15, 255, false, P_CHEWY);
-		start_aad_wait(51, -1);
-		set_up_screen(DO_SETUP);
+		startAadWait(51, -1);
+		setupScreen(DO_SETUP);
 		break;
 
 	case 2:
@@ -199,13 +199,13 @@ void Room3::sonde_knarre() {
 	while (_G(mov_phasen)[SONDE_OBJ].Repeat != -1)
 		set_ani_screen();
 
-	_G(det)->start_detail(SONDE_SHOOT, 1, ANI_FRONT);
+	_G(det)->startDetail(SONDE_SHOOT, 1, ANI_FRONT);
 	int16 ende = 0;
 	while (!ende) {
 		clear_prog_ani();
 		if (rdi->Ainfo[SONDE_SHOOT].ani_count == 170) {
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			_G(det)->start_detail(KOPF_SCHUSS, 1, ANI_FRONT);
+			_G(det)->startDetail(KOPF_SCHUSS, 1, ANI_FRONT);
 		}
 		_G(spr_info)[0] = _G(det)->plot_detail_sprite(0, 0, SONDE_ANI, SONDE_SPR_R, ANI_HIDE);
 		_G(spr_info)[0].ZEbene = 0;
@@ -218,7 +218,7 @@ void Room3::sonde_knarre() {
 		}
 		
 		if (rdi->Ainfo[SONDE_SHOOT].ani_count == 178)
-			_G(det)->start_detail(SONDE_RET, 3, ANI_BACK);
+			_G(det)->startDetail(SONDE_RET, 3, ANI_BACK);
 		
 		if (rdi->Ainfo[KOPF_SCHUSS].ani_count == 28)
 			ende = 1;
@@ -228,7 +228,7 @@ void Room3::sonde_knarre() {
 	}
 
 	clear_prog_ani();
-	_G(det)->start_detail(SONDE_RAUCH, 3, ANI_FRONT);
+	_G(det)->startDetail(SONDE_RAUCH, 3, ANI_FRONT);
 	ende = 0;
 	while (_G(det)->get_ani_status(SONDE_RAUCH)) {
 
@@ -245,9 +245,9 @@ void Room3::sonde_knarre() {
 	}
 
 	start_spz(15, 255, false, P_CHEWY);
-	start_aad_wait(53, -1);
+	startAadWait(53, -1);
 	clear_prog_ani();
-	_G(det)->start_detail(SONDE_REIN, 1, ANI_BACK);
+	_G(det)->startDetail(SONDE_REIN, 1, ANI_BACK);
 	while (_G(det)->get_ani_status(SONDE_REIN)) {
 
 		_G(spr_info)[0] = _G(det)->plot_detail_sprite(0, 0, SONDE_ANI, SONDE_SPR_R, ANI_HIDE);
@@ -313,7 +313,7 @@ void Room3::probeTransfer() {
 		SHOULD_QUIT_RETURN;
 	}
 
-	_G(det)->start_detail(SONDE_GREIF, 1, ANI_FRONT);
+	_G(det)->startDetail(SONDE_GREIF, 1, ANI_FRONT);
 	while (_G(det)->get_ani_status(SONDE_GREIF)) {
 		clear_prog_ani();
 		_G(spr_info)[0] = _G(det)->plot_detail_sprite(0, 0, SONDE_GREIF, SONDE_SPR_L, ANI_HIDE);
diff --git a/engines/chewy/rooms/room04.cpp b/engines/chewy/rooms/room04.cpp
index c6d206c4517..43332ae5a07 100644
--- a/engines/chewy/rooms/room04.cpp
+++ b/engines/chewy/rooms/room04.cpp
@@ -107,7 +107,7 @@ int16 Room4::sonde_comp() {
 		if (_G(minfo).y < 124)
 			_G(minfo).y = 123;
 
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN0;
 	}
 	g_events->delay(500);
@@ -122,7 +122,7 @@ int16 Room4::sonde_comp() {
 	_G(minfo).button = 0;
 	_G(spieler).PersonRoomNr[P_CHEWY] = 3;
 	_G(room)->load_room(&_G(room_blk), 3, &_G(spieler));
-	set_person_pos(110, 139, P_CHEWY, P_LEFT);
+	setPersonPos(110, 139, P_CHEWY, P_LEFT);
 
 	_G(fx_blend) = BLEND1;
 	_G(atds)->stop_aad();
diff --git a/engines/chewy/rooms/room05.cpp b/engines/chewy/rooms/room05.cpp
index 0cbfc49bce8..844939da70f 100644
--- a/engines/chewy/rooms/room05.cpp
+++ b/engines/chewy/rooms/room05.cpp
@@ -31,18 +31,18 @@ namespace Rooms {
 
 void Room5::entry() {
 	if (_G(spieler).R5Terminal)
-		_G(det)->start_detail(6, 255, ANI_FRONT);
+		_G(det)->startDetail(6, 255, ANI_FRONT);
 }
 
 void Room5::pushButton() {
 	if (_G(spieler).R5Terminal) {
 		int16 str_nr;
 		if (_G(spieler).R5Tuer == false) {
-			start_detail_wait(9, 1, ANI_FRONT);
+			startSetailWait(9, 1, ANI_FRONT);
 			_G(spieler).room_e_obj[6].Attribut = AUSGANG_OBEN;
 			str_nr = 1;
 		} else {
-			start_detail_wait(9, 1, ANI_BACK);
+			startSetailWait(9, 1, ANI_BACK);
 			_G(spieler).room_e_obj[6].Attribut = 255;
 			str_nr = 0;
 		}
@@ -50,7 +50,7 @@ void Room5::pushButton() {
 		_G(spieler).R5Tuer ^= 1;
 		_G(obj)->calc_rsi_flip_flop(SIB_TUERE_R5);
 	} else {
-		start_aad_wait(1, -1);
+		startAadWait(1, -1);
 	}
 }
 
diff --git a/engines/chewy/rooms/room06.cpp b/engines/chewy/rooms/room06.cpp
index 30826351b81..8a01f0c242b 100644
--- a/engines/chewy/rooms/room06.cpp
+++ b/engines/chewy/rooms/room06.cpp
@@ -59,7 +59,7 @@ void Room6::entry() {
 	_G(zoom_mov_fak) = 2;
 
 	if (_G(spieler).R6BolaSchild && _G(spieler).R6RaumBetreten < 2) {
-		_G(det)->start_detail(7, 255, ANI_FRONT);
+		_G(det)->startDetail(7, 255, ANI_FRONT);
 		_G(atds)->del_steuer_bit(44, ATS_AKTIV_BIT, ATS_DATA);
 		if (!_G(flags).LoadGame)
 			++_G(spieler).R6RaumBetreten;
@@ -94,13 +94,13 @@ void Room6::init_robo() {
 void Room6::bola_knopf() {
 	if (!_G(spieler).R6BolaBecher) {
 		_G(det)->hideStaticSpr(0);
-		start_detail_wait(0, 1, ANI_FRONT);
+		startSetailWait(0, 1, ANI_FRONT);
 		if (_G(spieler).R6BolaOk) {
 			_G(spieler).R6BolaBecher = true;
 			_G(det)->showStaticSpr(0);
-			start_ani_block(2, ABLOCK7);
+			startAniBlock(2, ABLOCK7);
 			_G(obj)->calc_rsi_flip_flop(SIB_BOLA_FLECK_R6);
-			wait_detail(2);
+			waitDetail(2);
 			_G(obj)->calc_rsi_flip_flop(SIB_BOLA_SCHACHT);
 			_G(atds)->del_steuer_bit(42, ATS_AKTIV_BIT, ATS_DATA);
 			_G(atds)->set_ats_str(41, TXT_MARK_LOOK, 1, ATS_DATA);
@@ -108,19 +108,19 @@ void Room6::bola_knopf() {
 			_G(obj)->hide_sib(SIB_BOLA_KNOPF_R6);
 		} else {
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_ani_block(3, ABLOCK6);
+			startAniBlock(3, ABLOCK6);
 			while (_G(det)->get_ani_status(3) && !SHOULD_QUIT) {
 				if (!_G(det)->get_ani_status(14)) {
-					set_person_pos(220, 89, P_CHEWY, P_LEFT);
+					setPersonPos(220, 89, P_CHEWY, P_LEFT);
 					_G(spieler).PersonHide[P_CHEWY] = false;
 				}
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 			}
 			_G(det)->showStaticSpr(0);
 			++_G(spieler).R6BolaJoke;
 			int16 diaNr = (_G(spieler).R6BolaJoke < 3) ? 3 : 4;
 			start_spz(CH_TALK5, 244, false, 0);
-			start_aad_wait(diaNr, -1);
+			startAadWait(diaNr, -1);
 		}
 		_G(obj)->calc_rsi_flip_flop(SIB_BOLA_KNOPF_R6);
 	}
diff --git a/engines/chewy/rooms/room07.cpp b/engines/chewy/rooms/room07.cpp
index 7cbe25078c8..1ecdac179ee 100644
--- a/engines/chewy/rooms/room07.cpp
+++ b/engines/chewy/rooms/room07.cpp
@@ -70,7 +70,7 @@ void Room7::haken(int16 sib_nr) {
 
 	_G(obj)->calc_all_static_detail();
 	_G(atds)->set_ats_str(54, TXT_MARK_LOOK, 1, ATS_DATA);
-	start_aad_wait(dia_nr, -1);
+	startAadWait(dia_nr, -1);
 }
 
 void Room7::klingel() {
@@ -80,23 +80,23 @@ void Room7::klingel() {
 		(_G(spieler).R7BellCount >= 2 && _G(spieler).R7SeilLeft && !_G(spieler).R7SeilOk)) {
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		start_aad(5, 0);
-		start_ani_block(3, ABLOCK25);
+		startAniBlock(3, ABLOCK25);
 
 		_G(det)->showStaticSpr(7);
-		start_detail_wait(12, 1, ANI_FRONT);
-		start_detail_wait(11, 1, ANI_FRONT);
+		startSetailWait(12, 1, ANI_FRONT);
+		startSetailWait(11, 1, ANI_FRONT);
 		_G(det)->hideStaticSpr(7);
 		_G(det)->stop_detail(5);
-		set_person_pos(95, 94, P_CHEWY, P_RIGHT);
+		setPersonPos(95, 94, P_CHEWY, P_RIGHT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 	} else if (_G(spieler).R7BellCount == 1) {
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		start_aad(6, 0);
-		start_ani_block(3, ABLOCK25);
+		startAniBlock(3, ABLOCK25);
 		_G(det)->showStaticSpr(7);
-		start_detail_wait(10, 1, ANI_FRONT);
-		_G(det)->start_detail(13, 1, ANI_FRONT);
-		set_person_pos(95, 94, P_CHEWY, P_RIGHT);
+		startSetailWait(10, 1, ANI_FRONT);
+		_G(det)->startDetail(13, 1, ANI_FRONT);
+		setPersonPos(95, 94, P_CHEWY, P_RIGHT);
 		_G(det)->stop_detail(5);
 
 		_G(spieler).PersonHide[P_CHEWY] = false;
@@ -104,18 +104,18 @@ void Room7::klingel() {
 		autoMove(6, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
 
-		_G(det)->start_detail(0, 255, ANI_FRONT);
-		start_detail_wait(13, 1, ANI_FRONT);
+		_G(det)->startDetail(0, 255, ANI_FRONT);
+		startSetailWait(13, 1, ANI_FRONT);
 		flic_cut(FCUT_001);
 		_G(det)->stop_detail(0);
 		_G(spieler).scrollx = 0;
 		_G(spieler).scrolly = 0;
-		set_person_pos(114, 138, P_CHEWY, -1);
+		setPersonPos(114, 138, P_CHEWY, -1);
 
-		start_detail_frame(19, 1, ANI_FRONT, 6);
-		start_detail_frame(9, 1, ANI_FRONT, 4);
+		startDetailFrame(19, 1, ANI_FRONT, 6);
+		startDetailFrame(9, 1, ANI_FRONT, 4);
 		_G(det)->showStaticSpr(9);
-		wait_detail(9);
+		waitDetail(9);
 		_G(det)->hideStaticSpr(9);
 		_G(obj)->show_sib(SIB_SCHLOTT_R7);
 		_G(obj)->calc_rsi_flip_flop(SIB_SCHLOTT_R7);
@@ -127,23 +127,23 @@ void Room7::klingel() {
 	} else if (!_G(spieler).R7SeilOk) {
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		start_aad(7, 0);
-		start_ani_block(3, ABLOCK25);
+		startAniBlock(3, ABLOCK25);
 		_G(det)->showStaticSpr(7);
 		_G(det)->load_taf_seq(192, 74, nullptr);
-		_G(det)->start_detail(14, 1, ANI_FRONT);
-		set_person_pos(95, 94, P_CHEWY, P_RIGHT);
+		_G(det)->startDetail(14, 1, ANI_FRONT);
+		setPersonPos(95, 94, P_CHEWY, P_RIGHT);
 		_G(det)->stop_detail(5);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 
 		_G(flags).NoScroll = true;
 		autoMove(6, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		_G(det)->start_detail(0, 255, ANI_FRONT);
-		wait_detail(14);
-		start_ani_block(4, ABLOCK10);
+		_G(det)->startDetail(0, 255, ANI_FRONT);
+		waitDetail(14);
+		startAniBlock(4, ABLOCK10);
 		_G(det)->hideStaticSpr(7);
 		_G(det)->stop_detail(0);
-		set_person_pos(181, 130, P_CHEWY, P_RIGHT);
+		setPersonPos(181, 130, P_CHEWY, P_RIGHT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		_G(flags).NoScroll = false;
 		_G(det)->del_taf_tbl(192, 74, nullptr);
@@ -152,13 +152,13 @@ void Room7::klingel() {
 		_G(spieler).R7BorkFlug = true;
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		start_aad(8, 0);
-		start_detail_wait(1, 1, ANI_FRONT);
+		startSetailWait(1, 1, ANI_FRONT);
 		_G(obj)->set_rsi_flip_flop(SIB_TKNOPF2_R7, 255);
 		_G(obj)->hide_sib(SIB_KLINGEL_R7);
 		_G(flags).NoPalAfterFlc = false;
 		register_cutscene(2);
 		flic_cut(FCUT_002);
-		set_person_pos(201, 117, P_CHEWY, P_LEFT);
+		setPersonPos(201, 117, P_CHEWY, P_LEFT);
 		_G(spieler).scrollx = 0;
 		_G(spieler).scrolly = 0;
 		_G(spieler).PersonHide[P_CHEWY] = false;
@@ -172,10 +172,10 @@ void Room7::klingel() {
 void Room7::gedAction(int index) {
 	if (index == 0 && _G(spieler).R7BorkFlug && _G(spieler).R7ChewyFlug) {
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		set_person_pos(180, 124, P_CHEWY, P_LEFT);
-		start_detail_wait(20, 1, ANI_FRONT);
+		setPersonPos(180, 124, P_CHEWY, P_LEFT);
+		startSetailWait(20, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(10);
-		wait_show_screen(10 * _G(spieler).DelaySpeed);
+		waitShowScreen(10 * _G(spieler).DelaySpeed);
 		_G(det)->hideStaticSpr(10);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		_G(spieler).R7ChewyFlug = false;
diff --git a/engines/chewy/rooms/room08.cpp b/engines/chewy/rooms/room08.cpp
index 410e2c97083..cfbcb3008e4 100644
--- a/engines/chewy/rooms/room08.cpp
+++ b/engines/chewy/rooms/room08.cpp
@@ -52,12 +52,12 @@ void Room8::entry() {
 void Room8::start_folter() {
 	_G(atds)->set_ats_str(67, 1, ATS_DATA);
 	_G(det)->stop_detail(19);
-	_G(det)->start_detail(13, 255, ANI_FRONT);
+	_G(det)->startDetail(13, 255, ANI_FRONT);
 }
 
 void Room8::stop_folter() {
 	_G(atds)->set_ats_str(67, 0, ATS_DATA);
-	_G(det)->start_detail(19, 255, ANI_FRONT);
+	_G(det)->startDetail(19, 255, ANI_FRONT);
 
 	_G(det)->stop_detail(13);
 
@@ -67,13 +67,13 @@ void Room8::stop_folter() {
 
 void Room8::hole_kohle() {
 	if (_G(spieler).R8Kohle) {
-		start_aad_wait(604, -1);
+		startAadWait(604, -1);
 	} else {
 		hideCur();
 		_G(spieler).R8Kohle = true;
 		autoMove(4, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(12, 1, ANI_FRONT);
+		startSetailWait(12, 1, ANI_FRONT);
 		cur_2_inventory();
 		invent_2_slot(KOHLE_HEISS_INV);
 		_G(spieler).PersonHide[P_CHEWY] = false;
@@ -88,10 +88,10 @@ void Room8::start_verbrennen() {
 		autoMove(3, P_CHEWY);
 		start_aad(102, 0);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_ani_block(2, ABLOCK12);
+		startAniBlock(2, ABLOCK12);
 
 		while (_G(det)->get_ani_status(9)) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 			SHOULD_QUIT_RETURN;
 
 			if (_G(minfo).button == 1 || _G(kbinfo).key_code == Common::KEYCODE_RETURN) {
@@ -102,8 +102,8 @@ void Room8::start_verbrennen() {
 		}
 
 		_G(det)->stop_detail(9);
-		set_person_pos(129, 246, P_CHEWY, P_RIGHT);
-		start_ani_block(2, ABLOCK13);
+		setPersonPos(129, 246, P_CHEWY, P_RIGHT);
+		startAniBlock(2, ABLOCK13);
 		_G(atds)->set_ats_str(60, TXT_MARK_LOOK, 1, ATS_DATA);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 	}
@@ -123,14 +123,14 @@ bool Room8::gips_wurf() {
 
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		del_inventar(GIPS_EIMER_INV);
-		start_detail_wait(4, 1, ANI_FRONT);
+		startSetailWait(4, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 
-		start_detail_frame(5, 1, ANI_FRONT, 16);
-		start_detail_wait(6, 1, ANI_FRONT);
+		startDetailFrame(5, 1, ANI_FRONT, 16);
+		startSetailWait(6, 1, ANI_FRONT);
 		_G(obj)->show_sib(33);
 		_G(det)->showStaticSpr(14);
-		wait_detail(5);
+		waitDetail(5);
 		_G(spieler).R8GipsWurf = true;
 		_G(spieler).room_m_obj[MASKE_INV].ZEbene = 0;
 		_G(obj)->setInventory(MASKE_INV, 181, 251, 8, &_G(room_blk));
@@ -141,7 +141,7 @@ bool Room8::gips_wurf() {
 		Dialogs::Inventory::look_screen(INVENTAR_NORMAL, 178);
 		_G(flags).AtsAction = true;
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(20, 1, ANI_FRONT);
+		startSetailWait(20, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		invent_2_slot(MASKE_INV);
 		cursorChoice(_G(menu_item));
@@ -154,12 +154,12 @@ bool Room8::gips_wurf() {
 void Room8::open_gdoor() {
 	_G(spieler).PersonHide[P_CHEWY] = true;
 	_G(det)->showStaticSpr(17);
-	set_up_screen(DO_SETUP);
-	start_detail_wait(7, 1, ANI_FRONT);
+	setupScreen(DO_SETUP);
+	startSetailWait(7, 1, ANI_FRONT);
 	_G(det)->showStaticSpr(15);
 	_G(det)->hideStaticSpr(17);
 	_G(spieler).PersonHide[P_CHEWY] = false;
-	set_person_pos(204, 274, P_CHEWY, P_LEFT);
+	setPersonPos(204, 274, P_CHEWY, P_LEFT);
 	_G(atds)->del_steuer_bit(69, ATS_AKTIV_BIT, ATS_DATA);
 	_G(obj)->hide_sib(31);
 	_G(spieler).R8GTuer = true;
@@ -176,9 +176,9 @@ void Room8::talk_nimoy() {
 		if (!_G(spieler).R8GTuer)
 			loadAdsDia(diaNr);
 		else
-			start_aad_wait(61, -1);
+			startAadWait(61, -1);
 	} else {
-		start_aad_wait(603, -1);
+		startAadWait(603, -1);
 		loadAdsDia(6);
 	}
 
diff --git a/engines/chewy/rooms/room09.cpp b/engines/chewy/rooms/room09.cpp
index cccd4cec5a2..0a8ddbe3ee3 100644
--- a/engines/chewy/rooms/room09.cpp
+++ b/engines/chewy/rooms/room09.cpp
@@ -49,7 +49,7 @@ void Room9::entry() {
 	_G(spieler).R7ChewyFlug = false;
 
 	if (!_G(spieler).R9Gitter)
-		set_person_pos(138, 91, P_CHEWY, P_LEFT);
+		setPersonPos(138, 91, P_CHEWY, P_LEFT);
 	else
 		_G(det)->showStaticSpr(5);
 
@@ -62,8 +62,8 @@ void Room9::entry() {
 void Room9::gtuer() {
 	_G(spieler).R9Gitter = true;
 	_G(det)->showStaticSpr(5);
-	start_detail_wait(6, 1, ANI_FRONT);
-	set_person_pos(74, 93, P_CHEWY, P_LEFT);
+	startSetailWait(6, 1, ANI_FRONT);
+	setPersonPos(74, 93, P_CHEWY, P_LEFT);
 	_G(atds)->del_steuer_bit(74, ATS_AKTIV_BIT, ATS_DATA);
 	_G(atds)->del_steuer_bit(75, ATS_AKTIV_BIT, ATS_DATA);
 	_G(atds)->del_steuer_bit(76, ATS_AKTIV_BIT, ATS_DATA);
@@ -75,13 +75,13 @@ void Room9::surimy() {
 	hideCur();
 	_G(spieler).R9Surimy = true;
 	const int16 tmp = _G(spieler_vector)[P_CHEWY].Count;
-	stop_person(P_CHEWY);
+	stopPerson(P_CHEWY);
 	_G(atds)->set_steuer_bit(75, ATS_AKTIV_BIT, ATS_DATA);
 	_G(det)->hideStaticSpr(4);
 	_G(room)->set_timer_status(7, TIMER_STOP);
 	surimy_ani();
 	start_spz(CH_TALK11, 255, false, P_CHEWY);
-	start_aad_wait(56, -1);
+	startAadWait(56, -1);
 	_G(spieler).room_e_obj[17].Attribut = AUSGANG_RECHTS;
 	_G(spieler_vector)[P_CHEWY].Count = tmp;
 	get_phase(&_G(spieler_vector)[P_CHEWY], &_G(spieler_mi)[P_CHEWY]);
@@ -101,10 +101,10 @@ void Room9::surimy_ani() {
 	_G(auto_mov_obj)[SURIMY_OBJ].Mode = true;
 	init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], 2, (const MovLine *)SURIMY_MPKT);
 	wait_auto_obj(SURIMY_OBJ);
-	start_detail_frame(0, 1, ANI_FRONT, 15);
-	_G(det)->start_detail(2, 1, ANI_FRONT);
-	wait_detail(0);
-	start_detail_wait(1, 1, ANI_FRONT);
+	startDetailFrame(0, 1, ANI_FRONT, 15);
+	_G(det)->startDetail(2, 1, ANI_FRONT);
+	waitDetail(0);
+	startSetailWait(1, 1, ANI_FRONT);
 	start_spz(CH_EKEL, 2, ANI_FRONT, P_CHEWY);
 	_G(det)->hideStaticSpr(4);
 	_G(mov_phasen)[SURIMY_OBJ].Repeat = 1;
diff --git a/engines/chewy/rooms/room10.cpp b/engines/chewy/rooms/room10.cpp
index 01b828e954d..cdb382aac8e 100644
--- a/engines/chewy/rooms/room10.cpp
+++ b/engines/chewy/rooms/room10.cpp
@@ -37,11 +37,11 @@ void Room10::entry() {
 		_G(spieler).R10Surimy = true;
 		_G(fx_blend) = BLEND_NONE;
 		flic_cut(FCUT_003);
-		set_person_pos(0, 130, P_CHEWY, P_RIGHT);
+		setPersonPos(0, 130, P_CHEWY, P_RIGHT);
 		autoMove(2, P_CHEWY);
 		hideCur();
 		start_spz(CH_TALK6, 255, false, P_CHEWY);
-		start_aad_wait(101, 0);
+		startAadWait(101, 0);
 		showCur();
 
 	} else if (_G(spieler).R10SurimyOk) {
diff --git a/engines/chewy/rooms/room11.cpp b/engines/chewy/rooms/room11.cpp
index cf09dfdd9e6..c0facbb60b9 100644
--- a/engines/chewy/rooms/room11.cpp
+++ b/engines/chewy/rooms/room11.cpp
@@ -62,9 +62,9 @@ void Room11::entry() {
 		_G(atds)->del_steuer_bit(121, ATS_AKTIV_BIT, ATS_DATA);
 
 		if (!_G(flags).LoadGame) {
-			start_ani_block(2, ABLOCK17);
+			startAniBlock(2, ABLOCK17);
 			autoMove(8, P_CHEWY);
-			start_aad_wait(31, -1);
+			startAadWait(31, -1);
 			_G(det)->stop_detail(9);
 		}
 		_G(det)->showStaticSpr(8);
@@ -96,7 +96,7 @@ void Room11::bork_zwinkert() {
 	if (!_G(flags).AutoAniPlay) {
 		_G(flags).AutoAniPlay = true;
 		_G(det)->hideStaticSpr(8);
-		start_ani_block(2, ABLOCK18);
+		startAniBlock(2, ABLOCK18);
 		_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
 		_G(det)->showStaticSpr(8);
 		_G(flags).AutoAniPlay = false;
@@ -120,10 +120,10 @@ void Room11::chewy_bo_use() {
 		hideCur();
 		_G(flags).AutoAniPlay = true;
 
-		stop_person(P_CHEWY);
+		stopPerson(P_CHEWY);
 		_G(det)->hideStaticSpr(8);
-		start_ani_block(2, ABLOCK17);
-		start_aad_wait(32, -1);
+		startAniBlock(2, ABLOCK17);
+		startAadWait(32, -1);
 		_G(det)->stop_detail(9);
 		_G(det)->showStaticSpr(8);
 		autoMove(6, P_CHEWY);
@@ -141,10 +141,10 @@ int16 Room11::scanner() {
 
 		if (!_G(spieler).R11CardOk) {
 			actionFl = true;
-			start_aad_wait(13, -1);
+			startAadWait(13, -1);
 		} else if (is_cur_inventar(BORK_INV)) {
 			hideCur();
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 			actionFl = true;
 
 			start_aad(105, 0);
@@ -154,17 +154,17 @@ int16 Room11::scanner() {
 			cur_2_inventory();
 			_G(menu_item) = CUR_TALK;
 			cursorChoice(_G(menu_item));
-			start_aad_wait(12, -1);
+			startAadWait(12, -1);
 			showCur();
 			loadAdsDia(3);
 		} else if (!_G(spieler).inv_cur) {
 			if (!_G(spieler).R11TerminalOk) {
 				actionFl = true;
 				flic_cut(FCUT_009);
-				start_aad_wait(20, -1);
+				startAadWait(20, -1);
 			} else {
 				actionFl = true;
-				start_aad_wait(12, -1);
+				startAadWait(12, -1);
 				_G(menu_item) = CUR_TALK;
 				cursorChoice(_G(menu_item));
 				loadAdsDia(3);
@@ -194,13 +194,13 @@ void Room11::put_card() {
 	if (is_cur_inventar(RED_CARD_INV) || is_cur_inventar(YEL_CARD_INV)) {
 		_G(spieler).R11IdCardNr = _G(spieler).AkInvent;
 		del_inventar(_G(spieler).R11IdCardNr);
-		_G(det)->start_detail(0, 255, ANI_FRONT);
+		_G(det)->startDetail(0, 255, ANI_FRONT);
 		_G(atds)->set_ats_str(83, TXT_MARK_LOOK, 1, ATS_DATA);
 		_G(atds)->set_ats_str(84, TXT_MARK_LOOK, 1, ATS_DATA);
 		_G(spieler).R11CardOk = true;
 
 		if (!_G(spieler).R11TerminalOk)
-			start_aad_wait(16, -1);
+			startAadWait(16, -1);
 	}
 }
 
diff --git a/engines/chewy/rooms/room12.cpp b/engines/chewy/rooms/room12.cpp
index 5589761aa17..eefb38cc69d 100644
--- a/engines/chewy/rooms/room12.cpp
+++ b/engines/chewy/rooms/room12.cpp
@@ -87,7 +87,7 @@ void Room12::entry() {
 		_G(obj)->calc_all_static_detail();
 		autoMove(5, P_CHEWY);
 		start_spz(CH_TALK12, 255, false, 0);
-		start_aad_wait(109, -1);
+		startAadWait(109, -1);
 		showCur();
 
 	} else if (_G(spieler).R12Talisman && !_G(spieler).R12BorkInRohr)
@@ -102,7 +102,7 @@ bool Room12::timer(int16 t_nr, int16 ani_nr) {
 			init_bork();
 	} else if (t_nr == _G(timer_nr)[1] && _G(spieler).R12TransOn) {
 		_G(spieler).R12TransOn = false;
-		start_aad_wait(30, -1);
+		startAadWait(30, -1);
 	}
 
 	return false;
@@ -133,9 +133,9 @@ void Room12::init_bork() {
 				if (_G(spieler).R12BorkCount < 3) {
 					++_G(spieler).R12BorkCount;
 					_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
-					wait_show_screen(10);
+					waitShowScreen(10);
 					start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
-					start_aad_wait(14, -1);
+					startAadWait(14, -1);
 				}
 
 				wait_auto_obj(R12_BORK_OBJ);
@@ -151,7 +151,7 @@ void Room12::init_bork() {
 
 void Room12::talk_bork() {
 	if (!_G(spieler).R12TalismanOk) {
-		start_aad_wait(28, -1);
+		startAadWait(28, -1);
 	}
 }
 
@@ -170,8 +170,8 @@ void Room12::bork_ok() {
 
 	_G(spieler).R12BorkInRohr = true;
 	_G(det)->setSetailPos(3, 170, 145);
-	_G(det)->start_detail(3, 255, ANI_FRONT);
-	start_aad_wait(57, -1);
+	_G(det)->startDetail(3, 255, ANI_FRONT);
+	startAadWait(57, -1);
 	_G(det)->stop_detail(3);
 
 	_G(mov_phasen)[R12_BORK_OBJ].Repeat = 1;
@@ -179,7 +179,7 @@ void Room12::bork_ok() {
 	init_auto_obj(R12_BORK_OBJ, &R12_BORK_PHASEN[0][0], 3, (const MovLine *)R12_BORK_MPKT2);
 	wait_auto_obj(R12_BORK_OBJ);
 	_G(det)->hideStaticSpr(10);
-	start_detail_wait(4, 1, ANI_FRONT);
+	startSetailWait(4, 1, ANI_FRONT);
 	_G(talk_hide_static) = -1;
 	_G(det)->showStaticSpr(12);
 	_G(atds)->set_ats_str(118, TXT_MARK_LOOK, 2, ATS_DATA);
@@ -196,11 +196,11 @@ int16 Room12::use_terminal() {
 
 		if (!_G(spieler).R12ChewyBork) {
 			autoMove(6, P_CHEWY);
-			start_aad_wait(110, -1);
+			startAadWait(110, -1);
 
 			if (_G(spieler).R12BorkInRohr && !_G(spieler).R12RaumOk) {
 				start_spz(CH_TALK5, 255, false, P_CHEWY);
-				start_aad_wait(112, -1);
+				startAadWait(112, -1);
 				_G(flags).NoScroll = true;
 				auto_scroll(46, 0);
 				flic_cut(FCUT_016);
@@ -212,12 +212,12 @@ int16 Room12::use_terminal() {
 				_G(det)->hideStaticSpr(12);
 				_G(menu_item) = CUR_WALK;
 				cursorChoice(_G(menu_item));
-				set_person_pos(108, 90, P_CHEWY, -1);
+				setPersonPos(108, 90, P_CHEWY, -1);
 				_G(spieler).R12ChewyBork = true;
 				_G(spieler).R12RaumOk = true;
 				autoMove(4, P_CHEWY);
 				start_spz(68, 255, false, P_CHEWY);
-				start_aad_wait(113, 0);
+				startAadWait(113, 0);
 
 			} else if (_G(spieler).R12TalismanOk && !_G(spieler).R12RaumOk) {
 				use_linke_rohr();
@@ -253,8 +253,8 @@ int16 Room12::chewy_trans() {
 		_G(flags).AutoAniPlay = true;
 		autoMove(9, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_ani_block(2, ABLOCK16);
-		set_person_pos(108, 82, P_CHEWY, P_RIGHT);
+		startAniBlock(2, ABLOCK16);
+		setPersonPos(108, 82, P_CHEWY, P_RIGHT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		_G(spieler).R12TransOn = false;
 		_G(flags).AutoAniPlay = false;
@@ -274,7 +274,7 @@ int16 Room12::useTransformerTube() {
 			_G(atds)->set_ats_str(117, 1, AAD_DATA);
 		} else {
 			autoMove(7, P_CHEWY);
-			start_aad_wait(29, -1);
+			startAadWait(29, -1);
 		}
 	}
 
diff --git a/engines/chewy/rooms/room13.cpp b/engines/chewy/rooms/room13.cpp
index db7295b7f7e..42c97109e2c 100644
--- a/engines/chewy/rooms/room13.cpp
+++ b/engines/chewy/rooms/room13.cpp
@@ -48,10 +48,10 @@ void Room13::entry() {
 	if (!_G(spieler).R12ChewyBork && !_G(spieler).R13BorkOk) {
 		_G(out)->cls();
 		flic_cut(FCUT_012);
-		set_person_pos(106, 65, P_CHEWY, P_RIGHT);
+		setPersonPos(106, 65, P_CHEWY, P_RIGHT);
 		switch_room(11);
 		start_spz(CH_TALK12, 255, false, P_CHEWY);
-		start_aad_wait(27, -1);
+		startAadWait(27, -1);
 	} else {
 		if (_G(spieler).R13MonitorStatus)
 			_G(det)->showStaticSpr(11 - _G(spieler).R13MonitorStatus);
@@ -70,7 +70,7 @@ void Room13::entry() {
 
 		if (_G(spieler).R13Bandlauf) {
 			for (int i = 0; i < 5; ++i)
-				_G(det)->start_detail(i, 255, false);
+				_G(det)->startDetail(i, 255, false);
 		}
 		
 		if (!_G(flags).LoadGame && _G(spieler).R13Band) {
@@ -92,7 +92,7 @@ void Room13::xit() {
 
 void Room13::gedAction(int index) {
 	if (index == 2 && _G(spieler).R12ChewyBork) {
-		stop_person(P_CHEWY);
+		stopPerson(P_CHEWY);
 		talk_bork();
 	}
 }
@@ -105,7 +105,7 @@ void Room13::talk_bork() {
 		_G(det)->setSetailPos(10, _G(spieler_vector)[P_CHEWY].Xypos[0], _G(spieler_vector)[P_CHEWY].Xypos[1]);
 		_G(det)->setStaticPos(12, _G(spieler_vector)[P_CHEWY].Xypos[0], _G(spieler_vector)[P_CHEWY].Xypos[1], false, true);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_aad_wait(33, -1);
+		startAadWait(33, -1);
 		_G(det)->stop_detail(9);
 		_G(det)->load_taf_seq(86, 12, nullptr);
 		_G(spieler).PersonHide[P_CHEWY] = false;
@@ -127,7 +127,7 @@ void Room13::talk_bork() {
 		auto_scroll(41, 0);
 
 		start_spz(68, 255, false, P_CHEWY);
-		start_aad_wait(248, -1);
+		startAadWait(248, -1);
 		flic_cut(FCUT_013);
 		load_chewy_taf(CHEWY_NORMAL);
 		_G(auto_obj) = 0;
@@ -136,10 +136,10 @@ void Room13::talk_bork() {
 		_G(atds)->set_steuer_bit(122, ATS_AKTIV_BIT, ATS_DATA);
 		_G(atds)->del_steuer_bit(92, ATS_AKTIV_BIT, ATS_DATA);
 		_G(obj)->show_sib(SIB_BANDKNOPF_R13);
-		set_person_pos(153, 138, P_CHEWY, P_LEFT);
+		setPersonPos(153, 138, P_CHEWY, P_LEFT);
 
-		start_aad_wait(34, -1);
-		start_aad_wait(249, -1);
+		startAadWait(34, -1);
+		startAadWait(249, -1);
 
 		_G(obj)->show_sib(SIB_TKNOPF1_R11);
 		_G(obj)->show_sib(SIB_SCHLITZ_R11);
@@ -161,20 +161,20 @@ void Room13::jmp_band() {
 			_G(spieler).R13Band = true;
 			autoMove(3, P_CHEWY);
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_detail_wait(8, 1, ANI_FRONT);
+			startSetailWait(8, 1, ANI_FRONT);
 			_G(spieler).PersonHide[P_CHEWY] = false;
-			set_person_pos(292, 98, P_CHEWY, P_RIGHT);
+			setPersonPos(292, 98, P_CHEWY, P_RIGHT);
 
 		} else {
 			_G(spieler).R13Surf = true;
 			_G(maus_links_click) = false;
 			autoMove(12, P_CHEWY);
-			start_aad_wait(117, -1);
+			startAadWait(117, -1);
 			_G(flags).NoScroll = true;
 			auto_scroll(76, 0);
 			flic_cut(FCUT_014);
 			_G(flags).NoScroll = false;
-			set_person_pos(195, 226, P_CHEWY, P_LEFT);
+			setPersonPos(195, 226, P_CHEWY, P_LEFT);
 
 			_G(spieler).R13Bandlauf = false;
 			_G(atds)->set_ats_str(94, TXT_MARK_LOOK, _G(spieler).R13Bandlauf, ATS_DATA);
@@ -189,7 +189,7 @@ void Room13::jmp_band() {
 			_G(spieler).scrollx = 92;
 			_G(spieler).scrolly = 120;
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			wait_show_screen(20);
+			waitShowScreen(20);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 		}
 	}
@@ -205,9 +205,9 @@ void Room13::jmp_boden() {
 		_G(spieler).R13Band = false;
 		autoMove(5, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(7, 1, ANI_FRONT);
+		startSetailWait(7, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
-		set_person_pos(176, 138, P_CHEWY, P_LEFT);
+		setPersonPos(176, 138, P_CHEWY, P_LEFT);
 	}
 }
 
@@ -217,13 +217,13 @@ int16 Room13::monitor_knopf() {
 	if (!_G(spieler).inv_cur) {
 		if (_G(spieler).R13Band) {
 			action_flag = true;
-			start_aad_wait(620, -1);
+			startAadWait(620, -1);
 
 		} else if (!_G(spieler).R12ChewyBork) {
 			action_flag = true;
 			autoMove(8, P_CHEWY);
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_detail_wait(6, 1, ANI_FRONT);
+			startSetailWait(6, 1, ANI_FRONT);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 
 			if (_G(spieler).R13MonitorStatus)
diff --git a/engines/chewy/rooms/room14.cpp b/engines/chewy/rooms/room14.cpp
index 8bf076b7b3c..dda730c9a5b 100644
--- a/engines/chewy/rooms/room14.cpp
+++ b/engines/chewy/rooms/room14.cpp
@@ -39,7 +39,7 @@ void Room14::entry() {
 
 	if (!_G(flags).LoadGame) {
 		if (_G(spieler).R14GleiterAuf) {
-			set_person_pos(381, 264, P_CHEWY, P_LEFT);
+			setPersonPos(381, 264, P_CHEWY, P_LEFT);
 			_G(det)->showStaticSpr(6);
 			_G(spieler).scrollx = 160;
 			_G(spieler).scrolly = 120;
@@ -61,10 +61,10 @@ void Room14::eremit_feuer(int16 t_nr, int16 ani_nr) {
 	if (!_G(flags).AutoAniPlay && !_G(spieler).R14Feuer) {
 		_G(flags).AutoAniPlay = true;
 		_G(det)->hideStaticSpr(9);
-		start_detail_wait(_G(room)->_roomTimer.ObjNr[ani_nr], 1, ANI_FRONT);
+		startSetailWait(_G(room)->_roomTimer.ObjNr[ani_nr], 1, ANI_FRONT);
 		_G(uhr)->resetTimer(t_nr, 0);
 		_G(det)->showStaticSpr(9);
-		_G(det)->start_detail(7, 1, ANI_FRONT);
+		_G(det)->startDetail(7, 1, ANI_FRONT);
 		_G(flags).AutoAniPlay = false;
 	}
 }
@@ -75,13 +75,13 @@ int16 Room14::use_schrott() {
 	if (!_G(spieler).inv_cur) {
 		autoMove(3, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(12, 1, ANI_FRONT);
+		startSetailWait(12, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 
 		if (!_G(spieler).R14Waffe) {
 			action_flag = true;
 			_G(spieler).R14Waffe = true;
-			start_aad_wait(21, -1);
+			startAadWait(21, -1);
 			invent_2_slot(BWAFFE_INV);
 		}
 	}
@@ -98,7 +98,7 @@ int16 Room14::use_gleiter() {
 		if (!_G(spieler).R14GleiterAuf) {
 			_G(spieler).R14GleiterAuf = true;
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_detail_wait(10, 1, ANI_FRONT);
+			startSetailWait(10, 1, ANI_FRONT);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 			_G(det)->showStaticSpr(6);
 			_G(atds)->set_ats_str(107, TXT_MARK_LOOK, 1, ATS_DATA);
@@ -121,7 +121,7 @@ void Room14::talk_eremit()  {
 			_G(obj)->show_sib(46);
 		} else {
 			hideCur();
-			start_aad_wait(24, -1);
+			startAadWait(24, -1);
 			showCur();
 			_G(flags).AutoAniPlay = false;
 		}
@@ -134,13 +134,13 @@ int16 Room14::use_schleim() {
 	if (!_G(spieler).inv_cur) {
 		autoMove(2, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(11, 1, ANI_FRONT);
+		startSetailWait(11, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 
 		if (!_G(spieler).R14Sicherung) {
 			action_flag = true;
 			_G(spieler).R14Sicherung = true;
-			start_aad_wait(22, -1);
+			startAadWait(22, -1);
 			invent_2_slot(SICHERUNG_INV);
 		}
 	}
@@ -160,32 +160,32 @@ void Room14::feuer() {
 		autoMove(5, P_CHEWY);
 		waffe = true;
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_frame(8, 1, ANI_FRONT, 11);
-		start_detail_wait(9, 1, ANI_FRONT);
-		wait_detail(8);
+		startDetailFrame(8, 1, ANI_FRONT, 11);
+		startSetailWait(9, 1, ANI_FRONT);
+		waitDetail(8);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 	} else {
 		autoMove(7, P_CHEWY);
 		_G(det)->hideStaticSpr(9);
-		start_detail_frame(2, 1, ANI_FRONT, 9);
+		startDetailFrame(2, 1, ANI_FRONT, 9);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(13, 1, ANI_FRONT);
+		startSetailWait(13, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
-		wait_detail(2);
-		start_detail_wait(5, 1, ANI_FRONT);
+		waitDetail(2);
+		startSetailWait(5, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(9);
 	}
 
 	del_inventar(tmp);
-	_G(det)->start_detail(6, 255, ANI_FRONT);
-	wait_show_screen(40);
+	_G(det)->startDetail(6, 255, ANI_FRONT);
+	waitShowScreen(40);
 
 	if (waffe)
 		autoMove(7, P_CHEWY);
 
-	start_aad_wait(26, -1);
+	startAadWait(26, -1);
 	_G(det)->hideStaticSpr(9);
-	start_detail_wait(3, 1, ANI_FRONT);
+	startSetailWait(3, 1, ANI_FRONT);
 	_G(det)->showStaticSpr(9);
 	invent_2_slot(FLUXO_INV);
 	_G(atds)->set_ats_str(105, TXT_MARK_LOOK, 1, ATS_DATA);
diff --git a/engines/chewy/rooms/room17.cpp b/engines/chewy/rooms/room17.cpp
index 51511298d78..166dc3e715f 100644
--- a/engines/chewy/rooms/room17.cpp
+++ b/engines/chewy/rooms/room17.cpp
@@ -52,9 +52,9 @@ static const MovLine CHEWY_MPKT1[2] = {
 
 void Room17::entry() {
 	if (!_G(spieler).R17EnergieOut) {
-		_G(det)->start_detail(1, 255, ANI_FRONT);
+		_G(det)->startDetail(1, 255, ANI_FRONT);
 		for (int i = 0; i < 3; ++i)
-			_G(det)->start_detail(6 + i, 255, ANI_FRONT);
+			_G(det)->startDetail(6 + i, 255, ANI_FRONT);
 	}
 
 	plot_seil();
@@ -72,7 +72,7 @@ void Room17::entry() {
 		_G(zoom_horizont) = 0;
 		_G(spieler).scrollx = 0;
 		_G(spieler).scrolly = 60;
-		set_person_pos(242, 146, P_CHEWY, P_LEFT);
+		setPersonPos(242, 146, P_CHEWY, P_LEFT);
 		xit();
 	} else if (_G(spieler).R17Location == 3) {
 		_G(room)->set_zoom(32);
@@ -145,14 +145,14 @@ int16 Room17::use_seil() {
 		_G(flags).AutoAniPlay = true;
 		autoMove(5, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(10, 1, ANI_FRONT);
+		startSetailWait(10, 1, ANI_FRONT);
 		_G(spieler).R17Seil = true;
 		_G(atds)->del_steuer_bit(139, ATS_AKTIV_BIT, ATS_DATA);
 		plot_seil();
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		_G(flags).AutoAniPlay = false;
 		start_spz(CH_TALK6, 255, false, P_CHEWY);
-		start_aad_wait(119, -1);
+		startAadWait(119, -1);
 
 		showCur();
 	}
@@ -171,7 +171,7 @@ void Room17::kletter_down() {
 	autoMove(5, P_CHEWY);
 	_G(det)->load_taf_seq(177, 1, nullptr);
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	start_detail_wait(14, 1, ANI_FRONT);
+	startSetailWait(14, 1, ANI_FRONT);
 	_G(flags).ZoomMov = false;
 	_G(zoom_mov_fak) = 1;
 	_G(spieler).ScrollyStep = 2;
@@ -180,14 +180,14 @@ void Room17::kletter_down() {
 	_G(zoom_horizont) = 399;
 	_G(auto_obj) = 1;
 	init_auto_obj(CHEWY_OBJ, &CHEWY_PHASEN[0][0], _G(mov_phasen)[CHEWY_OBJ].Lines, (const MovLine *)CHEWY_MPKT);
-	set_person_pos(242, 350, P_CHEWY, P_LEFT);
+	setPersonPos(242, 350, P_CHEWY, P_LEFT);
 }
 
 void Room17::kletter_up() {
 	autoMove(6, P_CHEWY);
 	_G(det)->load_taf_seq(141, 4, nullptr);
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	start_detail_wait(11, 1, ANI_FRONT);
+	startSetailWait(11, 1, ANI_FRONT);
 	_G(flags).ZoomMov = true;
 	_G(zoom_mov_fak) = 3;
 	_G(spieler).ScrollyStep = 1;
@@ -195,13 +195,13 @@ void Room17::kletter_up() {
 	_G(zoom_horizont) = 0;
 	_G(auto_obj) = 1;
 	init_auto_obj(CHEWY_OBJ, &CHEWY_PHASEN[0][0], _G(mov_phasen)[CHEWY_OBJ].Lines, (const MovLine *)CHEWY_MPKT1);
-	set_person_pos(243, 146, P_CHEWY, P_LEFT);
+	setPersonPos(243, 146, P_CHEWY, P_LEFT);
 }
 
 void Room17::calc_seil() {
 	if (_G(spieler).R17Seil) {
 		if (_G(spieler).R17Location == 2) {
-			start_aad_wait(619, -1);
+			startAadWait(619, -1);
 		} else if (!_G(flags).AutoAniPlay && !_G(spieler).inv_cur) {
 			close_door();
 			_G(flags).AutoAniPlay = true;
@@ -226,7 +226,7 @@ void Room17::calc_seil() {
 			cursorChoice(_G(menu_item));
 			wait_auto_obj(CHEWY_OBJ);
 			showCur();
-			set_person_spr(P_LEFT, P_CHEWY);
+			setPersonSpr(P_LEFT, P_CHEWY);
 			_G(spieler).ScrollyStep = 1;
 			_G(spieler).PersonHide[P_CHEWY] = false;
 			_G(flags).AutoAniPlay = false;
@@ -244,8 +244,8 @@ void Room17::door_kommando(int16 mode) {
 			if (!_G(spieler).R17DoorKommand) {
 				_G(spieler).room_e_obj[36].Attribut = AUSGANG_OBEN;
 				_G(spieler).R17DoorKommand = true;
-				start_detail_wait(4, 1, ANI_FRONT);
-				stop_person(P_CHEWY);
+				startSetailWait(4, 1, ANI_FRONT);
+				stopPerson(P_CHEWY);
 				_G(det)->showStaticSpr(7);
 			}
 		} else {
@@ -263,7 +263,7 @@ void Room17::close_door() {
 		_G(spieler).R17DoorKommand = false;
 		_G(atds)->set_ats_str(144, _G(spieler).R17DoorKommand ? 1 : 0, ATS_DATA);
 		_G(det)->hideStaticSpr(7);
-		_G(det)->start_detail(4, 1, ANI_BACK);
+		_G(det)->startDetail(4, 1, ANI_BACK);
 	}
 }
 
@@ -277,10 +277,10 @@ int16 Room17::energie_hebel() {
 		if (is_cur_inventar(BECHER_VOLL_INV)) {
 			del_inventar(_G(spieler).AkInvent);
 			_G(spieler).R17HebelOk = true;
-			start_aad_wait(38, -1);
+			startAadWait(38, -1);
 			action_flag = true;
 		} else if (!_G(spieler).inv_cur) {
-			start_aad_wait(37, -1);
+			startAadWait(37, -1);
 			action_flag = true;
 		}
 
@@ -291,10 +291,10 @@ int16 Room17::energie_hebel() {
 		_G(spieler).R17EnergieOut ^= 1;
 
 		if (!_G(spieler).R17EnergieOut) {
-			_G(det)->start_detail(1, 255, ANI_FRONT);
+			_G(det)->startDetail(1, 255, ANI_FRONT);
 
 			for (int i = 0; i < 3; ++i)
-				_G(det)->start_detail(i + 6, 255, ANI_FRONT);
+				_G(det)->startDetail(i + 6, 255, ANI_FRONT);
 		}
 
 		_G(atds)->set_ats_str(142, _G(spieler).R17EnergieOut ? 1 : 0, ATS_DATA);
@@ -320,13 +320,13 @@ int16 Room17::get_oel() {
 		action_flag = true;
 		autoMove(4, P_CHEWY);
 		start_spz_wait(CH_EKEL, 3, false, P_CHEWY);
-		start_aad_wait(60, -1);
+		startAadWait(60, -1);
 	} else if (is_cur_inventar(BECHER_LEER_INV)) {
 		action_flag = true;
 		close_door();
 		autoMove(4, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(13, 1, ANI_FRONT);
+		startSetailWait(13, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		del_inventar(_G(spieler).AkInvent);
 		_G(obj)->addInventory(BECHER_VOLL_INV, &_G(room_blk));
diff --git a/engines/chewy/rooms/room18.cpp b/engines/chewy/rooms/room18.cpp
index d9209431436..5a9076f7a02 100644
--- a/engines/chewy/rooms/room18.cpp
+++ b/engines/chewy/rooms/room18.cpp
@@ -115,7 +115,7 @@ void Room18::entry() {
 	}
 
 	if (!_G(spieler).R18FirstEntry && !_G(spieler).R18Gitter) {
-		start_aad_wait(39, -1);
+		startAadWait(39, -1);
 		_G(spieler).R18FirstEntry = true;
 	}
 
@@ -129,22 +129,22 @@ bool Room18::timer(int16 t_nr, int16 ani_nr) {
 
 		if (t_nr == _G(timer_nr)[0]) {
 			_G(det)->hideStaticSpr(16);
-			start_detail_wait(10, 1, ANI_FRONT);
+			startSetailWait(10, 1, ANI_FRONT);
 			_G(det)->showStaticSpr(16);
 			_G(uhr)->resetTimer(_G(timer_nr)[0], 10);
 		} else if (t_nr == _G(timer_nr)[1]) {
 			hideCur();
 			_G(det)->hideStaticSpr(17);
-			start_detail_wait(9, 1, ANI_FRONT);
+			startSetailWait(9, 1, ANI_FRONT);
 			_G(det)->showStaticSpr(17);
 
 			if (!_G(spieler).R18SondeMoni) {
 				_G(spieler).R18SondeMoni = true;
-				start_detail_wait(2, 1, ANI_FRONT);
+				startSetailWait(2, 1, ANI_FRONT);
 				_G(det)->showStaticSpr(9);
-				start_detail_wait(4, 1, ANI_FRONT);
+				startSetailWait(4, 1, ANI_FRONT);
 				_G(det)->showStaticSpr(11);
-				wait_show_screen(50);
+				waitShowScreen(50);
 				_G(det)->hideStaticSpr(9);
 				_G(det)->hideStaticSpr(11);
 			} else {
@@ -163,7 +163,7 @@ bool Room18::timer(int16 t_nr, int16 ani_nr) {
 
 void Room18::gedAction(int index) {
 	if (!index && !_G(spieler).R18SurimyWurf) {
-		stop_person(P_CHEWY);
+		stopPerson(P_CHEWY);
 		autoMove(1, P_CHEWY);
 		start_aad(40, 0);
 	}
@@ -188,7 +188,7 @@ void Room18::monitor() {
 
 	int16 nr = 0;
 	if (_G(spieler).R18MoniSwitch) {
-		start_ani_block(2, ABLOCK21);
+		startAniBlock(2, ABLOCK21);
 		nr = (_G(spieler).R17EnergieOut) ? 2 : 1;
 	} else {
 		_G(det)->stop_detail(23);
@@ -206,14 +206,14 @@ int16 Room18::sonden_moni() {
 
 		hideCur();
 		autoMove(8, P_CHEWY);
-		start_detail_wait(3, 1, ANI_FRONT);
+		startSetailWait(3, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(10);
-		start_ani_block(3, ABLOCK20);
+		startAniBlock(3, ABLOCK20);
 
 		for (int16 i = 0; i < 3; i++)
 			_G(det)->showStaticSpr(i + 12);
 
-		wait_show_screen(40);
+		waitShowScreen(40);
 
 		for (int16 i = 0; i < 5; i++)
 			_G(det)->hideStaticSpr(i + 10);
@@ -244,19 +244,19 @@ int16 Room18::calc_surimy() {
 		_G(auto_mov_obj)[SURIMY_OBJ].Mode = true;
 
 		if (_G(spieler_vector)[P_CHEWY].Xypos[1] < 150) {
-			start_detail_frame(18, 1, ANI_FRONT, 8);
+			startDetailFrame(18, 1, ANI_FRONT, 8);
 
 			init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], _G(mov_phasen)[SURIMY_OBJ].Lines, (const MovLine *)SURIMY_MPKT3);
-			wait_detail(18);
+			waitDetail(18);
 		} else {
 			autoMove(1, P_CHEWY);
-			stop_person(P_CHEWY);
+			stopPerson(P_CHEWY);
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_detail_frame(17, 1, ANI_FRONT, 12);
+			startDetailFrame(17, 1, ANI_FRONT, 12);
 			_G(maus_links_click) = false;
 
 			init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], _G(mov_phasen)[SURIMY_OBJ].Lines, (const MovLine *)SURIMY_MPKT);
-			wait_detail(17);
+			waitDetail(17);
 		}
 
 		_G(spieler).PersonHide[P_CHEWY] = false;
@@ -264,20 +264,20 @@ int16 Room18::calc_surimy() {
 
 		_G(det)->setSetailPos(21, 392, 170);
 		_G(det)->setSetailPos(22, 447, 154);
-		start_detail_frame(21, 1, ANI_FRONT, 14);
-		_G(det)->start_detail(22, 1, ANI_FRONT);
-		wait_detail(21);
+		startDetailFrame(21, 1, ANI_FRONT, 14);
+		_G(det)->startDetail(22, 1, ANI_FRONT);
+		waitDetail(21);
 		_G(det)->setStaticPos(26, 392, 170, false, true);
 		_G(det)->showStaticSpr(26);
 
 		_G(det)->hideStaticSpr(24);
-		start_ani_block(2, ABLOCK22);
+		startAniBlock(2, ABLOCK22);
 		_G(det)->showStaticSpr(20);
 
 		for (int16 i = 0; i < 3; i++)
 			_G(det)->hideStaticSpr(i + 15);
 
-		start_ani_block(2, ABLOCK23);
+		startAniBlock(2, ABLOCK23);
 		_G(det)->showStaticSpr(18);
 		_G(det)->showStaticSpr(19);
 		_G(det)->hideStaticSpr(26);
@@ -290,14 +290,14 @@ int16 Room18::calc_surimy() {
 
 		_G(det)->setSetailPos(21, 143, 170);
 		_G(det)->setSetailPos(22, 198, 154);
-		start_detail_frame(21, 1, ANI_FRONT, 14);
-		_G(det)->start_detail(22, 1, ANI_FRONT);
-		wait_detail(21);
+		startDetailFrame(21, 1, ANI_FRONT, 14);
+		_G(det)->startDetail(22, 1, ANI_FRONT);
+		waitDetail(21);
 		_G(det)->setStaticPos(26, 143, 170, false, true);
 		_G(det)->showStaticSpr(26);
 
 		_G(det)->hideStaticSpr(25);
-		start_ani_block(2, ABLOCK24);
+		startAniBlock(2, ABLOCK24);
 		_G(det)->showStaticSpr(21);
 
 		_G(det)->hideStaticSpr(26);
@@ -348,23 +348,23 @@ short Room18::use_cart_moni() {
 
 		hideCur();
 		autoMove(9, P_CHEWY);
-		set_person_spr(P_LEFT, P_CHEWY);
+		setPersonSpr(P_LEFT, P_CHEWY);
 		start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
 		_G(spieler).R18CartTerminal ^= 1;
 
 		if (!_G(spieler).R18CartTerminal) {
 			_G(atds)->set_ats_str(147, TXT_MARK_LOOK, 0, ATS_DATA);
 			_G(det)->hideStaticSpr(23);
-			start_detail_wait(20, 1, ANI_BACK);
+			startSetailWait(20, 1, ANI_BACK);
 		} else {
 			_G(atds)->set_ats_str(147, TXT_MARK_LOOK, 1, ATS_DATA);
-			start_detail_wait(20, 1, ANI_FRONT);
+			startSetailWait(20, 1, ANI_FRONT);
 			_G(det)->showStaticSpr(23);
 
 			if (_G(spieler).R18CartFach) {
 				_G(spieler).R18CartSave = true;
 				_G(atds)->set_ats_str(CARTRIDGE_INV, TXT_MARK_LOOK, 1, INV_ATS_DATA);
-				start_aad_wait(120, -1);
+				startAadWait(120, -1);
 			}
 		}
 
diff --git a/engines/chewy/rooms/room21.cpp b/engines/chewy/rooms/room21.cpp
index cbc5e0b884c..c06f18a6c87 100644
--- a/engines/chewy/rooms/room21.cpp
+++ b/engines/chewy/rooms/room21.cpp
@@ -90,7 +90,7 @@ void Room21::calc_laser() {
 		_G(atds)->del_steuer_bit(133, ATS_AKTIV_BIT, ATS_DATA);
 	} else {
 		_G(spieler).R21Laser1Weg = false;
-		_G(det)->start_detail(3, 255, ANI_FRONT);
+		_G(det)->startDetail(3, 255, ANI_FRONT);
 		_G(atds)->del_steuer_bit(134, ATS_AKTIV_BIT, ATS_DATA);
 		_G(atds)->set_steuer_bit(133, ATS_AKTIV_BIT, ATS_DATA);
 	}
@@ -109,7 +109,7 @@ void Room21::calc_laser() {
 		_G(obj)->hide_sib(SIB_SEIL_R21);
 		_G(atds)->set_steuer_bit(129, ATS_AKTIV_BIT, ATS_DATA);
 		_G(spieler).R21Laser2Weg = false;
-		_G(det)->start_detail(4, 255, ANI_FRONT);
+		_G(det)->startDetail(4, 255, ANI_FRONT);
 		_G(atds)->del_steuer_bit(135, ATS_AKTIV_BIT, ATS_DATA);
 	}
 }
@@ -190,12 +190,12 @@ void Room21::chewy_kolli() {
 
 	if (kolli && !_G(flags).AutoAniPlay) {
 		const int16 tmp = _G(spieler_vector)[P_CHEWY].Count;
-		stop_person(P_CHEWY);
+		stopPerson(P_CHEWY);
 		_G(flags).AutoAniPlay = true;
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		int16 ani_nr = (_G(spieler_vector)[P_CHEWY].Xyvo[0] < 0) ? 10 : 11;
 		_G(det)->setSetailPos(ani_nr, _G(spieler_vector)[P_CHEWY].Xypos[0], _G(spieler_vector)[P_CHEWY].Xypos[1]);
-		start_detail_wait(ani_nr, 1, ANI_FRONT);
+		startSetailWait(ani_nr, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		_G(flags).AutoAniPlay = false;
 		_G(spieler_vector)[P_CHEWY].Count = tmp;
@@ -216,9 +216,9 @@ void Room21::salto() {
 				_G(spieler_vector)[P_CHEWY].Xypos[1]);
 		}
 
-		start_ani_block(3, ABLOCK19);
+		startAniBlock(3, ABLOCK19);
 		_G(spieler).PersonHide[P_CHEWY] = false;
-		start_aad_wait(36, -1);
+		startAadWait(36, -1);
 		_G(flags).AutoAniPlay = false;
 	}
 }
@@ -232,7 +232,7 @@ void Room21::use_gitter_energie() {
 
 	switch_room(17);
 	_G(det)->hideStaticSpr(5);
-	start_detail_wait(9, 1, ANI_FRONT);
+	startSetailWait(9, 1, ANI_FRONT);
 	_G(spieler).R17GitterWeg = true;
 	_G(spieler).PersonHide[P_CHEWY] = false;
 }
@@ -245,11 +245,11 @@ int16 Room21::use_fenster() {
 		_G(flags).AutoAniPlay = true;
 		_G(spieler).R18Gitter = true;
 		autoMove(13, P_CHEWY);
-		set_person_pos(541, 66, P_CHEWY, P_LEFT);
+		setPersonPos(541, 66, P_CHEWY, P_LEFT);
 		switch_room(18);
 
 		if (!_G(spieler).R18FirstEntry) {
-			start_aad_wait(39, -1);
+			startAadWait(39, -1);
 			_G(spieler).R18FirstEntry = true;
 		}
 
diff --git a/engines/chewy/rooms/room22.cpp b/engines/chewy/rooms/room22.cpp
index 003e33b5f26..bbb05e9fe12 100644
--- a/engines/chewy/rooms/room22.cpp
+++ b/engines/chewy/rooms/room22.cpp
@@ -85,7 +85,7 @@ int16 Room22::chewy_amboss() {
 
 		autoMove(5, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(1, 1, ANI_FRONT);
+		startSetailWait(1, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		autoMove(2, P_CHEWY);
 		_G(flags).NoPalAfterFlc = false;
@@ -106,7 +106,7 @@ void Room22::bork(int16 t_nr) {
 		if (!_G(spieler).R22BorkPlatt) {
 			hideCur();
 			start_spz(CH_TALK2, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(10, -1);
+			startAadWait(10, -1);
 			autoMove(3, P_CHEWY);
 			_G(auto_obj) = 1;
 			_G(mov_phasen)[BORK_OBJ].AtsText = 0;
@@ -140,7 +140,7 @@ void Room22::bork_walk1() {
 	init_auto_obj(BORK_OBJ, &BORK_PHASEN[0][0], _G(mov_phasen)[BORK_OBJ].Lines, (const MovLine *)BORK_MPKT);
 	wait_auto_obj(BORK_OBJ);
 
-	start_detail_wait(2, 1, ANI_FRONT);
+	startSetailWait(2, 1, ANI_FRONT);
 
 	_G(mov_phasen)[BORK_OBJ].Repeat = 1;
 	init_auto_obj(BORK_OBJ, &BORK_PHASEN[0][0], _G(mov_phasen)[BORK_OBJ].Lines, (const MovLine *)BORK_MPKT1);
@@ -164,9 +164,9 @@ void Room22::get_bork() {
 		autoMove(4, P_CHEWY);
 		_G(det)->hideStaticSpr(4);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_ani_block(2, ABLOCK14);
-		set_person_pos(171, 120, P_CHEWY, P_LEFT);
-		start_aad_wait(11, -1);
+		startAniBlock(2, ABLOCK14);
+		setPersonPos(171, 120, P_CHEWY, P_LEFT);
+		startAadWait(11, -1);
 		_G(det)->stop_detail(3);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		_G(atds)->set_steuer_bit(81, ATS_AKTIV_BIT, ATS_DATA);
diff --git a/engines/chewy/rooms/room23.cpp b/engines/chewy/rooms/room23.cpp
index 01a51856d7d..c994ea22b57 100644
--- a/engines/chewy/rooms/room23.cpp
+++ b/engines/chewy/rooms/room23.cpp
@@ -38,7 +38,7 @@ static const AniBlock ABLOCK15[4] = {
 
 void Room23::entry() {
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	set_person_pos(135, 69, P_CHEWY, -1);
+	setPersonPos(135, 69, P_CHEWY, -1);
 }
 
 void Room23::cockpit() {
@@ -59,27 +59,27 @@ int16 Room23::start_gleiter() {
 	if (!_G(spieler).inv_cur) {
 		action_flag = true;
 		if (!_G(spieler).R23FluxoFlex)
-			start_aad_wait(23, -1);
+			startAadWait(23, -1);
 		else {
 			bool start_ok = true;
 
 			if (_G(spieler).R23GleiterExit == 16) {
 				if (!_G(spieler).R16F5Exit) {
 					start_ok = false;
-					start_aad_wait(35, -1);
+					startAadWait(35, -1);
 				} else if (!_G(spieler).R23Cartridge || !_G(spieler).R18CartSave) {
 					start_ok = false;
-					start_aad_wait(41, -1);
+					startAadWait(41, -1);
 				} else if (!_G(spieler).R17EnergieOut) {
 					start_ok = false;
-					start_aad_wait(300, -1);
+					startAadWait(300, -1);
 				}
 			}
 
 			if (start_ok) {
 				hideCur();
-				start_ani_block(4, ABLOCK15);
-				wait_show_screen(30);
+				startAniBlock(4, ABLOCK15);
+				waitShowScreen(30);
 
 				for (int16 i = 0; i < 4; i++)
 					_G(det)->stop_detail(i);
@@ -92,15 +92,15 @@ int16 Room23::start_gleiter() {
 					register_cutscene(7);
 					_G(out)->cls();
 					_G(spieler).R23GleiterExit = 16;
-					set_person_pos(126, 110, P_CHEWY, P_RIGHT);
+					setPersonPos(126, 110, P_CHEWY, P_RIGHT);
 
 					switch_room(_G(spieler).R23GleiterExit);
 					start_spz_wait(CH_WONDER1, 2, false, P_CHEWY);
 					start_spz(CH_TALK2, 255, ANI_FRONT, P_CHEWY);
 
 					_G(spieler).DelaySpeed = 10;
-					start_aad_wait(59, -1);
-					stop_person(P_CHEWY);
+					startAadWait(59, -1);
+					stopPerson(P_CHEWY);
 					_G(maus_links_click) = false;
 
 				} else if (_G(spieler).R23GleiterExit == 16) {
@@ -134,7 +134,7 @@ void Room23::use_cartridge() {
 	if (_G(spieler).R18CartSave) {
 		_G(atds)->del_steuer_bit(171, ATS_AKTIV_BIT, ATS_DATA);
 		_G(atds)->set_ats_str(111, 2, ATS_DATA);
-		start_detail_wait(4, 1, ANI_FRONT);
+		startSetailWait(4, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(3);
 	} else {
 		_G(atds)->set_ats_str(111, 1, ATS_DATA);
diff --git a/engines/chewy/rooms/room24.cpp b/engines/chewy/rooms/room24.cpp
index 3d6ff9238fa..87401e96bcb 100644
--- a/engines/chewy/rooms/room24.cpp
+++ b/engines/chewy/rooms/room24.cpp
@@ -38,7 +38,7 @@ static const uint8 KRISTALL_SPR[3][3] = {
 void Room24::entry() {
 	_G(flags).MainInput = false;
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	set_person_pos(0, 0, P_CHEWY, -1);
+	setPersonPos(0, 0, P_CHEWY, -1);
 	_G(spieler).scrollx = 0;
 	_G(spieler).scrolly = 0;
 	_G(curblk).sprite = _G(room_blk).DetImage;
@@ -57,7 +57,7 @@ void Room24::entry() {
 
 	for (int16 i = 0; i < 3; i++) {
 		if (KRISTALL_SPR[i][_G(spieler).R24Hebel[i]] == 20)
-			_G(det)->start_detail(5 + i * 4, 255, ANI_BACK);
+			_G(det)->startDetail(5 + i * 4, 255, ANI_BACK);
 	}
 }
 
@@ -65,7 +65,7 @@ void Room24::xit() {
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	_G(menu_item) = CUR_WALK;
 	cursorChoice(_G(menu_item));
-	set_person_pos(263, 144, P_CHEWY, -1);
+	setPersonPos(263, 144, P_CHEWY, -1);
 	_G(spieler).scrollx = 88;
 	_G(maus_links_click) = false;
 	_G(flags).MainInput = true;
@@ -89,7 +89,7 @@ void Room24::use_hebel(int16 txt_nr) {
 		_G(spieler).R16F5Exit = true;
 		g_engine->_sound->playSound(1, 0);
 		g_engine->_sound->stopSound(1);
-		_G(det)->start_detail(1, 1, ANI_FRONT);
+		_G(det)->startDetail(1, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(10);
 		_G(atds)->set_ats_str(164, TXT_MARK_NAME, 1, ATS_DATA);
 
@@ -97,7 +97,7 @@ void Room24::use_hebel(int16 txt_nr) {
 		_G(det)->hideStaticSpr(10);
 		g_engine->_sound->playSound(1, 1);
 		g_engine->_sound->stopSound(0);
-		_G(det)->start_detail(1, 1, ANI_BACK);
+		_G(det)->startDetail(1, 1, ANI_BACK);
 		_G(spieler).R16F5Exit = false;
 		_G(atds)->set_ats_str(164, TXT_MARK_NAME, 0, ATS_DATA);
 	}
@@ -132,17 +132,17 @@ void Room24::calc_animation(int16 kristall_nr) {
 			g_engine->_sound->playSound(ani_nr + kristall_nr * 4, 0);
 			g_engine->_sound->stopSound(0);
 			_G(det)->hideStaticSpr(_G(spieler).R24KristallLast[kristall_nr] + kristall_nr * 2);
-			start_detail_wait(ani_nr + kristall_nr * 4, 1, ANI_BACK);
-			start_detail_wait(6 + kristall_nr * 4, 1, ANI_BACK);
-			_G(det)->start_detail(5 + kristall_nr * 4, 255, ANI_BACK);
+			startSetailWait(ani_nr + kristall_nr * 4, 1, ANI_BACK);
+			startSetailWait(6 + kristall_nr * 4, 1, ANI_BACK);
+			_G(det)->startDetail(5 + kristall_nr * 4, 255, ANI_BACK);
 
 		} else if (_G(spieler).R24KristallLast[kristall_nr] == 20) {
 			int16 ani_nr = KRISTALL_SPR[kristall_nr][_G(spieler).R24Hebel[kristall_nr]] == 13 ? 7 : 8;
 			g_engine->_sound->stopSound(0);
 			g_engine->_sound->playSound(5 + ani_nr + kristall_nr * 4, 0);
 			_G(det)->stop_detail(5 + kristall_nr * 4);
-			start_detail_wait(6 + kristall_nr * 4, 1, ANI_FRONT);
-			start_detail_wait(ani_nr + kristall_nr * 4, 1, ANI_FRONT);
+			startSetailWait(6 + kristall_nr * 4, 1, ANI_FRONT);
+			startSetailWait(ani_nr + kristall_nr * 4, 1, ANI_FRONT);
 		}
 
 		showCur();
diff --git a/engines/chewy/rooms/room25.cpp b/engines/chewy/rooms/room25.cpp
index d331a9af801..0ac9e288d47 100644
--- a/engines/chewy/rooms/room25.cpp
+++ b/engines/chewy/rooms/room25.cpp
@@ -48,7 +48,7 @@ void Room25::entry() {
 		g_engine->_sound->playSound(0, 0);
 
 		for (int i = 0; i < 9; ++i)
-			_G(det)->start_detail(i, 255, ANI_FRONT);
+			_G(det)->startDetail(i, 255, ANI_FRONT);
 	}
 
 	if (!_G(spieler).R29Schlauch2) {
@@ -75,14 +75,14 @@ void Room25::entry() {
 		flic_cut(FCUT_029);
 		g_engine->_sound->playSound(0, 0);
 		_G(fx_blend) = BLEND_NONE;
-		set_person_pos(219, 141, P_CHEWY, P_RIGHT);
+		setPersonPos(219, 141, P_CHEWY, P_RIGHT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		start_spz(CH_TALK11, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(64, -1);
+		startAadWait(64, -1);
 		showCur();
 
 	} else if (_G(spieler).R25GleiterExit && !_G(flags).LoadGame) {
-		set_person_pos(127, 122, P_CHEWY, P_LEFT);
+		setPersonPos(127, 122, P_CHEWY, P_LEFT);
 
 		if (!_G(spieler).R25SurimyGo) {
 			_G(spieler).R25SurimyGo = 1;
@@ -121,7 +121,7 @@ int16 Room25::gleiter_loesch() {
 			del_inventar(_G(spieler).AkInvent);
 			_G(obj)->addInventory(MILCH_WAS_INV, &_G(room_blk));
 			inventory_2_cur(MILCH_WAS_INV);
-			start_aad_wait(253, -1);
+			startAadWait(253, -1);
 		}
 	}
 
@@ -159,10 +159,10 @@ void Room25::xit_gleiter() {
 		_G(auto_mov_obj)[SURIMY_OBJ].Mode = true;
 		init_auto_obj(SURIMY_OBJ, &SURIMY_PHASEN[0][0], 2, (const MovLine *)SURIMY_MPKT);
 		_G(fx_blend) = BLEND1;
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 
 		start_spz(CH_TALK12, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(65, -1);
+		startAadWait(65, -1);
 		_G(fx_blend) = BLEND_NONE;
 		wait_auto_obj(SURIMY_OBJ);
 		_G(auto_obj) = 0;
diff --git a/engines/chewy/rooms/room27.cpp b/engines/chewy/rooms/room27.cpp
index d63d69ee63e..1b35fc6c90f 100644
--- a/engines/chewy/rooms/room27.cpp
+++ b/engines/chewy/rooms/room27.cpp
@@ -47,15 +47,15 @@ void Room27::xit(int16 eib_nr) {
 
 	if (_G(spieler).PersonRoomNr[P_HOWARD] == 27) {
 		if (eib_nr == 55) {
-			start_aad_wait(175, -1);
+			startAadWait(175, -1);
 			_G(room)->set_timer_status(0, TIMER_STOP);
 			_G(det)->del_static_ani(0);
-			start_detail_wait(2, 1, ANI_FRONT);
+			startSetailWait(2, 1, ANI_FRONT);
 			_G(spieler).PersonRoomNr[P_HOWARD] = 28;
 			_G(spieler_mi)[P_HOWARD].Id = HOWARD_OBJ;
 		} else if (_G(spieler).R27HowardGed < 3 && eib_nr != -1) {
 			++_G(spieler).R27HowardGed;
-			start_aad_wait(174, -1);
+			startAadWait(174, -1);
 		}
 	}
 
@@ -68,7 +68,7 @@ void Room27::get_surimy() {
 	autoMove(4, P_CHEWY);
 
 	if (_G(spieler).PersonRoomNr[P_HOWARD] == 27) {
-		start_aad_wait(171, -1);
+		startAadWait(171, -1);
 	}
 
 	showCur();
@@ -78,7 +78,7 @@ void Room27::get_surimy() {
 void Room27::talk_howard() {
 	hideCur();
 	autoMove(4, P_CHEWY);
-	start_aad_wait(173, -1);
+	startAadWait(173, -1);
 	showCur();
 }
 
diff --git a/engines/chewy/rooms/room28.cpp b/engines/chewy/rooms/room28.cpp
index d46e8ec5d3f..f0d4241bf4c 100644
--- a/engines/chewy/rooms/room28.cpp
+++ b/engines/chewy/rooms/room28.cpp
@@ -61,16 +61,16 @@ void Room28::entry(int16 eib_nr) {
 			case 55:
 				if (!_G(spieler).R28EntryHaus) {
 					_G(spieler).R28EntryHaus = true;
-					set_person_pos(232, 100, P_HOWARD, P_RIGHT);
+					setPersonPos(232, 100, P_HOWARD, P_RIGHT);
 					autoMove(3, P_HOWARD);
 					goAutoXy(320, _G(spieler_vector)[P_HOWARD].Xypos[1], P_HOWARD, ANI_WAIT);
-					start_aad_wait(176, -1);
+					startAadWait(176, -1);
 				} else if (_G(spieler).R31SurFurz && !_G(spieler).R28RKuerbis) {
 					_G(spieler).R28RKuerbis = true;
 					_G(spieler).ScrollxStep = 2;
 					autoMove(6, P_CHEWY);
-					wait_show_screen(10);
-					start_aad_wait(194, -1);
+					waitShowScreen(10);
+					startAadWait(194, -1);
 					_G(spieler).room_e_obj[62].Attribut = 255;
 					_G(atds)->set_ats_str(208, 1, ATS_DATA);
 					_G(flags).NoScroll = true;
@@ -82,7 +82,7 @@ void Room28::entry(int16 eib_nr) {
 					if (!_G(spieler).R40TeilKarte) {
 						_G(out)->ausblenden(0);
 						_G(out)->set_teilpalette(_G(pal), 255, 1);
-						start_aad_wait(607, -1);
+						startAadWait(607, -1);
 						_G(fx_blend) = BLEND3;
 					}
 
@@ -91,8 +91,8 @@ void Room28::entry(int16 eib_nr) {
 					if (_G(spieler).R40TeilKarte) {
 						haendler();
 					} else {
-						wait_show_screen(60);
-						start_aad_wait(195, -1);
+						waitShowScreen(60);
+						startAadWait(195, -1);
 					}
 
 					_G(spieler).ScrollxStep = 2;
@@ -112,17 +112,17 @@ void Room28::entry(int16 eib_nr) {
 					_G(spieler).room_e_obj[69].Attribut = 255;
 					load_chewy_taf(CHEWY_NORMAL);
 
-					set_person_pos(480, 118, P_HOWARD, P_LEFT);
-					set_person_pos(440, 146, P_CHEWY, P_RIGHT);
+					setPersonPos(480, 118, P_HOWARD, P_LEFT);
+					setPersonPos(440, 146, P_CHEWY, P_RIGHT);
 					_G(fx_blend) = BLEND_NONE;
 					_G(flags).ExitMov = false;
 					_G(spieler_mi)[P_HOWARD].Mode = true;
 					goAutoXy(420, 113, P_HOWARD, ANI_WAIT);
 					_G(spieler_mi)[P_HOWARD].Mode = false;
-					set_person_pos(440, 146, P_CHEWY, P_LEFT);
-					start_aad_wait(193, -1);
+					setPersonPos(440, 146, P_CHEWY, P_LEFT);
+					startAadWait(193, -1);
 				} else {
-					set_person_pos(480, 100, P_HOWARD, P_LEFT);
+					setPersonPos(480, 100, P_HOWARD, P_LEFT);
 					goAutoXy(420, 113, P_HOWARD, ANI_GO);
 					_G(flags).ExitMov = false;
 					autoMove(6, P_CHEWY);
@@ -146,7 +146,7 @@ void Room28::xit(int16 eib_nr) {
 	if (_G(spieler).PersonRoomNr[P_HOWARD] == 28 && eib_nr == 69) {
 		_G(SetUpScreenFunc) = nullptr;
 		if (!_G(spieler).R28ExitTown) {
-			start_aad_wait(178, -1);
+			startAadWait(178, -1);
 			_G(spieler).R28ExitTown = true;
 		}
 
@@ -172,30 +172,30 @@ void Room28::haendler() {
 	_G(spieler).room_e_obj[69].Attribut = AUSGANG_OBEN;
 	load_chewy_taf(CHEWY_PUMPKIN);
 
-	set_person_pos(480, 113, P_HOWARD, P_RIGHT);
-	set_person_pos(490, 146, P_CHEWY, P_RIGHT);
+	setPersonPos(480, 113, P_HOWARD, P_RIGHT);
+	setPersonPos(490, 146, P_CHEWY, P_RIGHT);
 	_G(det)->set_static_ani(2, -1);
 
 	while (_G(spieler).scrollx < 300) {
 		SHOULD_QUIT_RETURN;
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 	}
 
-	start_aad_wait(196, -1);
+	startAadWait(196, -1);
 	_G(det)->del_static_ani(2);
 	_G(det)->set_static_ani(3, -1);
-	start_aad_wait(197, -1);
+	startAadWait(197, -1);
 	_G(det)->del_static_ani(3);
 	_G(det)->set_static_ani(4, -1);
-	start_aad_wait(198, -1);
+	startAadWait(198, -1);
 	_G(SetUpScreenFunc) = setup_func;
 	autoMove(4, P_CHEWY);
 	hideCur();
 	autoMove(3, P_CHEWY);
-	set_person_spr(P_RIGHT, P_CHEWY);
+	setPersonSpr(P_RIGHT, P_CHEWY);
 	_G(det)->del_static_ani(4);
-	wait_show_screen(28);
-	start_aad_wait(199, -1);
+	waitShowScreen(28);
+	startAadWait(199, -1);
 	invent_2_slot(DOLLAR175_INV);
 }
 
@@ -231,7 +231,7 @@ void Room28::use_surimy() {
 
 	_G(obj)->calc_all_static_detail();
 	start_spz(ani_nr, 255, ANI_FRONT, P_CHEWY);
-	start_aad_wait(dia_nr, -1);
+	startAadWait(dia_nr, -1);
 	_G(flags).NoScroll = false;
 	showCur();
 }
@@ -255,7 +255,7 @@ void Room28::set_pump() {
 				++_G(spieler).R28PumpTxt1;
 			}
 
-			start_detail_wait(tmp, 1, ANI_FRONT);
+			startSetailWait(tmp, 1, ANI_FRONT);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 
 			load_chewy_taf(CHEWY_PUMPKIN);
@@ -268,11 +268,11 @@ void Room28::set_pump() {
 			}
 
 			if (_G(spieler).PersonRoomNr[P_HOWARD] == 28 && _G(spieler).R28PumpTxt < 3) {
-				stop_person(P_HOWARD);
+				stopPerson(P_HOWARD);
 				_G(SetUpScreenFunc) = nullptr;
 				g_engine->_sound->waitForSpeechToFinish();
 
-				start_aad_wait(177, -1);
+				startAadWait(177, -1);
 				_G(SetUpScreenFunc) = setup_func;
 				++_G(spieler).R28PumpTxt;
 			}
@@ -280,7 +280,7 @@ void Room28::set_pump() {
 			_G(flags).AutoAniPlay = false;
 		}
 	} else {
-		start_ats_wait(20, TXT_MARK_USE, 14, INV_USE_DEF);
+		startAtsWait(20, TXT_MARK_USE, 14, INV_USE_DEF);
 	}
 
 	showCur();
@@ -291,12 +291,12 @@ void Room28::get_pump() {
 	if (_G(spieler).R28ChewyPump) {
 		hideCur();
 
-		stop_person(P_CHEWY);
+		stopPerson(P_CHEWY);
 		_G(spieler).R28ChewyPump = false;
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		int16 tmp = (_G(person_end_phase)[P_CHEWY] == P_RIGHT) ? 1 : 0;
 		_G(det)->setSetailPos(tmp, _G(spieler_vector)[P_CHEWY].Xypos[0], _G(spieler_vector)[P_CHEWY].Xypos[1]);
-		start_detail_wait(tmp, 1, ANI_BACK);
+		startSetailWait(tmp, 1, ANI_BACK);
 
 		invent_2_slot(K_MASKE_INV);
 		_G(atds)->set_ats_str(209, 0, ATS_DATA);
@@ -306,7 +306,7 @@ void Room28::get_pump() {
 
 		if (_G(spieler).R28PumpTxt1 < 3) {
 			start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(138, -1);
+			startAadWait(138, -1);
 		}
 
 		showCur();
@@ -327,7 +327,7 @@ int16 Room28::use_breifkasten() {
 		_G(det)->showStaticSpr(7);
 		autoMove(8, P_CHEWY);
 		start_spz(CH_LGET_O, 1, ANI_FRONT, P_CHEWY);
-		start_aad_wait(179, -1);
+		startAadWait(179, -1);
 		_G(atds)->set_ats_str(206, 0, ATS_DATA);
 		showCur();
 		invent_2_slot(MANUSKRIPT_INV);
diff --git a/engines/chewy/rooms/room29.cpp b/engines/chewy/rooms/room29.cpp
index f12ad7e7f23..95b367aa131 100644
--- a/engines/chewy/rooms/room29.cpp
+++ b/engines/chewy/rooms/room29.cpp
@@ -82,7 +82,7 @@ int16 Room29::use_pumpe() {
 			del_inventar(SCHLAUCH_INV);
 		} else if (!_G(spieler).inv_cur) {
 			action_flag = true;
-			start_aad_wait(62, -1);
+			startAadWait(62, -1);
 		}
 
 		showCur();
@@ -117,7 +117,7 @@ bool Room29::use_schlauch() {
 		start_spz_wait(CH_LGET_U, 1, false, P_CHEWY);
 		_G(det)->hideStaticSpr(7);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(4, 1, ANI_FRONT);
+		startSetailWait(4, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(8);
 		_G(det)->showStaticSpr(10);
 		_G(atds)->del_steuer_bit(219, ATS_AKTIV_BIT, ATS_DATA);
@@ -126,7 +126,7 @@ bool Room29::use_schlauch() {
 		_G(spieler).R29Schlauch1 = false;
 		_G(spieler).R29Schlauch2 = true;
 		del_inventar(PUMPE_INV);
-		set_person_pos(308, 105, P_CHEWY, P_RIGHT);
+		setPersonPos(308, 105, P_CHEWY, P_RIGHT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		showCur();
 	}
@@ -141,11 +141,11 @@ void Room29::schlitz_sitz() {
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		_G(det)->hideStaticSpr(4);
 		_G(det)->showStaticSpr(11);
-		start_ani_block(3, ABLOCK26);
+		startAniBlock(3, ABLOCK26);
 		_G(det)->showStaticSpr(9);
 		_G(det)->hideStaticSpr(11);
-		_G(det)->start_detail(2, 255, ANI_FRONT);
-		start_aad_wait(63, -1);
+		_G(det)->startDetail(2, 255, ANI_FRONT);
+		startAadWait(63, -1);
 
 		_G(det)->stop_detail(2);
 		_G(atds)->del_steuer_bit(212, ATS_AKTIV_BIT, ATS_DATA);
@@ -166,10 +166,10 @@ int16 Room29::zaun_sprung() {
 		action_flag = true;
 		autoMove(3, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_frame(3, 1, ANI_FRONT, 7);
+		startDetailFrame(3, 1, ANI_FRONT, 7);
 		_G(det)->hideStaticSpr(9);
-		start_ani_block(5, ABLOCK27);
-		set_up_screen(DO_SETUP);
+		startAniBlock(5, ABLOCK27);
+		setupScreen(DO_SETUP);
 
 		showCur();
 		switch_room(37);
diff --git a/engines/chewy/rooms/room31.cpp b/engines/chewy/rooms/room31.cpp
index 290bf37ec1c..aaac3d2005d 100644
--- a/engines/chewy/rooms/room31.cpp
+++ b/engines/chewy/rooms/room31.cpp
@@ -62,7 +62,7 @@ void Room31::surimy_go() {
 			_G(auto_mov_obj)[SURIMY_OBJ].Mode = true;
 			init_auto_obj(SURIMY_OBJ, &SURIMY_TAF19_PHASEN[0][0], 2, (const MovLine *)SURIMY_MPKT);
 			start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(157, -1);
+			startAadWait(157, -1);
 			wait_auto_obj(SURIMY_OBJ);
 			_G(auto_obj) = 0;
 			showCur();
@@ -160,7 +160,7 @@ int16 Room31::use_topf() {
 					_G(spieler).R31Wasser = true;
 					autoMove(1, P_CHEWY);
 					_G(spieler).PersonHide[P_CHEWY] = true;
-					start_ani_block(3, ABLOCK30);
+					startAniBlock(3, ABLOCK30);
 					_G(spieler).PersonHide[P_CHEWY] = false;
 					del_inventar(_G(spieler).AkInvent);
 					_G(obj)->addInventory(MILCH_LEER_INV, &_G(room_blk));
@@ -206,7 +206,7 @@ int16 Room31::use_topf() {
 	
 	if (dia_nr != -1) {
 		start_spz(ani_nr, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(dia_nr, -1);
+		startAadWait(dia_nr, -1);
 		action_flag = true;
 	}
 
diff --git a/engines/chewy/rooms/room32.cpp b/engines/chewy/rooms/room32.cpp
index 084f946ae3f..a8360aaf6fa 100644
--- a/engines/chewy/rooms/room32.cpp
+++ b/engines/chewy/rooms/room32.cpp
@@ -49,22 +49,22 @@ int16 Room32::use_howard() {
 			flic_cut(FCUT_043);
 			_G(atds)->set_steuer_bit(230, ATS_AKTIV_BIT, ATS_DATA);
 			start_spz(CH_TALK12, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(75, -1);
-			wait_show_screen(5);
+			startAadWait(75, -1);
+			waitShowScreen(5);
 			autoMove(5, P_CHEWY);
-			wait_show_screen(10);
+			waitShowScreen(10);
 			start_spz(CH_TALK12, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(125, -1);
-			wait_show_screen(10);
+			startAadWait(125, -1);
+			waitShowScreen(10);
 
 			_G(det)->hideStaticSpr(0);
-			start_detail_frame(0, 1, ANI_FRONT, 9);
-			start_detail_wait(1, 1, ANI_BACK);
+			startDetailFrame(0, 1, ANI_FRONT, 9);
+			startSetailWait(1, 1, ANI_BACK);
 			_G(det)->showStaticSpr(7);
 			_G(det)->showStaticSpr(6);
-			wait_show_screen(20);
+			waitShowScreen(20);
 			_G(det)->hideStaticSpr(7);
-			start_detail_wait(1, 1, ANI_FRONT);
+			startSetailWait(1, 1, ANI_FRONT);
 			start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
 			ani_nr = CH_TALK3;
 			dia_nr = 164;
@@ -82,7 +82,7 @@ int16 Room32::use_howard() {
 
 	if (dia_nr) {
 		start_spz(ani_nr, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(dia_nr, -1);
+		startAadWait(dia_nr, -1);
 		action_flag = true;
 	}
 
@@ -144,7 +144,7 @@ void Room32::use_schreibmaschine() {
 	}
 
 	start_spz(ani_nr, 255, ANI_FRONT, P_CHEWY);
-	start_aad_wait(dia_nr, -1);
+	startAadWait(dia_nr, -1);
 	showCur();
 }
 
@@ -160,7 +160,7 @@ int16 Room32::get_script() {
 		_G(det)->hideStaticSpr(5);
 		_G(atds)->set_ats_str(203, 0, ATS_DATA);
 		start_spz(CH_TALK3, 1, ANI_FRONT, P_CHEWY);
-		start_aad_wait(91, -1);
+		startAadWait(91, -1);
 	}
 
 	return action_flag;
diff --git a/engines/chewy/rooms/room33.cpp b/engines/chewy/rooms/room33.cpp
index db29cf0cb20..bed940d4d66 100644
--- a/engines/chewy/rooms/room33.cpp
+++ b/engines/chewy/rooms/room33.cpp
@@ -56,7 +56,7 @@ void Room33::surimy_go() {
 			_G(auto_mov_obj)[SURIMY_OBJ].Mode = true;
 			init_auto_obj(SURIMY_OBJ, &SURIMY_TAF19_PHASEN[0][0], 2, (const MovLine *)SURIMY_MPKT);
 			start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(158, -1);
+			startAadWait(158, -1);
 			wait_auto_obj(SURIMY_OBJ);
 			_G(auto_obj) = 0;
 			showCur();
@@ -134,9 +134,9 @@ void Room33::use_maschine() {
 
 			if (action) {
 				_G(spieler).PersonHide[P_CHEWY] = true;
-				start_detail_wait(0, 1, ANI_FRONT);
+				startSetailWait(0, 1, ANI_FRONT);
 				_G(spieler).PersonHide[P_CHEWY] = false;
-				set_person_pos(128, 65, P_CHEWY, P_LEFT);
+				setPersonPos(128, 65, P_CHEWY, P_LEFT);
 				start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
 				hocker = true;
 				del_inventar(_G(spieler).AkInvent);
@@ -158,27 +158,27 @@ void Room33::use_maschine() {
 		}
 
 		start_spz(ani_nr, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(dia_nr, -1);
+		startAadWait(dia_nr, -1);
 
 		if (_G(spieler).R33MunterOk) {
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_detail_wait(2, 1, ANI_FRONT);
+			startSetailWait(2, 1, ANI_FRONT);
 			flic_cut(FCUT_031);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 			start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(71, -1);
+			startAadWait(71, -1);
 			_G(atds)->del_steuer_bit(225, ATS_AKTIV_BIT, ATS_DATA);
 		}
 
 		if (hocker) {
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_detail_wait(1, 1, ANI_FRONT);
-			set_person_pos(64, 100, P_CHEWY, P_LEFT);
+			startSetailWait(1, 1, ANI_FRONT);
+			setPersonPos(64, 100, P_CHEWY, P_LEFT);
 		}
 
 		_G(spieler).PersonHide[P_CHEWY] = false;
 	} else {
-		start_aad_wait(70, -1);
+		startAadWait(70, -1);
 	}
 
 	showCur();
@@ -208,7 +208,7 @@ int16 Room33::get_munter() {
 		_G(atds)->set_steuer_bit(225, ATS_AKTIV_BIT, ATS_DATA);
 		_G(det)->hideStaticSpr(3);
 		start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(72, -1);
+		startAadWait(72, -1);
 		showCur();
 	}
 
diff --git a/engines/chewy/rooms/room34.cpp b/engines/chewy/rooms/room34.cpp
index 086629df6bd..b1b4865ea96 100644
--- a/engines/chewy/rooms/room34.cpp
+++ b/engines/chewy/rooms/room34.cpp
@@ -54,7 +54,7 @@ bool Room34::use_kuehlschrank() {
 			switch_room(34);
 		}
 
-		set_person_pos(160, 70, P_CHEWY, -1);
+		setPersonPos(160, 70, P_CHEWY, -1);
 	}
 
 	return result;
@@ -62,7 +62,7 @@ bool Room34::use_kuehlschrank() {
 
 void Room34::xit_kuehlschrank() {
 	_G(spieler).PersonHide[P_CHEWY] = false;
-	set_person_pos(54, 111, P_CHEWY, -1);
+	setPersonPos(54, 111, P_CHEWY, -1);
 	switch_room(33);
 	_G(flags).ChewyDontGo = false;
 	_G(maus_links_click) = false;
diff --git a/engines/chewy/rooms/room35.cpp b/engines/chewy/rooms/room35.cpp
index d43175ee687..380a56317a3 100644
--- a/engines/chewy/rooms/room35.cpp
+++ b/engines/chewy/rooms/room35.cpp
@@ -57,11 +57,11 @@ int16 Room35::schublade() {
 			autoMove(3, P_CHEWY);
 			_G(spieler).R35Falle = true;
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_ani_block(2, ABLOCK28);
+			startAniBlock(2, ABLOCK28);
 			_G(spieler).PersonHide[P_CHEWY] = false;
-			set_person_pos(33, 90, P_CHEWY, P_LEFT);
+			setPersonPos(33, 90, P_CHEWY, P_LEFT);
 			start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(93, -1);
+			startAadWait(93, -1);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 			_G(atds)->set_ats_str(234, 2, ATS_DATA);
 		}
@@ -83,7 +83,7 @@ int16 Room35::use_cat() {
 			start_spz_wait(CH_TRANS, 1, false, P_CHEWY);
 			flic_cut(FCUT_045);
 			start_spz(CH_TRANS, 1, ANI_FRONT, P_CHEWY);
-			start_aad_wait(94, -1);
+			startAadWait(94, -1);
 		} else if (is_cur_inventar(PUTENKEULE_INV)) {
 			action_flag = true;
 			disable_timer();
@@ -93,22 +93,22 @@ int16 Room35::use_cat() {
 			del_inventar(_G(spieler).AkInvent);
 			_G(det)->stop_detail(0);
 			_G(det)->del_static_ani(0);
-			start_detail_wait(1, 1, ANI_FRONT);
-			_G(det)->start_detail(2, 1, ANI_FRONT);
-			start_detail_wait(3, 1, ANI_FRONT);
+			startSetailWait(1, 1, ANI_FRONT);
+			_G(det)->startDetail(2, 1, ANI_FRONT);
+			startSetailWait(3, 1, ANI_FRONT);
 			_G(obj)->show_sib(SIB_KNOCHEN_R35);
 			_G(obj)->calc_rsi_flip_flop(SIB_KNOCHEN_R35);
 			_G(det)->showStaticSpr(7);
 			_G(atds)->del_steuer_bit(237, ATS_AKTIV_BIT, ATS_DATA);
 
 			while (_G(det)->get_ani_status(2) && !SHOULD_QUIT) {
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 			}
 
 			_G(det)->set_static_ani(0, -1);
 			enable_timer();
 			start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(95, -1);
+			startAadWait(95, -1);
 		}
 	}
 
@@ -137,7 +137,7 @@ void Room35::talk_cat() {
 
 	} else {
 		start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(96, -1);
+		startAadWait(96, -1);
 	}
 
 	showCur();
diff --git a/engines/chewy/rooms/room37.cpp b/engines/chewy/rooms/room37.cpp
index 43f000aa285..b36ab8ee898 100644
--- a/engines/chewy/rooms/room37.cpp
+++ b/engines/chewy/rooms/room37.cpp
@@ -47,7 +47,7 @@ void Room37::entry() {
 
 	if (!_G(flags).LoadGame) {
 		_G(spieler).scrollx = 124;
-		set_person_pos(219, 66, P_CHEWY, P_RIGHT);
+		setPersonPos(219, 66, P_CHEWY, P_RIGHT);
 	}
 
 	if (!_G(spieler).R37Kloppe) {
@@ -78,10 +78,10 @@ void Room37::gedAction(int index) {
 
 	} else if (index == 1) {
 		if (_G(spieler).R37Kloppe && !_G(spieler).R37Mes) {
-			stop_person(P_CHEWY);
+			stopPerson(P_CHEWY);
 			_G(spieler).R37Mes = true;
 			start_spz(CH_TALK6, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(142, -1);
+			startAadWait(142, -1);
 		}
 	}
 }
@@ -111,19 +111,19 @@ short Room37::use_wippe() {
 			_G(flags).NoScroll = true;
 			auto_scroll(129, 0);
 			start_spz(CH_TALK6, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(159, -1);
+			startAadWait(159, -1);
 			del_inventar(_G(spieler).AkInvent);
 			flic_cut(FCUT_047);
 			_G(flags).NoScroll = false;
 			showCur();
 			_G(spieler).scrollx = 269;
-			set_person_pos(388, 119, P_CHEWY, P_RIGHT);
+			setPersonPos(388, 119, P_CHEWY, P_RIGHT);
 			switch_room(29);
 			_G(maus_links_click) = false;
 
 		} else {
 			start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(160, -1);
+			startAadWait(160, -1);
 		}
 	}
 
@@ -173,7 +173,7 @@ int16 Room37::use_glas() {
 			_G(flags).NoScroll = true;
 			auto_scroll(146, 0);
 			start_spz(CH_TALK6, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(147, -1);
+			startAadWait(147, -1);
 			del_inventar(_G(spieler).AkInvent);
 			flic_cut(FCUT_048);
 			flic_cut(FCUT_049);
@@ -185,7 +185,7 @@ int16 Room37::use_glas() {
 			_G(obj)->show_sib(SIB_HFUTTER2_R37);
 			_G(spieler).R37Gebiss = true;
 			start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(146, -1);
+			startAadWait(146, -1);
 			showCur();
 			_G(flags).NoScroll = false;
 			g_engine->_sound->playSound(3);
@@ -207,26 +207,26 @@ void Room37::dog_bell() {
 		g_engine->_sound->stopSound(0); // nr 3, sslot 0
 
 		if (!_G(spieler).R37Gebiss) {
-			stop_person(P_CHEWY);
+			stopPerson(P_CHEWY);
 			_G(flags).ChAutoMov = false;
-			set_person_spr(P_LEFT, P_CHEWY);
+			setPersonSpr(P_LEFT, P_CHEWY);
 			_G(flags).NoScroll = true;
 			auto_scroll(178, 0);
 			disable_timer();
 			_G(det)->stop_detail(3);
 			_G(det)->del_static_ani(3);
-			start_detail_wait(5, 1, ANI_FRONT);
+			startSetailWait(5, 1, ANI_FRONT);
 			_G(det)->hideStaticSpr(9);
-			start_detail_wait(6, 1, ANI_FRONT);
+			startSetailWait(6, 1, ANI_FRONT);
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			_G(det)->start_detail(11, 255, ANI_FRONT);
+			_G(det)->startDetail(11, 255, ANI_FRONT);
 			flic_cut(FCUT_050);
-			start_detail_wait(6, 1, ANI_BACK);
+			startSetailWait(6, 1, ANI_BACK);
 			_G(det)->stop_detail(11);
-			set_person_pos(326, 85, P_CHEWY, P_LEFT);
+			setPersonPos(326, 85, P_CHEWY, P_LEFT);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 			_G(det)->showStaticSpr(9);
-			start_ani_block(3, ABLOCK31);
+			startAniBlock(3, ABLOCK31);
 			_G(det)->set_static_ani(3, -1);
 			g_engine->_sound->playSound(3, 0);
 //			g_engine->_sound->playSound(3);
@@ -235,14 +235,14 @@ void Room37::dog_bell() {
 			ani_nr = CH_TALK12;
 
 		} else if (!_G(spieler).R37HundScham) {
-			stop_person(P_CHEWY);
-			set_person_spr(P_LEFT, P_CHEWY);
+			stopPerson(P_CHEWY);
+			setPersonSpr(P_LEFT, P_CHEWY);
 			_G(flags).NoScroll = true;
 			auto_scroll(178, 0);
 			_G(room)->set_timer_status(3, TIMER_STOP);
 			_G(det)->del_static_ani(3);
 			_G(det)->stop_detail(3);
-			start_detail_wait(4, 1, ANI_FRONT);
+			startSetailWait(4, 1, ANI_FRONT);
 			flic_cut(FCUT_051);
 			_G(spieler).scrollx = 104;
 			flic_cut(FCUT_054);
@@ -258,7 +258,7 @@ void Room37::dog_bell() {
 
 		if (dia_nr != -1) {
 			start_spz(ani_nr, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(dia_nr, -1);
+			startAadWait(dia_nr, -1);
 		}
 	}
 
@@ -274,7 +274,7 @@ void Room37::talk_hahn() {
 	if (!_G(spieler).R37TransHahn) {
 		_G(cur_hide_flag) = 0;
 		hideCur();
-		start_aad_wait(145, -1);
+		startAadWait(145, -1);
 		showCur();
 	} else {
 		hahn_dia();
@@ -303,20 +303,20 @@ void Room37::use_hahn() {
 			_G(room)->set_timer_status(7, TIMER_STOP);
 			_G(det)->stop_detail(7);
 			_G(det)->del_static_ani(7);
-			_G(det)->start_detail(9, 1, ANI_FRONT);
+			_G(det)->startDetail(9, 1, ANI_FRONT);
 			start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
 			del_inventar(GEBISS_INV);
 			_G(flags).NoScroll = true;
 			auto_scroll(177, 0);
 
 			while (_G(det)->get_ani_status(9)) {
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 				SHOULD_QUIT_RETURN;
 			}
 
-			_G(det)->start_detail(4, 1, ANI_FRONT);
+			_G(det)->startDetail(4, 1, ANI_FRONT);
 			_G(det)->hideStaticSpr(0);
-			_G(det)->start_detail(10, 10, ANI_FRONT);
+			_G(det)->startDetail(10, 10, ANI_FRONT);
 			autoMove(8, P_CHEWY);
 			flic_cut(FCUT_053);
 			_G(det)->stop_detail(10);
@@ -328,13 +328,13 @@ void Room37::use_hahn() {
 			_G(atds)->set_steuer_bit(256, ATS_AKTIV_BIT, ATS_DATA);
 			_G(det)->hideStaticSpr(8);
 			start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(141, -1);
+			startAadWait(141, -1);
 			_G(obj)->addInventory(EIER_INV, &_G(room_blk));
 			inventory_2_cur(EIER_INV);
 			showCur();
 		}
 	} else if (_G(spieler).inv_cur) {
-		start_aad_wait(143, -1);
+		startAadWait(143, -1);
 	}
 }
 
diff --git a/engines/chewy/rooms/room39.cpp b/engines/chewy/rooms/room39.cpp
index 6152b9f31a6..138470a8d46 100644
--- a/engines/chewy/rooms/room39.cpp
+++ b/engines/chewy/rooms/room39.cpp
@@ -55,7 +55,7 @@ void Room39::entry() {
 		if (_G(spieler).R39HowardDa) {
 			_G(det)->showStaticSpr(10);
 			if (!_G(spieler).R39HowardWach)
-				_G(det)->start_detail(1, 255, ANI_FRONT);
+				_G(det)->startDetail(1, 255, ANI_FRONT);
 			else
 				_G(det)->set_static_ani(5, -1);
 
@@ -81,22 +81,22 @@ short Room39::use_howard() {
 				_G(spieler).R39ScriptOk = true;
 				autoMove(3, P_CHEWY);
 				_G(spieler).PersonHide[P_CHEWY] = true;
-				_G(det)->start_detail(6, 255, ANI_FRONT);
-				start_aad_wait(170, -1);
+				_G(det)->startDetail(6, 255, ANI_FRONT);
+				startAadWait(170, -1);
 				_G(det)->stop_detail(6);
-				start_detail_wait(7, 1, ANI_FRONT);
+				startSetailWait(7, 1, ANI_FRONT);
 				_G(spieler).PersonHide[P_CHEWY] = false;
 
 				del_inventar(_G(spieler).AkInvent);
 				_G(det)->stop_detail(1);
-				start_ani_block(2, ABLOCK33);
+				startAniBlock(2, ABLOCK33);
 				start_spz(CH_TALK6, 255, ANI_FRONT, P_CHEWY);
-				start_aad_wait(167, -1);
+				startAadWait(167, -1);
 				_G(det)->stop_detail(3);
-				start_detail_wait(4, 1, ANI_FRONT);
+				startSetailWait(4, 1, ANI_FRONT);
 				_G(det)->set_static_ani(5, -1);
 				_G(atds)->set_ats_str(62, 1, ATS_DATA);
-				start_aad_wait(169, -1);
+				startAadWait(169, -1);
 				showCur();
 
 				_G(spieler).PersonGlobalDia[P_HOWARD] = 10012;
@@ -120,7 +120,7 @@ short Room39::use_howard() {
 
 		if (dia_nr != -1) {
 			start_spz(ani_nr, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(dia_nr, -1);
+			startAadWait(dia_nr, -1);
 			action_flag = true;
 		}
 
@@ -142,7 +142,7 @@ void Room39::talk_howard() {
 		}
 	} else {
 		start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(168, -1);
+		startAadWait(168, -1);
 	}
 }
 
@@ -158,7 +158,7 @@ void Room39::ok() {
 	invent_2_slot(BRIEF_INV);
 
 	switch_room(27);
-	start_aad_wait(192, -1);
+	startAadWait(192, -1);
 	_G(menu_item) = CUR_WALK;
 	cursorChoice(_G(menu_item));
 }
@@ -232,7 +232,7 @@ int16 Room39::use_tv() {
 			_G(out)->setPalette(_G(pal));
 			set_tv();
 			start_spz(CH_TRANS, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(80, -1);
+			startAadWait(80, -1);
 
 			ani_nr = CH_TRANS;
 			dia_nr = 77;
@@ -248,9 +248,9 @@ int16 Room39::use_tv() {
 		if (_G(spieler).R39TvOn) {
 			if (_G(spieler).R39TranslatorUsed) {
 				start_spz(CH_TALK3, 255, ANI_FRONT, P_CHEWY);
-				start_aad_wait(98, -1);
+				startAadWait(98, -1);
 				_G(spieler).PersonHide[P_CHEWY] = true;
-				start_ani_block(2, ABLOCK29);
+				startAniBlock(2, ABLOCK29);
 				_G(spieler).PersonHide[P_CHEWY] = false;
 				ani_nr = CH_TALK5;
 				dia_nr = 99;
@@ -277,7 +277,7 @@ int16 Room39::use_tv() {
 	if (dia_nr != -1) {
 		if (ani_nr != -1)
 			start_spz(ani_nr, 255, ANI_FRONT, P_CHEWY);
-		start_aad_wait(dia_nr, -1);
+		startAadWait(dia_nr, -1);
 		action_flag = true;
 	}
 
@@ -324,7 +324,7 @@ void Room39::look_tv(bool cls_mode) {
 				_G(flags).NoPalAfterFlc = false;
 
 				if (_G(spieler).R39TranslatorUsed && dia_nr == 85)
-					start_aad_wait(dia_nr, -1);
+					startAadWait(dia_nr, -1);
 			}
 		}
 
@@ -339,7 +339,7 @@ void Room39::set_tv() {
 
 	if (_G(spieler).R39TvOn) {
 		if (_G(spieler).R39TvKanal == 2) {
-			_G(det)->start_detail(0, 255, ANI_FRONT);
+			_G(det)->startDetail(0, 255, ANI_FRONT);
 		} else {
 			_G(det)->stop_detail(0);
 			_G(det)->showStaticSpr(_G(spieler).R39TvKanal + 4);
diff --git a/engines/chewy/rooms/room40.cpp b/engines/chewy/rooms/room40.cpp
index 1e0cb2dc53b..5a1e9e62b1e 100644
--- a/engines/chewy/rooms/room40.cpp
+++ b/engines/chewy/rooms/room40.cpp
@@ -74,14 +74,14 @@ void Room40::entry(int16 eib_nr) {
 		if (!_G(flags).LoadGame) {
 			switch (eib_nr) {
 			case 69:
-				set_person_pos(30, 105, P_HOWARD, P_RIGHT);
+				setPersonPos(30, 105, P_HOWARD, P_RIGHT);
 				goAutoXy(158, 99, P_HOWARD, ANI_GO);
 				break;
 
 			case 73:
 			case 74:
 			case 87:
-				set_person_pos(158, 93, P_HOWARD, P_LEFT);
+				setPersonPos(158, 93, P_HOWARD, P_LEFT);
 				break;
 			default:
 				break;
@@ -117,12 +117,12 @@ void Room40::xit(int16 eib_nr) {
 				_G(uhr)->disableTimer();
 				_G(out)->ausblenden(0);
 				hide_person();
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 				_G(out)->einblenden(_G(pal), 0);
 				_G(uhr)->enableTimer();
 
 				_G(maus_links_click) = false;
-				start_aad_wait(238, -1);
+				startAadWait(238, -1);
 				move_train(1);
 				register_cutscene(15);
 				
@@ -166,12 +166,12 @@ void Room40::move_train(int16 mode) {
 	auto_scroll(232, 0);
 
 	if (!mode)
-		start_aad_wait(206, -1);
+		startAadWait(206, -1);
 
 	int16 lx = -40;
 	int16 ax = -230;
 
-	_G(det)->start_detail(7, 20, ANI_FRONT);
+	_G(det)->startDetail(7, 20, ANI_FRONT);
 	_G(det)->showStaticSpr(11);
 
 	if (mode && _G(spieler).ChewyAni == CHEWY_PUMPKIN)
@@ -195,7 +195,7 @@ void Room40::move_train(int16 mode) {
 			--delay;
 		}
 
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN;
 	}
 
@@ -204,7 +204,7 @@ void Room40::move_train(int16 mode) {
 	_G(det)->hideStaticSpr(12);
 
 	if (!mode) {
-		start_aad_wait(207, -1);
+		startAadWait(207, -1);
 		auto_scroll(180, 0);
 	}
 	
@@ -245,14 +245,14 @@ void Room40::setup_func() {
 			_G(room)->set_timer_status(255, TIMER_STOP);
 			_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
 			_G(det)->hideStaticSpr(15);
-			_G(det)->start_detail(POLICE_LEFT, 1, ANI_FRONT);
+			_G(det)->startDetail(POLICE_LEFT, 1, ANI_FRONT);
 			_G(atds)->set_steuer_bit(275, ATS_AKTIV_BIT, ATS_DATA);
 		}
 
 		switch (_G(spieler).R40PoliceAniStatus) {
 		case POLICE_LEFT:
 			if (_G(det)->get_ani_status(POLICE_LEFT) == false) {
-				_G(det)->start_detail(POLICE_OFFEN, 1, ANI_FRONT);
+				_G(det)->startDetail(POLICE_OFFEN, 1, ANI_FRONT);
 				_G(spieler).R40PoliceAniStatus = POLICE_OFFEN;
 			}
 			break;
@@ -260,7 +260,7 @@ void Room40::setup_func() {
 		case POLICE_OFFEN:
 			if (_G(det)->get_ani_status(POLICE_OFFEN) == false) {
 				_G(det)->showStaticSpr(0);
-				_G(det)->start_detail(POLICE_FLASCHE, 1, ANI_FRONT);
+				_G(det)->startDetail(POLICE_FLASCHE, 1, ANI_FRONT);
 				_G(spieler).R40PoliceAniStatus = POLICE_FLASCHE;
 			}
 			break;
@@ -281,14 +281,14 @@ void Room40::setup_func() {
 				if (_G(spieler).R40DuengerTele) {
 					hideCur();
 					_G(spieler).R40PoliceWeg = true;
-					_G(det)->start_detail(17, 255, ANI_FRONT);
-					start_aad_wait(226, -1);
+					_G(det)->startDetail(17, 255, ANI_FRONT);
+					startAadWait(226, -1);
 					_G(det)->stop_detail(17);
 					_G(spieler).R40HoUse = true;
 					_G(person_end_phase)[P_CHEWY] = P_RIGHT;
-					start_detail_wait(10, 1, ANI_FRONT);
+					startSetailWait(10, 1, ANI_FRONT);
 					_G(person_end_phase)[P_HOWARD] = P_RIGHT;
-					start_aad_wait(224, -1);
+					startAadWait(224, -1);
 					_G(spieler).R40PoliceWeg = true;
 					showCur();
 
@@ -298,7 +298,7 @@ void Room40::setup_func() {
 					_G(atds)->set_steuer_bit(276, ATS_AKTIV_BIT, ATS_DATA);
 
 				} else {
-					_G(det)->start_detail(POLICE_RIGHT, 1, ANI_FRONT);
+					_G(det)->startDetail(POLICE_RIGHT, 1, ANI_FRONT);
 					_G(spieler).R40PoliceAniStatus = POLICE_RIGHT;
 				}
 			}
@@ -325,9 +325,9 @@ int16 Room40::use_mr_pumpkin() {
 				action_ret = true;
 				autoMove(5, P_CHEWY);
 				del_inventar(_G(spieler).AkInvent);
-				start_detail_wait(15, 1, ANI_FRONT);
+				startSetailWait(15, 1, ANI_FRONT);
 				start_spz(CH_PUMP_TALK, 255, ANI_FRONT, P_CHEWY);
-				start_aad_wait(200, -1);
+				startAadWait(200, -1);
 				break;
 
 			case RECORDER_INV:
@@ -347,10 +347,10 @@ int16 Room40::use_mr_pumpkin() {
 						_G(obj)->addInventory(LIKOER2_INV, &_G(room_blk));
 						inventory_2_cur(LIKOER2_INV);
 						switch_room(40);
-						start_aad_wait(236, -1);
+						startAadWait(236, -1);
 					}
 				} else {
-					start_aad_wait(228 + _G(spieler).R39TvRecord, -1);
+					startAadWait(228 + _G(spieler).R39TvRecord, -1);
 				}
 				break;
 
@@ -376,10 +376,10 @@ int16 Room40::use_schalter(int16 aad_nr) {
 
 		if (_G(spieler).R40PoliceAniStatus != 255) {
 			start_spz(CH_PUMP_TALK, 255, ANI_FRONT, P_CHEWY);
-			start_aad_wait(204, -1);
+			startAadWait(204, -1);
 
 			while (_G(spieler).R40PoliceAniStatus != 255) {
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 				SHOULD_QUIT_RETURN0;
 			}
 		}
@@ -397,11 +397,11 @@ int16 Room40::use_schalter(int16 aad_nr) {
 		}
 
 		_G(det)->hideStaticSpr(15);
-		start_detail_wait(12, 1, ANI_FRONT);
+		startSetailWait(12, 1, ANI_FRONT);
 		_G(det)->set_static_ani(14, -1);
-		start_aad_wait(aad_nr, -1);
+		startAadWait(aad_nr, -1);
 		_G(det)->del_static_ani(14);
-		start_detail_wait(13, 1, ANI_FRONT);
+		startSetailWait(13, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(15);
 		_G(room)->set_timer_status(255, TIMER_START);
 		_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
@@ -417,7 +417,7 @@ void Room40::talk_police() {
 		_G(spieler).R40PoliceStart = false;
 		_G(room)->set_timer_status(255, TIMER_STOP);
 		autoMove(7, P_CHEWY);
-		start_aad_wait(203, -1);
+		startAadWait(203, -1);
 		_G(room)->set_timer_status(255, TIMER_START);
 		_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
 		showCur();
@@ -432,7 +432,7 @@ void Room40::talk_handler() {
 		_G(det)->del_static_ani(4);
 		_G(room)->set_timer_status(4, TIMER_STOP);
 		_G(det)->set_static_ani(3, -1);
-		start_aad_wait(202, -1);
+		startAadWait(202, -1);
 		_G(det)->set_static_ani(4, -1);
 		_G(det)->del_static_ani(3);
 		_G(room)->set_timer_status(4, TIMER_START);
@@ -446,7 +446,7 @@ int16 Room40::use_haendler() {
 	if (_G(menu_item) == CUR_HOWARD && !_G(spieler).R40HaendlerOk) {
 		action_flag = true;
 		if (!_G(spieler).flags38_2) {
-			start_aad_wait(612, -1);
+			startAadWait(612, -1);
 		} else {
 			hideCur();
 			invent_2_slot(DUENGER_INV);
@@ -457,7 +457,7 @@ int16 Room40::use_haendler() {
 			_G(atds)->set_steuer_bit(283, ATS_AKTIV_BIT, ATS_DATA);
 			autoMove(10, P_CHEWY);
 			autoMove(11, P_HOWARD);
-			start_aad_wait(208, -1);
+			startAadWait(208, -1);
 			autoMove(6, P_HOWARD);
 			_G(flags).NoScroll = true;
 
@@ -465,18 +465,18 @@ int16 Room40::use_haendler() {
 			_G(det)->del_static_ani(4);
 			_G(room)->set_timer_status(4, TIMER_STOP);
 			_G(det)->set_static_ani(3, -1);
-			start_aad_wait(209, -1);
+			startAadWait(209, -1);
 			_G(det)->del_static_ani(3);
 			_G(det)->set_static_ani(5, -1);
-			start_aad_wait(213, -1);
+			startAadWait(213, -1);
 
 			if (_G(spieler).R28RKuerbis) {
 				_G(det)->del_static_ani(5);
 				_G(det)->set_static_ani(3, -1);
-				start_aad_wait(211, -1);
+				startAadWait(211, -1);
 				_G(out)->ausblenden(0);
 				_G(out)->set_teilpalette(_G(pal), 255, 1);
-				start_aad_wait(212, -1);
+				startAadWait(212, -1);
 				_G(out)->ausblenden(0);
 				_G(spieler).R40Wettbewerb = true;
 				_G(spieler).PersonRoomNr[P_HOWARD] = 28;
@@ -488,7 +488,7 @@ int16 Room40::use_haendler() {
 
 			} else {
 				autoMove(11, P_HOWARD);
-				start_aad_wait(210, -1);
+				startAadWait(210, -1);
 			}
 
 			_G(menu_item) = CUR_WALK;
@@ -512,9 +512,9 @@ int16 Room40::use_bmeister() {
 		_G(spieler).R40HoUse = true;
 		autoMove(9, P_CHEWY);
 		autoMove(11, P_HOWARD);
-		start_aad_wait(214, -1);
+		startAadWait(214, -1);
 		bmeister_dia(215);
-		start_aad_wait(216, -1);
+		startAadWait(216, -1);
 		_G(spieler).R40HoUse = false;
 		_G(flags).NoScroll = false;
 		_G(menu_item) = CUR_WALK;
@@ -524,7 +524,7 @@ int16 Room40::use_bmeister() {
 	} else if (is_cur_inventar(LIKOER2_INV)) {
 		action_flag = true;
 		if (_G(spieler).flags37_80) {
-			start_aad_wait(605, -1);
+			startAadWait(605, -1);
 		} else {
 			hideCur();
 			_G(spieler).R40HoUse = true;
@@ -547,17 +547,17 @@ void Room40::bmeister_dia(int16 aad_nr) {
 	_G(det)->del_static_ani(0);
 	_G(room)->set_timer_status(0, TIMER_STOP);
 	_G(det)->stop_detail(0);
-	start_detail_wait(1, 1, ANI_FRONT);
+	startSetailWait(1, 1, ANI_FRONT);
 	_G(det)->set_static_ani(2, -1);
 
 	if (aad_nr == 237) {
-		start_aad_wait(aad_nr, -1);
+		startAadWait(aad_nr, -1);
 		_G(flags).NoPalAfterFlc = true;
 		flic_cut(FCUT_062);
 		_G(fx_blend) = BLEND3;
-		start_aad_wait(375, -1);
+		startAadWait(375, -1);
 	} else {
-		start_aad_wait(aad_nr, -1);
+		startAadWait(aad_nr, -1);
 	}
 
 	_G(flags).NoPalAfterFlc = false;
@@ -581,11 +581,11 @@ bool Room40::use_police() {
 			_G(spieler).R40HoUse = true;
 			autoMove(9, P_CHEWY);
 			autoMove(11, P_HOWARD);
-			start_aad_wait(217, -1);
+			startAadWait(217, -1);
 			autoMove(8, P_CHEWY);
 			goAutoXy(300, 120, P_HOWARD, ANI_WAIT);
 			_G(person_end_phase)[P_HOWARD] = P_RIGHT;
-			start_aad_wait(218, -1);
+			startAadWait(218, -1);
 			start_spz(HO_TALK_L, 255, ANI_FRONT, P_HOWARD);
 			_G(menu_item) = CUR_WALK;
 			cursorChoice(_G(menu_item));
@@ -593,7 +593,7 @@ bool Room40::use_police() {
 			_G(flags).MausLinks = false;
 		}
 	} else {
-		start_aad_wait(225, -1);
+		startAadWait(225, -1);
 	}
 
 	return result;
@@ -608,7 +608,7 @@ int16 Room40::use_tele() {
 
 		int16 dia_nr1 = -1;
 		if (!_G(spieler).R40PoliceAb) {
-			start_aad_wait(219, -1);
+			startAadWait(219, -1);
 			_G(spieler).R40HoUse = false;
 
 		} else {
@@ -624,11 +624,11 @@ int16 Room40::use_tele() {
 				dia_nr1 = 223;
 			}
 
-			start_aad_wait(dia_nr, -1);
+			startAadWait(dia_nr, -1);
 			autoMove(11, P_HOWARD);
 			_G(det)->hideStaticSpr(0);
 			autoMove(9, P_CHEWY);
-			start_aad_wait(dia_nr1, -1);
+			startAadWait(dia_nr1, -1);
 			_G(spieler).R40HoUse = false;
 			int16 timer_wert = 0;
 
diff --git a/engines/chewy/rooms/room41.cpp b/engines/chewy/rooms/room41.cpp
index 0238e2967f1..f3f9af9b083 100644
--- a/engines/chewy/rooms/room41.cpp
+++ b/engines/chewy/rooms/room41.cpp
@@ -44,12 +44,12 @@ void Room41::entry() {
 		if (!_G(flags).LoadGame) {
 			_G(room)->set_timer_status(0, TIMER_STOP);
 			_G(det)->del_static_ani(0);
-			start_ani_block(2, ABLOCK32);
+			startAniBlock(2, ABLOCK32);
 			_G(room)->set_timer_status(0, TIMER_START);
 			_G(det)->set_static_ani(0, -1);
-			start_aad_wait(127, -1);
+			startAadWait(127, -1);
 		} else {
-			_G(det)->start_detail(6, 255, ANI_FRONT);
+			_G(det)->startDetail(6, 255, ANI_FRONT);
 		}
 	}
 
@@ -64,7 +64,7 @@ void Room41::entry() {
 	}
 
 	if (!_G(flags).LoadGame)
-		set_person_pos(241, 113, P_HOWARD, P_RIGHT);
+		setPersonPos(241, 113, P_HOWARD, P_RIGHT);
 
 	_G(SetUpScreenFunc) = setup_func;
 	showCur();
@@ -104,18 +104,18 @@ void Room41::talk_hoggy1() {
 	} else if (_G(spieler).R41Einbruch) {
 		if (!_G(spieler).R41BruchInfo) {
 			_G(spieler).R41BruchInfo = true;
-			start_aad_wait(132, -1);
-			start_aad_wait(128, -1);
+			startAadWait(132, -1);
+			startAadWait(128, -1);
 		} else if (_G(spieler).R31SurFurz && !_G(spieler).R41KuerbisInfo) {
 			_G(spieler).R41KuerbisInfo = true;
-			start_aad_wait(131, -1);
+			startAadWait(131, -1);
 			autoMove(5, P_CHEWY);
 			new_invent_2_cur(TICKET_INV);
 		} else {
-			start_aad_wait(130, -1);
+			startAadWait(130, -1);
 		}
 	} else {
-		start_aad_wait(130, -1);
+		startAadWait(130, -1);
 	}
 
 	start_hoggy();
@@ -131,15 +131,15 @@ void Room41::talk_hoggy2() {
 	} else if (_G(spieler).R41BruchInfo) {
 		if (_G(spieler).R31SurFurz && !_G(spieler).R41KuerbisInfo) {
 			_G(spieler).R41KuerbisInfo = true;
-			start_aad_wait(131, -1);
+			startAadWait(131, -1);
 			autoMove(5, P_CHEWY);
 			new_invent_2_cur(TICKET_INV);
 
 		} else {
-			start_aad_wait(129, -1);
+			startAadWait(129, -1);
 		}
 	} else {
-		start_aad_wait(129, -1);
+		startAadWait(129, -1);
 	}
 
 	start_hoggy();
@@ -147,7 +147,7 @@ void Room41::talk_hoggy2() {
 
 void Room41::first_talk() {
 	_G(spieler).R41FirstTalk = true;
-	start_aad_wait(134, -1);
+	startAadWait(134, -1);
 	_G(atds)->set_ats_str(266, TXT_MARK_NAME, 1, ATS_DATA);
 	_G(atds)->set_ats_str(265, TXT_MARK_NAME, 1, ATS_DATA);
 }
@@ -180,7 +180,7 @@ int16 Room41::use_kasse() {
 		action_flag = true;
 		stop_hoggy();
 		autoMove(1, P_CHEWY);
-		start_aad_wait(133, -1);
+		startAadWait(133, -1);
 		start_hoggy();
 	}
 
@@ -197,7 +197,7 @@ int16 Room41::use_lola() {
 		autoMove(4, P_CHEWY);
 		g_engine->_sound->stopSound(0);
 		flic_cut(FCUT_057);
-		set_person_pos(127, 112, P_CHEWY, P_LEFT);
+		setPersonPos(127, 112, P_CHEWY, P_LEFT);
 		_G(det)->stop_detail(6);
 
 		_G(atds)->del_steuer_bit(267, ATS_AKTIV_BIT, ATS_DATA);
@@ -217,7 +217,7 @@ int16 Room41::use_brief() {
 		action_flag = true;
 		stop_hoggy();
 		autoMove(6, P_CHEWY);
-		start_aad_wait(126, -1);
+		startAadWait(126, -1);
 		start_hoggy();
 
 	} else if (is_cur_inventar(BRIEF2_INV)) {
@@ -225,7 +225,7 @@ int16 Room41::use_brief() {
 		autoMove(6, P_CHEWY);
 		del_inventar(_G(spieler).AkInvent);
 		stop_hoggy();
-		start_aad_wait(186, -1);
+		startAadWait(186, -1);
 		start_hoggy();
 		_G(atds)->set_ats_str(206, 1, ATS_DATA);
 		_G(spieler).R28Briefkasten = true;
@@ -239,18 +239,18 @@ int16 Room41::use_brief() {
 }
 
 void Room41::sub_dia() {
-	aad_wait(-1);
-	start_aad_wait(161, -1);
+	aadWait(-1);
+	startAadWait(161, -1);
 
 	if (_G(spieler).R41LolaOk) {
-		start_aad_wait(163, -1);
+		startAadWait(163, -1);
 		_G(atds)->hide_item(11, 0, 2);
 		stop_ads_dialog();
 		autoMove(5, P_CHEWY);
 		new_invent_2_cur(PAPIER_INV);
 
 	} else {
-		start_aad_wait(162, -1);
+		startAadWait(162, -1);
 	}
 }
 
diff --git a/engines/chewy/rooms/room42.cpp b/engines/chewy/rooms/room42.cpp
index 4f06a721766..a0bacebf8c2 100644
--- a/engines/chewy/rooms/room42.cpp
+++ b/engines/chewy/rooms/room42.cpp
@@ -33,7 +33,7 @@ namespace Rooms {
 void Room42::entry() {
 	if (!_G(spieler).R42BeamterWach) {
 		g_engine->_sound->playSound(0);
-		_G(det)->start_detail(0, 255, ANI_FRONT);
+		_G(det)->startDetail(0, 255, ANI_FRONT);
 	}
 
 	if (_G(spieler).PersonRoomNr[P_HOWARD] == 42) {
@@ -48,16 +48,16 @@ void Room42::entry() {
 
 			_G(SetUpScreenFunc) = setup_func;
 
-			set_person_pos(80, 43, P_HOWARD, P_LEFT);
+			setPersonPos(80, 43, P_HOWARD, P_LEFT);
 			_G(atds)->set_ats_str(263, 1, ATS_DATA);
 			_G(atds)->set_ats_str(264, 1, ATS_DATA);
 		}
 
 		if (_G(obj)->checkInventory(HOTEL_INV) && _G(obj)->checkInventory(TICKET_INV) && !_G(spieler).R42BriefOk)
-			start_aad_wait(302, -1);
+			startAadWait(302, -1);
 
 		if (_G(obj)->checkInventory(HOTEL_INV) && _G(obj)->checkInventory(TICKET_INV) && _G(spieler).R42BriefOk)
-			start_aad_wait(301, -1);
+			startAadWait(301, -1);
 	}
 }
 
@@ -79,13 +79,13 @@ void Room42::get_kuerbis(int16 aad_nr) {
 	hideCur();
 	autoMove(1, P_CHEWY);
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	start_detail_wait(7, 1, ANI_BACK);
+	startSetailWait(7, 1, ANI_BACK);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	start_spz(CH_TALK5, 255, ANI_FRONT, P_CHEWY);
-	start_aad_wait(aad_nr, -1);
+	startAadWait(aad_nr, -1);
 
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	start_detail_wait(7, 1, ANI_FRONT);
+	startSetailWait(7, 1, ANI_FRONT);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	showCur();
 }
@@ -104,26 +104,26 @@ int16 Room42::use_psack() {
 		action_flag = true;
 		autoMove(3, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(10, 1, ANI_FRONT);
+		startSetailWait(10, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
-		start_aad_wait(187, -1);
+		startAadWait(187, -1);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(9, 1, ANI_FRONT);
+		startSetailWait(9, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		new_invent_2_cur(BMARKE_INV);
-		start_aad_wait(181, -1);
+		startAadWait(181, -1);
 		_G(spieler).R42MarkeOk = true;
 		autoMove(4, P_CHEWY);
-		start_aad_wait(185, -1);
+		startAadWait(185, -1);
 		_G(spieler).R42HoToBeamter = false;
 	} else if (is_cur_inventar(BRIEF2_INV)) {
 		action_flag = true;
 		autoMove(3, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(10, 1, ANI_FRONT);
+		startSetailWait(10, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		del_inventar(_G(spieler).AkInvent);
-		start_aad_wait(183, -1);
+		startAadWait(183, -1);
 		_G(obj)->calc_rsi_flip_flop(SIB_BKASTEN_R28);
 		_G(atds)->set_ats_str(206, 1, ATS_DATA);
 		_G(spieler).R28Briefkasten = true;
@@ -133,7 +133,7 @@ int16 Room42::use_psack() {
 
 	} else if (is_cur_inventar(BRIEF_INV)) {
 		action_flag = true;
-		start_aad_wait(182, -1);
+		startAadWait(182, -1);
 	}
 
 	showCur();
@@ -148,7 +148,7 @@ int16 Room42::use_beamter() {
 		_G(atds)->set_ats_str(264, 2, ATS_DATA);
 		hideCur();
 		autoMove(4, P_CHEWY);
-		start_aad_wait(184, -1);
+		startAadWait(184, -1);
 		_G(spieler).R42HoToBeamter = true;
 		_G(menu_item) = CUR_WALK;
 		cursorChoice(_G(menu_item));
@@ -180,7 +180,7 @@ void Room42::dia_beamter(int16 str_end_nr) {
 
 	if (str_end_nr != 4) {
 		while (_G(atds)->aad_get_status() != -1) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 			SHOULD_QUIT_RETURN;
 		}
 
@@ -189,16 +189,16 @@ void Room42::dia_beamter(int16 str_end_nr) {
 
 		switch (str_end_nr) {
 		case 1:
-			start_detail_wait(3, 4, ANI_FRONT);
+			startSetailWait(3, 4, ANI_FRONT);
 			break;
 
 		case 2:
 			g_engine->_sound->playSound(4);
-			start_detail_wait(4, 13, ANI_FRONT);
+			startSetailWait(4, 13, ANI_FRONT);
 			break;
 
 		case 3:
-			start_detail_wait(5, 2, ANI_FRONT);
+			startSetailWait(5, 2, ANI_FRONT);
 			break;
 
 		default:
@@ -206,29 +206,29 @@ void Room42::dia_beamter(int16 str_end_nr) {
 		}
 	} else {
 		while (_G(atds)->aad_get_status() < 2) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 			SHOULD_QUIT_RETURN;
 		}
 
 		_G(det)->stop_detail(0);
 		g_engine->_sound->stopSound(0);
-		start_detail_wait(1, 1, ANI_FRONT);
-		_G(det)->start_detail(2, 255, ANI_FRONT);
+		startSetailWait(1, 1, ANI_FRONT);
+		_G(det)->startDetail(2, 255, ANI_FRONT);
 
 		while (_G(atds)->aad_get_status() != -1) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 			SHOULD_QUIT_RETURN;
 		}
 
 		_G(det)->stop_detail(2);
-		_G(det)->start_detail(0, 255, ANI_FRONT);
+		_G(det)->startDetail(0, 255, ANI_FRONT);
 		g_engine->_sound->playSound(0, 0);
 		g_engine->_sound->playSound(0);
 	}
 
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	_G(det)->start_detail(6, 255, ANI_FRONT);
-	start_aad_wait(135, -1);
+	_G(det)->startDetail(6, 255, ANI_FRONT);
+	startAadWait(135, -1);
 	_G(det)->stop_detail(6);
 	_G(flags).NoDiaBox = false;
 	_G(spieler).PersonHide[P_CHEWY] = false;
diff --git a/engines/chewy/rooms/room43.cpp b/engines/chewy/rooms/room43.cpp
index 931fe31bee5..d0f24f66440 100644
--- a/engines/chewy/rooms/room43.cpp
+++ b/engines/chewy/rooms/room43.cpp
@@ -39,11 +39,11 @@ void Room43::night_small() {
 	hideCur();
 	_G(flags).NoScroll = true;
 	_G(spieler).ScrollxStep = 1;
-	start_aad_wait(188, -1);
+	startAadWait(188, -1);
 	auto_scroll(320, 0);
-	start_aad_wait(189, -1);
+	startAadWait(189, -1);
 	auto_scroll(0, 0);
-	start_aad_wait(190, -1);
+	startAadWait(190, -1);
 	_G(spieler).ScrollxStep = 16;
 	auto_scroll(192, 0);
 
@@ -55,7 +55,7 @@ void Room43::night_small() {
 	}
 
 	_G(spieler).scrollx = 194;
-	start_aad_wait(191, -1);
+	startAadWait(191, -1);
 	flic_cut(FCUT_058);
 	g_engine->_sound->stopSound(0);
 	_G(flags).NoScroll = false;
@@ -76,9 +76,9 @@ void Room43::catch_pg() {
 	hideCur();
 	_G(flags).NoScroll = true;
 	_G(spieler).ScrollxStep = 1;
-	start_aad_wait(234, -1);
+	startAadWait(234, -1);
 	auto_scroll(194, 0);
-	start_aad_wait(235, -1);
+	startAadWait(235, -1);
 	_G(spieler).R43GetPgLady = true;
 	flic_cut(FCUT_058);
 
diff --git a/engines/chewy/rooms/room44.cpp b/engines/chewy/rooms/room44.cpp
index cfc9e74063b..539c66f2edc 100644
--- a/engines/chewy/rooms/room44.cpp
+++ b/engines/chewy/rooms/room44.cpp
@@ -39,7 +39,7 @@ void Room44::look_news() {
 	_G(spieler).PersonRoomNr[P_CHEWY] = 44;
 	_G(room)->load_room(&_G(room_blk), 44, &_G(spieler));
 
-	start_aad_wait(172, -1);
+	startAadWait(172, -1);
 	_G(spieler).scrollx = tmpsx;
 	_G(spieler).scrolly = tmpsy;
 	switch_room(tmproom);
diff --git a/engines/chewy/rooms/room45.cpp b/engines/chewy/rooms/room45.cpp
index 3bd25702394..a6819b9ddf5 100644
--- a/engines/chewy/rooms/room45.cpp
+++ b/engines/chewy/rooms/room45.cpp
@@ -71,8 +71,8 @@ void Room45::entry(int16 eib_nr) {
 			}
 		}
 
-		set_person_pos(ch_x, ch_y, P_CHEWY, P_LEFT);
-		set_person_pos(ho_x, ho_y, P_HOWARD, P_LEFT);
+		setPersonPos(ch_x, ch_y, P_CHEWY, P_LEFT);
+		setPersonPos(ho_x, ho_y, P_HOWARD, P_LEFT);
 	}
 }
 
@@ -133,7 +133,7 @@ void Room45::setup_func() {
 							x = 0;
 						}
 						_G(det)->setSetailPos(3 + i, x, y);
-						_G(det)->start_detail(3 + i, 255, ANI_FRONT);
+						_G(det)->startDetail(3 + i, 255, ANI_FRONT);
 					}
 				}
 			}
@@ -199,11 +199,11 @@ int16 Room45::use_taxi() {
 void Room45::talk_taxi(int16 aad_nr) {
 	_G(room)->set_timer_status(12, TIMER_STOP);
 	_G(det)->del_static_ani(12);
-	start_detail_wait(13, 1, ANI_FRONT);
+	startSetailWait(13, 1, ANI_FRONT);
 	_G(det)->set_static_ani(14, -1);
-	start_aad_wait(aad_nr, -1);
+	startAadWait(aad_nr, -1);
 	_G(det)->del_static_ani(14);
-	start_detail_wait(13, 1, ANI_BACK);
+	startSetailWait(13, 1, ANI_BACK);
 	_G(det)->set_static_ani(12, -1);
 	_G(room)->set_timer_status(12, TIMER_START);
 }
@@ -229,7 +229,7 @@ void Room45::taxi_mov() {
 	g_engine->_sound->playSound(15, 2);
 	g_engine->_sound->playSound(15, 2, false);
 	g_engine->_sound->playSound(15, 0);
-	start_detail_wait(15, 1, ANI_FRONT);
+	startSetailWait(15, 1, ANI_FRONT);
 	g_engine->_sound->stopSound(0);
 	switch_room(48);
 }
@@ -244,16 +244,16 @@ int16 Room45::use_boy() {
 			action_ret = true;
 			new_invent_2_cur(CUTMAG_INV);
 			_G(atds)->set_ats_str(DOLLAR175_INV, 1, INV_ATS_DATA);
-			start_aad_wait(258, -1);
+			startAadWait(258, -1);
 			_G(room)->set_timer_status(0, TIMER_STOP);
 			_G(det)->del_static_ani(0);
-			start_detail_wait(1, 1, ANI_FRONT);
+			startSetailWait(1, 1, ANI_FRONT);
 			_G(room)->set_timer_status(0, TIMER_START);
 			_G(det)->set_static_ani(0, -1);
 			_G(spieler).R45MagOk = true;
 		}
 	} else {
-		start_aad_wait(259, -1);
+		startAadWait(259, -1);
 	}
 
 	showCur();
@@ -271,7 +271,7 @@ void Room45::talk_boy() {
 		aad_nr = 259;
 	}
 
-	start_aad_wait(aad_nr, -1);
+	startAadWait(aad_nr, -1);
 	showCur();
 }
 
diff --git a/engines/chewy/rooms/room46.cpp b/engines/chewy/rooms/room46.cpp
index 53d0f5e239b..d484769d076 100644
--- a/engines/chewy/rooms/room46.cpp
+++ b/engines/chewy/rooms/room46.cpp
@@ -35,9 +35,9 @@ void Room46::entry(int16 eib_nr) {
 		_G(SetUpScreenFunc) = setup_func;
 
 		if (eib_nr == 79) {
-			set_person_pos(140, 90, P_HOWARD, P_LEFT);
+			setPersonPos(140, 90, P_HOWARD, P_LEFT);
 			autoMove(3, P_CHEWY);
-			set_person_spr(P_LEFT, P_CHEWY);
+			setPersonSpr(P_LEFT, P_CHEWY);
 		}
 	}
 
@@ -48,19 +48,19 @@ void Room46::entry(int16 eib_nr) {
 		if (_G(spieler).flags33_8) {
 			_G(maus_links_click) = false;
 			hideCur();
-			set_person_pos(175, 73, P_HOWARD, P_LEFT);
-			set_person_pos(147, 109, P_CHEWY, P_LEFT);
+			setPersonPos(175, 73, P_HOWARD, P_LEFT);
+			setPersonPos(147, 109, P_CHEWY, P_LEFT);
 			_G(spieler).flags33_8 = false;
 			_G(spieler).SVal1 = 46;
-			wait_show_screen(10);
+			waitShowScreen(10);
 
 			start_spz_wait(64, 1, false, P_CHEWY);
 			start_spz(65, 255, false, P_CHEWY);
-			start_aad_wait(494, -1);
+			startAadWait(494, -1);
 			_G(spieler).SVal2 = 504;
 			switch_room(92);
 			start_spz(65, 255, false, P_CHEWY);
-			start_aad_wait(495, -1);
+			startAadWait(495, -1);
 			_G(spieler).room_e_obj[78].Exit = 90;
 			showCur();
 		}
@@ -100,36 +100,36 @@ void Room46::bodo() {
 	hideCur();
 	_G(det)->showStaticSpr(0);
 	_G(person_end_phase)[P_CHEWY] = P_RIGHT;
-	start_aad_wait(240, -1);
+	startAadWait(240, -1);
 	_G(spieler_mi)[P_CHEWY].Mode = true;
 	goAutoXy(42, 76, P_CHEWY, ANI_WAIT);
-	start_aad_wait(250, -1);
+	startAadWait(250, -1);
 	autoMove(1, P_CHEWY);
-	set_person_spr(P_RIGHT, P_CHEWY);
-	start_aad_wait(251, -1);
+	setPersonSpr(P_RIGHT, P_CHEWY);
+	startAadWait(251, -1);
 	autoMove(2, P_CHEWY);
 
 	_G(spieler_mi)[P_CHEWY].Mode = false;
-	start_detail_wait(0, 1, ANI_FRONT);
-	_G(det)->start_detail(5, 255, ANI_FRONT);
-	start_aad_wait(241, -1);
+	startSetailWait(0, 1, ANI_FRONT);
+	_G(det)->startDetail(5, 255, ANI_FRONT);
+	startAadWait(241, -1);
 	_G(det)->stop_detail(5);
 	_G(det)->showStaticSpr(5);
-	start_aad_wait(609, -1);
+	startAadWait(609, -1);
 	_G(det)->hideStaticSpr(5);
-	start_detail_wait(2, 1, ANI_FRONT);
-	start_detail_wait(3, 1, ANI_FRONT);
-	_G(det)->start_detail(4, 255, ANI_FRONT);
-	start_aad_wait(242, -1);
+	startSetailWait(2, 1, ANI_FRONT);
+	startSetailWait(3, 1, ANI_FRONT);
+	_G(det)->startDetail(4, 255, ANI_FRONT);
+	startAadWait(242, -1);
 	_G(det)->stop_detail(4);
 
 	_G(det)->showStaticSpr(6);
-	start_aad_wait(610, -1);
+	startAadWait(610, -1);
 	_G(det)->hideStaticSpr(6);
-	start_detail_wait(6, 1, ANI_FRONT);
+	startSetailWait(6, 1, ANI_FRONT);
 	_G(det)->showStaticSpr(3);
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	start_detail_wait(1, 1, ANI_FRONT);
+	startSetailWait(1, 1, ANI_FRONT);
 	flic_cut(FCUT_065);
 	_G(out)->setPointer(nullptr);
 	_G(out)->cls();
@@ -141,8 +141,8 @@ void Room46::bodo() {
 	load_chewy_taf(CHEWY_ROCKER);
 	_G(spieler).R28ChewyPump = false;
 	
-	set_person_pos(213, 118, P_CHEWY, P_RIGHT);
-	start_aad_wait(243, -1);
+	setPersonPos(213, 118, P_CHEWY, P_RIGHT);
+	startAadWait(243, -1);
 	invent_2_slot(UHR_INV);
 	invent_2_slot(RING_INV);
 	_G(spieler).R46GetLeder = true;
@@ -191,7 +191,7 @@ int16 Room46::use_schloss() {
 			autoMove(1, P_CHEWY);
 			switch_room(47);
 		} else {
-			start_aad_wait(252, -1);
+			startAadWait(252, -1);
 		}
 	}
 
diff --git a/engines/chewy/rooms/room47.cpp b/engines/chewy/rooms/room47.cpp
index 58956a272a6..c03b8cb3fa6 100644
--- a/engines/chewy/rooms/room47.cpp
+++ b/engines/chewy/rooms/room47.cpp
@@ -30,7 +30,7 @@ namespace Rooms {
 
 void Room47::entry() {
 	hide_person();
-	set_person_pos(40, 170, P_CHEWY, P_RIGHT);
+	setPersonPos(40, 170, P_CHEWY, P_RIGHT);
 	_G(SetUpScreenFunc) = set_detail;
 	_G(flags).MainInput = false;
 }
@@ -38,7 +38,7 @@ void Room47::entry() {
 void Room47::xit() {
 	_G(flags).MainInput = true;
 	show_person();
-	set_person_pos(114, 102, P_CHEWY, P_LEFT);
+	setPersonPos(114, 102, P_CHEWY, P_LEFT);
 	_G(spieler_mi)[P_HOWARD].Mode = true;
 }
 
diff --git a/engines/chewy/rooms/room48.cpp b/engines/chewy/rooms/room48.cpp
index 53f21624437..7269981a559 100644
--- a/engines/chewy/rooms/room48.cpp
+++ b/engines/chewy/rooms/room48.cpp
@@ -75,9 +75,9 @@ void Room48::frage() {
 	if (!_G(flags).AutoAniPlay) {
 		_G(flags).AutoAniPlay = true;
 		hideCur();
-		start_detail_wait(1, 1, ANI_FRONT);
+		startSetailWait(1, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(6);
-		start_detail_wait(1, 1, ANI_BACK);
+		startSetailWait(1, 1, ANI_BACK);
 		_G(det)->hideStaticSpr(6);
 		_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
 		showCur();
@@ -136,14 +136,14 @@ void Room48::setup_func() {
 							_G(room)->set_timer_status(0, TIMER_STOP);
 							_G(det)->stop_detail(0);
 							_G(det)->del_static_ani(0);
-							start_detail_wait(2, 1, ANI_FRONT);
+							startSetailWait(2, 1, ANI_FRONT);
 							g_engine->_sound->stopSound(0);
 							_G(menu_item) = CUR_WALK;
 							cursorChoice(_G(menu_item));
 							showCur();
 							_G(spieler).R48TaxiEntry = true;
 							_G(maus_links_click) = false;
-							set_up_screen(DO_SETUP);
+							setupScreen(DO_SETUP);
 
 							for (int16 i = 0; i < MAX_PERSON; i++) {
 								if (_G(spieler).R48TaxiPerson[i]) {
diff --git a/engines/chewy/rooms/room49.cpp b/engines/chewy/rooms/room49.cpp
index 97a8c62bd91..08df58487ae 100644
--- a/engines/chewy/rooms/room49.cpp
+++ b/engines/chewy/rooms/room49.cpp
@@ -58,14 +58,14 @@ void Room49::entry(int16 eib_nr) {
 	if (!_G(flags).LoadGame) {
 		if (_G(spieler).R48TaxiEntry) {
 			_G(spieler).R48TaxiEntry = false;
-			set_person_pos(527, 76, P_HOWARD, P_LEFT);
-			set_person_pos(491, 98, P_CHEWY, P_LEFT);
+			setPersonPos(527, 76, P_HOWARD, P_LEFT);
+			setPersonPos(491, 98, P_CHEWY, P_LEFT);
 			_G(maus_links_click) = false;
 			_G(spieler).scrollx = 320;
 			_G(spieler).scrolly = 0;
-			_G(det)->start_detail(5, 1, ANI_FRONT);
+			_G(det)->startDetail(5, 1, ANI_FRONT);
 		} else if (eib_nr == 83) {
-			set_person_pos(377, 78, P_HOWARD, P_LEFT);
+			setPersonPos(377, 78, P_HOWARD, P_LEFT);
 		}
 	}
 }
@@ -79,7 +79,7 @@ void Room49::xit(int16 eib_nr) {
 			_G(spieler).PersonRoomNr[P_HOWARD] = 50;
 		} else if (eib_nr == 81) {
 			_G(SetUpScreenFunc) = nullptr;
-			start_aad_wait(268, -1);
+			startAadWait(268, -1);
 		}
 	}
 }
@@ -108,7 +108,7 @@ void Room49::calc_boy_ani() {
 	}
 
 	_G(det)->set_static_ani(_G(spieler).R49BoyAni ? 1 : 0, -1);
-	_G(det)->start_detail(_G(spieler).R49BoyAni ? 1 : 0, 1, ANI_FRONT);
+	_G(det)->startDetail(_G(spieler).R49BoyAni ? 1 : 0, 1, ANI_FRONT);
 	_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
 }
 
@@ -117,28 +117,28 @@ void Room49::calc_boy() {
 		hideCur();
 		_G(room)->set_timer_status(255, TIMER_STOP);
 		_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
-		stop_person(P_CHEWY);
-		stop_person(P_HOWARD);
+		stopPerson(P_CHEWY);
+		stopPerson(P_HOWARD);
 		_G(person_end_phase)[P_CHEWY] = P_LEFT;
 		_G(det)->stop_detail(_G(spieler).R49BoyAni ? 1 : 0);
 		_G(det)->del_static_ani(_G(spieler).R49BoyAni ? 1 : 0);
 		_G(det)->set_static_ani(2, -1);
 
 		_G(SetUpScreenFunc) = nullptr;
-		start_aad_wait(262, -1);
+		startAadWait(262, -1);
 		_G(SetUpScreenFunc) = nullptr;
 		autoMove(3, P_CHEWY);
 		goAutoXy(374, 79, P_HOWARD, ANI_WAIT);
-		set_person_spr(P_LEFT, P_HOWARD);
+		setPersonSpr(P_LEFT, P_HOWARD);
 		_G(det)->del_static_ani(2);
-		start_detail_wait(3, 1, ANI_FRONT);
+		startSetailWait(3, 1, ANI_FRONT);
 
 		_G(det)->showStaticSpr(9);
 		_G(spieler).PersonHide[P_HOWARD] = true;
-		start_detail_wait(8, 1, ANI_FRONT);
+		startSetailWait(8, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_HOWARD] = false;
 		_G(det)->hideStaticSpr(9);
-		start_detail_wait(4, 1, ANI_GO);
+		startSetailWait(4, 1, ANI_GO);
 
 		_G(SetUpScreenFunc) = setup_func;
 		_G(det)->set_static_ani(_G(spieler).R49BoyAni ? 1 : 0, -1);
@@ -178,7 +178,7 @@ void Room49::use_boy_cigar() {
 	const int16 zoom = _G(room)->_roomInfo->_zoomFactor;
 	_G(room)->set_zoom(zoom);
 	goAutoXy(416, 79, P_HOWARD, ANI_WAIT);
-	set_person_spr(P_LEFT, P_HOWARD);
+	setPersonSpr(P_LEFT, P_HOWARD);
 	_G(flags).NoScroll = true;
 
 	auto_scroll(164, 0);
@@ -191,8 +191,8 @@ void Room49::use_boy_cigar() {
 	_G(det)->stop_detail(_G(spieler).R49BoyAni ? 1 : 0);
 
 	_G(flags).NoScroll = false;
-	set_person_spr(P_RIGHT, P_CHEWY);
-	start_aad_wait(264, -1);
+	setPersonSpr(P_RIGHT, P_CHEWY);
+	startAadWait(264, -1);
 	_G(room)->set_zoom(zoom);
 
 	_G(obj)->addInventory(GUM_INV, &_G(room_blk));
@@ -220,8 +220,8 @@ void Room49::talk_boy(int16 aad_nr) {
 		_G(det)->set_static_ani(_G(spieler).R49BoyAni ? 1 : 0, -1);
 		_G(det)->set_static_ani(2, -1);
 		_G(SetUpScreenFunc) = nullptr;
-		stop_person(P_HOWARD);
-		start_aad_wait(aad_nr, -1);
+		stopPerson(P_HOWARD);
+		startAadWait(aad_nr, -1);
 		_G(SetUpScreenFunc) = setup_func;
 		_G(det)->del_static_ani(2);
 		_G(det)->set_static_ani(_G(spieler).R49BoyAni ? 1 : 0, -1);
@@ -232,8 +232,8 @@ void Room49::talk_boy(int16 aad_nr) {
 void Room49::look_hotel() {
 	if (_G(spieler).PersonRoomNr[P_HOWARD] == 49) {
 		_G(SetUpScreenFunc) = nullptr;
-		stop_person(P_HOWARD);
-		start_aad_wait(261, -1);
+		stopPerson(P_HOWARD);
+		startAadWait(261, -1);
 		_G(SetUpScreenFunc) = setup_func;
 	}
 }
@@ -244,7 +244,7 @@ int16 Room49::use_taxi() {
 	if (!_G(spieler).inv_cur) {
 		action_ret = true;
 		hideCur();
-		start_ani_block(2, ABLOCK34);
+		startAniBlock(2, ABLOCK34);
 		_G(det)->showStaticSpr(7);
 		autoMove(2, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
@@ -259,7 +259,7 @@ int16 Room49::use_taxi() {
 		}
 
 		_G(det)->hideStaticSpr(7);
-		start_detail_wait(5, 1, ANI_FRONT);
+		startSetailWait(5, 1, ANI_FRONT);
 		g_engine->_sound->stopSound(0);
 		switch_room(48);
 	}
diff --git a/engines/chewy/rooms/room50.cpp b/engines/chewy/rooms/room50.cpp
index 5fdeebd6ce7..383874861ce 100644
--- a/engines/chewy/rooms/room50.cpp
+++ b/engines/chewy/rooms/room50.cpp
@@ -43,9 +43,9 @@ void Room50::entry(int16 eib_nr) {
 		hideCur();
 		stop_page();
 		_G(maus_links_click) = false;
-		set_person_pos(1, 64, P_HOWARD, P_RIGHT);
-		set_person_pos(92, 123, P_CHEWY, P_LEFT);
-		start_aad_wait(510, -1);
+		setPersonPos(1, 64, P_HOWARD, P_RIGHT);
+		setPersonPos(92, 123, P_CHEWY, P_LEFT);
+		startAadWait(510, -1);
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
 		_G(flags).NoPalAfterFlc = true;
@@ -57,7 +57,7 @@ void Room50::entry(int16 eib_nr) {
 		if (_G(spieler).R50Zigarre) {
 			stop_cigar();
 		} else {
-			_G(det)->start_detail(0, 255, ANI_FRONT);
+			_G(det)->startDetail(0, 255, ANI_FRONT);
 		}
 
 		if (!_G(spieler).R50KeyOK) {
@@ -74,9 +74,9 @@ void Room50::entry(int16 eib_nr) {
 
 			if (!_G(flags).LoadGame) {
 				if (eib_nr == 85)
-					set_person_pos(298, 56, P_HOWARD, P_RIGHT);
+					setPersonPos(298, 56, P_HOWARD, P_RIGHT);
 				else
-					set_person_pos(1, 64, P_HOWARD, P_RIGHT);
+					setPersonPos(1, 64, P_HOWARD, P_RIGHT);
 			}
 		}
 	}
@@ -118,7 +118,7 @@ void Room50::stop_cigar() {
 void Room50::calc_wasser() {
 	if (!_wasser) {
 		stop_page();
-		_G(det)->start_detail(4, 1, ANI_FRONT);
+		_G(det)->startDetail(4, 1, ANI_FRONT);
 		_wasser = true;
 	}
 }
@@ -141,14 +141,14 @@ void Room50::calc_treppe() {
 
 		if (!_G(spieler).R50KeyOK) {
 			hideCur();
-			stop_person(P_CHEWY);
+			stopPerson(P_CHEWY);
 			_G(room)->set_timer_status(1, TIMER_STOP);
 			_wasser = false;
 			_G(flags).NoScroll = true;
 			auto_scroll(40, 0);
 			stop_page();
 			_G(det)->set_static_ani(5, -1);
-			start_aad_wait(272, -1);
+			startAadWait(272, -1);
 			autoMove(3, P_CHEWY);
 			aad_page(273, 5);
 			_G(flags).NoScroll = false;
@@ -170,10 +170,10 @@ int16 Room50::use_gutschein() {
 			_wasser = false;
 			stop_page();
 			del_inventar(_G(spieler).AkInvent);
-			start_ani_block(2, ABLOCK36);
+			startAniBlock(2, ABLOCK36);
 			aad_page(274, 8);
 		} else {
-			start_aad_wait(276, -1);
+			startAadWait(276, -1);
 		}
 	}
 
@@ -190,7 +190,7 @@ int16 Room50::use_gum() {
 		_G(room)->set_timer_status(1, TIMER_STOP);
 		_wasser = false;
 		stop_page();
-		start_detail_wait(6, 1, ANI_FRONT);
+		startSetailWait(6, 1, ANI_FRONT);
 		_G(det)->set_static_ani(5, -1);
 		autoMove(3, P_CHEWY);
 		_G(spieler_mi)[P_CHEWY].Mode = true;
@@ -198,20 +198,20 @@ int16 Room50::use_gum() {
 		_G(SetUpScreenFunc) = nullptr;
 		goAutoXy(112, 57, P_HOWARD, ANI_WAIT);
 
-		set_person_spr(P_LEFT, P_HOWARD);
+		setPersonSpr(P_LEFT, P_HOWARD);
 		del_inventar(_G(spieler).AkInvent);
 		hide_person();
-		start_detail_wait(2, 1, ANI_FRONT);
+		startSetailWait(2, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(4);
-		start_detail_wait(2, 1, ANI_BACK);
+		startSetailWait(2, 1, ANI_BACK);
 		show_person();
-		set_person_spr(P_LEFT, P_CHEWY);
-		start_aad_wait(275, -1);
+		setPersonSpr(P_LEFT, P_CHEWY);
+		startAadWait(275, -1);
 		_G(det)->del_static_ani(5);
-		start_detail_wait(9, 1, ANI_FRONT);
+		startSetailWait(9, 1, ANI_FRONT);
 		_G(det)->del_static_ani(5);
 		_G(det)->set_static_ani(10, -1);
-		start_aad_wait(277, -1);
+		startAadWait(277, -1);
 		_G(SetUpScreenFunc) = setup_func;
 		autoMove(3, P_CHEWY);
 		_G(spieler_mi)[P_CHEWY].Mode = true;
@@ -230,14 +230,14 @@ int16 Room50::use_gum() {
 }
 
 void Room50::talk_page() {
-	start_aad_wait(276, -1);
+	startAadWait(276, -1);
 }
 
 void Room50::aad_page(int16 aad_nr, int16 ani_nr) {
 	_G(det)->set_static_ani(ani_nr, -1);
-	start_aad_wait(aad_nr, -1);
+	startAadWait(aad_nr, -1);
 	_G(det)->del_static_ani(ani_nr);
-	start_detail_wait(6, 1, ANI_BACK);
+	startSetailWait(6, 1, ANI_BACK);
 	go_page();
 
 	if (!_G(spieler).R50KeyOK)
diff --git a/engines/chewy/rooms/room51.cpp b/engines/chewy/rooms/room51.cpp
index 612e7f9672e..5e6699c778c 100644
--- a/engines/chewy/rooms/room51.cpp
+++ b/engines/chewy/rooms/room51.cpp
@@ -57,8 +57,8 @@ void Room51::entry() {
 		_G(spieler).PersonHide[P_HOWARD] = true;
 		_G(maus_links_click) = false;
 		_G(spieler).scrollx = 0;
-		set_person_pos(34, 120, P_HOWARD, P_RIGHT);
-		set_person_pos(234, 69, P_CHEWY, P_LEFT);
+		setPersonPos(34, 120, P_HOWARD, P_RIGHT);
+		setPersonPos(234, 69, P_CHEWY, P_LEFT);
 		_G(SetUpScreenFunc) = setup_func;
 		_G(det)->showStaticSpr(17);
 		_index = 0;
@@ -76,21 +76,21 @@ void Room51::entry() {
 		_G(det)->hideStaticSpr(17);
 
 		for (int i = 0; i < 2; i++)
-			_G(det)->start_detail(3 + i, 1, ANI_FRONT);
+			_G(det)->startDetail(3 + i, 1, ANI_FRONT);
 
 		if (_G(spieler).PersonRoomNr[P_HOWARD] == 51) {
 			_G(spieler).ZoomXy[P_HOWARD][0] = 40;
 			_G(spieler).ZoomXy[P_HOWARD][1] = 30;
 
 			if (!_G(flags).LoadGame) {
-				set_person_pos(88, 93, P_HOWARD, P_RIGHT);
+				setPersonPos(88, 93, P_HOWARD, P_RIGHT);
 			}
 
 			if (!_G(spieler).R51FirstEntry) {
 				hideCur();
 				_G(spieler).R51FirstEntry = true;
-				set_person_spr(P_LEFT, P_CHEWY);
-				start_aad_wait(283, -1);
+				setPersonSpr(P_LEFT, P_CHEWY);
+				startAadWait(283, -1);
 				showCur();
 			}
 
@@ -146,29 +146,29 @@ void Room51::setup_func() {
 		if ((_G(minfo).button == 1 || _G(in)->get_switch_code() == 28) && !_flag) {
 			_flag = true;
 			_G(det)->setSetailPos(8, _tmpx - 20, _tmpy + 41);
-			start_detail_wait(8, 1, ANI_FRONT);
+			startSetailWait(8, 1, ANI_FRONT);
 			_flag = false;
 			++_index;
 
 			switch (_index) {
 			case 2:
-				start_aad_wait(512, -1);
+				startAadWait(512, -1);
 				_index = 1000;
 				break;
 
 			case 1006:
-				start_aad_wait(513, -1);
+				startAadWait(513, -1);
 				_index = 2000;
 				break;
 
 			case 2003:
-				start_aad_wait(615, -1);
+				startAadWait(615, -1);
 				_index = 10000;
 				break;
 
 			case 10012:
-				start_aad_wait(514, -1);
-				wait_show_screen(5);
+				startAadWait(514, -1);
+				waitShowScreen(5);
 				_G(flags).NoPalAfterFlc = true;
 				_G(out)->setPointer(nullptr);
 				_G(out)->cls();
@@ -220,10 +220,10 @@ int16 Room51::use_door(int16 txt_nr) {
 
 			if (!_G(spieler).R51HotelRoom) {
 				autoMove(11, P_HOWARD);
-				set_person_spr(P_LEFT, P_HOWARD);
+				setPersonSpr(P_LEFT, P_HOWARD);
 				_G(spieler).R51HotelRoom = true;
 				_G(spieler).room_e_obj[86].Attribut = AUSGANG_LINKS;
-				start_aad_wait(285, -1);
+				startAadWait(285, -1);
 				_G(atds)->set_ats_str(329, 1, ATS_DATA);
 				_G(SetUpScreenFunc) = setup_func;
 
@@ -240,20 +240,20 @@ int16 Room51::use_door(int16 txt_nr) {
 				g_engine->_sound->playSound(2, 0);
 				g_engine->_sound->playSound(2);
 				_G(det)->showStaticSpr(1);
-				start_detail_wait(2, 1, ANI_FRONT);
-				_G(det)->start_detail(5, 255, ANI_FRONT);
+				startSetailWait(2, 1, ANI_FRONT);
+				_G(det)->startDetail(5, 255, ANI_FRONT);
 
 				if (!_G(spieler).R52HotDogOk) {
-					start_aad_wait(287, -1);
+					startAadWait(287, -1);
 					autoMove(12, P_CHEWY);
 					_G(det)->stop_detail(5);
-					start_ani_block(5, ABLOCK37);
+					startAniBlock(5, ABLOCK37);
 					_G(det)->hideStaticSpr(1);
 					g_engine->_sound->stopSound(0);
-					start_aad_wait(284, -1);
+					startAadWait(284, -1);
 				} else {
 					_G(spieler).R51KillerWeg = true;
-					start_aad_wait(290, -1);
+					startAadWait(290, -1);
 					g_engine->_sound->stopSound(0);
 					_G(out)->ausblenden(1);
 					_G(out)->setPointer(nullptr);
@@ -271,11 +271,11 @@ int16 Room51::use_door(int16 txt_nr) {
 					_G(det)->hideStaticSpr(1);
 
 					_G(fx_blend) = BLEND3;
-					set_up_screen(DO_SETUP);
-					start_aad_wait(291, -1);
+					setupScreen(DO_SETUP);
+					startAadWait(291, -1);
 				}
 			} else {
-				start_aad_wait(401, -1);
+				startAadWait(401, -1);
 			}
 			break;
 
@@ -286,15 +286,15 @@ int16 Room51::use_door(int16 txt_nr) {
 			_G(out)->cls();
 			_G(flags).NoPalAfterFlc = true;
 			flic_cut(FCUT_114);
-			set_person_pos(115, 144, P_CHEWY, P_LEFT);
+			setPersonPos(115, 144, P_CHEWY, P_LEFT);
 			_G(fx_blend) = BLEND3;
-			set_up_screen(NO_SETUP);
-			start_aad_wait(564, -1);
+			setupScreen(NO_SETUP);
+			startAadWait(564, -1);
 			break;
 
 		case 332:
 			autoMove(6, P_CHEWY);
-			start_aad_wait(286, -1);
+			startAadWait(286, -1);
 			break;
 
 		case 333:
@@ -303,13 +303,13 @@ int16 Room51::use_door(int16 txt_nr) {
 			switch (_G(spieler).R51DoorCount) {
 			case 0:
 				_G(det)->showStaticSpr(3);
-				start_aad_wait(278, -1);
-				start_detail_frame(0, 1, ANI_FRONT, 3);
+				startAadWait(278, -1);
+				startDetailFrame(0, 1, ANI_FRONT, 3);
 				start_spz(HO_BRILL_JMP, 1, ANI_FRONT, P_HOWARD);
-				wait_detail(0);
+				waitDetail(0);
 
 				_G(det)->showStaticSpr(14);
-				start_aad_wait(279, -1);
+				startAadWait(279, -1);
 				++_G(spieler).R51DoorCount;
 				_G(obj)->show_sib(SIB_FLASCHE_R51);
 				_G(obj)->calc_rsi_flip_flop(SIB_FLASCHE_R51);
@@ -318,8 +318,8 @@ int16 Room51::use_door(int16 txt_nr) {
 
 			case 1:
 				_G(det)->showStaticSpr(3);
-				start_aad_wait(280, -1);
-				start_detail_wait(1, 1, ANI_FRONT);
+				startAadWait(280, -1);
+				startSetailWait(1, 1, ANI_FRONT);
 				++_G(spieler).R51DoorCount;
 				_G(obj)->show_sib(SIB_KAPPE_R51);
 				_G(obj)->calc_rsi_flip_flop(SIB_KAPPE_R51);
@@ -328,9 +328,9 @@ int16 Room51::use_door(int16 txt_nr) {
 				break;
 
 			default:
-				start_aad_wait(281, -1);
+				startAadWait(281, -1);
 				if (_G(spieler).PersonRoomNr[P_HOWARD] == 51)
-					start_aad_wait(282, -1);
+					startAadWait(282, -1);
 				break;
 			}
 			break;
@@ -353,12 +353,12 @@ int16 Room51::cut_serv(int16 frame) {
 void Room51::timer_action(int16 t_nr, int16 obj_nr) {
 	if (obj_nr == 9 || obj_nr == 10) {
 		if (!_enemyFlag[obj_nr - 9]) {
-			_G(det)->start_detail(obj_nr, 1, ANI_FRONT);
+			_G(det)->startDetail(obj_nr, 1, ANI_FRONT);
 			_enemyFlag[obj_nr - 9] = true;
 
 		} else if (!_G(det)->get_ani_status(obj_nr)) {
-			_G(det)->start_detail(obj_nr, 1, ANI_GO);
-			_G(det)->start_detail(obj_nr + 2, 1, ANI_FRONT);
+			_G(det)->startDetail(obj_nr, 1, ANI_GO);
+			_G(det)->startDetail(obj_nr + 2, 1, ANI_FRONT);
 			_G(uhr)->resetTimer(t_nr, 0);
 			_enemyFlag[obj_nr - 9] = false;
 		}
diff --git a/engines/chewy/rooms/room52.cpp b/engines/chewy/rooms/room52.cpp
index 5308b279567..c560b259f35 100644
--- a/engines/chewy/rooms/room52.cpp
+++ b/engines/chewy/rooms/room52.cpp
@@ -47,8 +47,8 @@ void Room52::entry() {
 	if (!_G(flags).LoadGame) {
 		_G(det)->showStaticSpr(4);
 		_G(spieler).R52TuerAuf = true;
-		set_person_pos(20, 50, P_HOWARD, P_LEFT);
-		set_person_pos(35, 74, P_CHEWY, P_RIGHT);
+		setPersonPos(20, 50, P_HOWARD, P_LEFT);
+		setPersonPos(35, 74, P_CHEWY, P_RIGHT);
 		autoMove(2, P_CHEWY);
 		_G(spieler).R52TuerAuf = false;
 		_G(det)->hideStaticSpr(4);
@@ -85,31 +85,31 @@ int16 Room52::use_hot_dog() {
 		g_engine->_sound->playSound(0);
 		_G(atds)->set_ats_str(341, 1, ATS_DATA);
 		autoMove(2, P_CHEWY);
-		set_person_spr(P_LEFT, P_CHEWY);
-		start_aad_wait(288, -1);
+		setPersonSpr(P_LEFT, P_CHEWY);
+		startAadWait(288, -1);
 
 	} else if (is_cur_inventar(KILLER_INV)) {
 		action_ret = true;
 		autoMove(5, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(7, 1, ANI_FRONT);
+		startSetailWait(7, 1, ANI_FRONT);
 		g_engine->_sound->playSound(7, 0);
 		g_engine->_sound->playSound(7);
-		_G(det)->start_detail(8, 255, ANI_FRONT);
+		_G(det)->startDetail(8, 255, ANI_FRONT);
 
 		for (int16 i = 0; i < 5; i++) {
-			wait_show_screen(20);
+			waitShowScreen(20);
 			_G(det)->stop_detail(2 + i);
 		}
 
 		g_engine->_sound->stopSound(0);
 		_G(det)->stop_detail(0);
 		_G(det)->stop_detail(8);
-		start_detail_wait(7, 1, ANI_BACK);
+		startSetailWait(7, 1, ANI_BACK);
 		g_engine->_sound->stopSound(0);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		_G(atds)->set_steuer_bit(341, ATS_AKTIV_BIT, ATS_DATA);
-		start_aad_wait(303, -1);
+		startAadWait(303, -1);
 		_G(atds)->set_ats_str(KILLER_INV, 1, INV_ATS_DATA);
 		_G(spieler).R52KakerWeg = true;
 	}
@@ -120,17 +120,17 @@ int16 Room52::use_hot_dog() {
 
 void Room52::plot_armee(int16 frame) {
 	for (int16 i = 0; i < 5; i++) {
-		wait_show_screen(frame);
-		_G(det)->start_detail(2 + i, 255, ANI_FRONT);
+		waitShowScreen(frame);
+		_G(det)->startDetail(2 + i, 255, ANI_FRONT);
 	}
 }
 
 void Room52::kaker_platt() {
 	if (!_G(spieler).R52KakerJoke && _G(spieler).R52HotDogOk && !_G(spieler).R52KakerWeg && !_G(flags).ExitMov) {
 		_G(spieler).R52KakerJoke = true;
-		stop_person(P_CHEWY);
+		stopPerson(P_CHEWY);
 		hideCur();
-		start_aad_wait(289, -1);
+		startAadWait(289, -1);
 		showCur();
 	}
 }
diff --git a/engines/chewy/rooms/room53.cpp b/engines/chewy/rooms/room53.cpp
index 84c4ec5b4b2..9d6b6038ffe 100644
--- a/engines/chewy/rooms/room53.cpp
+++ b/engines/chewy/rooms/room53.cpp
@@ -44,7 +44,7 @@ void Room53::entry() {
 	hideCur();
 	_G(obj)->hide_sib(SIB_VISIT_R53);
 	_G(atds)->del_steuer_bit(319, ATS_AKTIV_BIT, ATS_DATA);
-	start_detail_wait(0, 1, ANI_FRONT);
+	startSetailWait(0, 1, ANI_FRONT);
 	_G(det)->set_static_ani(1, -1);
 	_G(timer_nr)[0] = _G(room)->set_timer(1, 7);
 	showCur();
@@ -53,7 +53,7 @@ void Room53::entry() {
 void Room53::man_go() {
 	_G(room)->set_timer_status(1, TIMER_STOP);
 	_G(det)->del_static_ani(1);
-	start_detail_wait(5, 1, ANI_FRONT);
+	startSetailWait(5, 1, ANI_FRONT);
 	_G(atds)->set_steuer_bit(319, ATS_AKTIV_BIT, ATS_DATA);
 	if (!_G(spieler).R53Visit)
 		_G(obj)->show_sib(SIB_VISIT_R53);
@@ -64,11 +64,11 @@ void Room53::talk_man() {
 	autoMove(2, P_CHEWY);
 	_G(room)->set_timer_status(1, TIMER_STOP);
 	_G(det)->del_static_ani(1);
-	start_detail_wait(2, 1, ANI_FRONT);
+	startSetailWait(2, 1, ANI_FRONT);
 	_G(det)->set_static_ani(3, -1);
-	start_aad_wait(269 + (_G(spieler).R53Kostuem ? 1 : 0), -1);
+	startAadWait(269 + (_G(spieler).R53Kostuem ? 1 : 0), -1);
 	_G(det)->del_static_ani(3);
-	start_detail_wait(4, 1, ANI_FRONT);
+	startSetailWait(4, 1, ANI_FRONT);
 	man_go();
 	showCur();
 }
@@ -82,10 +82,10 @@ int16 Room53::use_man() {
 		_G(spieler).R53Kostuem = true;
 		del_inventar(_G(spieler).AkInvent);
 		autoMove(2, P_CHEWY);
-		start_aad_wait(271, -1);
+		startAadWait(271, -1);
 		_G(room)->set_timer_status(1, TIMER_STOP);
 		_G(det)->del_static_ani(1);
-		start_ani_block(7, ABLOCK35);
+		startAniBlock(7, ABLOCK35);
 		_G(obj)->addInventory(JMKOST_INV, &_G(room_blk));
 		inventory_2_cur(JMKOST_INV);
 		_G(atds)->set_steuer_bit(319, ATS_AKTIV_BIT, ATS_DATA);
diff --git a/engines/chewy/rooms/room54.cpp b/engines/chewy/rooms/room54.cpp
index 8e94446a0d3..4dc7607ecce 100644
--- a/engines/chewy/rooms/room54.cpp
+++ b/engines/chewy/rooms/room54.cpp
@@ -49,10 +49,10 @@ void Room54::entry(int16 eib_nr) {
 
 			if (_G(spieler).PersonRoomNr[P_HOWARD] == 54) {
 				_G(spieler).R54HowardVorne = 0;
-				set_person_pos(290, 61, P_HOWARD, P_RIGHT);
+				setPersonPos(290, 61, P_HOWARD, P_RIGHT);
 			}
 
-			set_person_pos(300, 80, P_CHEWY, P_LEFT);
+			setPersonPos(300, 80, P_CHEWY, P_LEFT);
 			_G(maus_links_click) = false;
 			_G(spieler).scrollx = 134;
 			_G(spieler).scrolly = 0;
@@ -63,15 +63,15 @@ void Room54::entry(int16 eib_nr) {
 		} else if (eib_nr == 90 || _G(spieler).R55ExitDia) {
 			if (_G(spieler).PersonRoomNr[P_HOWARD] == 54) {
 				_G(spieler).R54HowardVorne = 0;
-				set_person_pos(212, 61, P_HOWARD, P_RIGHT);
+				setPersonPos(212, 61, P_HOWARD, P_RIGHT);
 			}
 
 			_G(spieler).scrollx = 66;
-			set_person_pos(241, 85, P_CHEWY, P_LEFT);
+			setPersonPos(241, 85, P_CHEWY, P_LEFT);
 		}
 
 		if (_G(spieler).R55ExitDia) {
-			start_aad_wait(_G(spieler).R55ExitDia, -1);
+			startAadWait(_G(spieler).R55ExitDia, -1);
 			showCur();
 			_G(spieler).R55ExitDia = false;
 		}
@@ -142,27 +142,27 @@ int16 Room54::use_schalter() {
 			g_engine->_sound->playSound(0, 1);
 			g_engine->_sound->stopSound(2);
 
-			start_detail_wait(1, 1, ANI_FRONT);
-			_G(det)->start_detail(3, 255, ANI_FRONT);
-			start_aad_wait(292 + _G(spieler).R54LiftCount, -1);
+			startSetailWait(1, 1, ANI_FRONT);
+			_G(det)->startDetail(3, 255, ANI_FRONT);
+			startAadWait(292 + _G(spieler).R54LiftCount, -1);
 			_G(det)->stop_detail(3);
 			++_G(spieler).R54LiftCount;
 
 			int16 aad_nr;
 			if (_G(spieler).R54LiftCount < 3) {
-				start_detail_wait(2, 1, ANI_FRONT);
+				startSetailWait(2, 1, ANI_FRONT);
 				_G(det)->hideStaticSpr(0);
 				g_engine->_sound->stopSound(0);
 				g_engine->_sound->stopSound(1);
 				g_engine->_sound->playSound(1, 2);
-				start_detail_wait(1, 1, ANI_BACK);
+				startSetailWait(1, 1, ANI_BACK);
 				g_engine->_sound->stopSound(2);
 				aad_nr = 295;
 
 			} else {
-				start_detail_wait(5, 1, ANI_FRONT);
+				startSetailWait(5, 1, ANI_FRONT);
 				_G(det)->showStaticSpr(9);
-				start_detail_wait(4, 1, ANI_FRONT);
+				startSetailWait(4, 1, ANI_FRONT);
 				aad_nr = 296;
 				_G(spieler).R54FputzerWeg = true;
 				_G(atds)->del_steuer_bit(345, ATS_AKTIV_BIT, ATS_DATA);
@@ -170,11 +170,11 @@ int16 Room54::use_schalter() {
 				_G(atds)->set_ats_str(351, 1, ATS_DATA);
 			}
 
-			start_aad_wait(aad_nr, -1);
+			startAadWait(aad_nr, -1);
 			_G(spieler).R54HowardVorne = 0;
 
 		} else {
-			start_aad_wait(297, -1);
+			startAadWait(297, -1);
 		}
 
 		showCur();
@@ -197,18 +197,18 @@ void Room54::talk_verkauf() {
 		_G(spieler).R54HotDogOk = true;
 		autoMove(3, P_CHEWY);
 		_G(spieler).R54HowardVorne = 1;
-		start_aad_wait(299, -1);
+		startAadWait(299, -1);
 		_G(room)->set_timer_status(6, TIMER_STOP);
 		_G(det)->del_static_ani(6);
-		start_detail_wait(7, 1, ANI_FRONT);
-		_G(det)->start_detail(8, 255, ANI_FRONT);
-		start_aad_wait(310, -1);
+		startSetailWait(7, 1, ANI_FRONT);
+		_G(det)->startDetail(8, 255, ANI_FRONT);
+		startAadWait(310, -1);
 
 		_G(det)->stop_detail(8);
-		start_detail_wait(9, 1, ANI_FRONT);
-		start_detail_wait(10, 1, ANI_FRONT);
-		_G(det)->start_detail(11, 255, ANI_FRONT);
-		start_aad_wait(311, -1);
+		startSetailWait(9, 1, ANI_FRONT);
+		startSetailWait(10, 1, ANI_FRONT);
+		_G(det)->startDetail(11, 255, ANI_FRONT);
+		startAadWait(311, -1);
 		_G(det)->stop_detail(11);
 		_G(room)->set_timer_status(6, TIMER_START);
 		_G(det)->set_static_ani(6, -1);
@@ -218,7 +218,7 @@ void Room54::talk_verkauf() {
 		_G(obj)->addInventory(BURGER_INV, &_G(room_blk));
 		inventory_2_cur(BURGER_INV);
 	} else {
-		start_aad_wait(313, -1);
+		startAadWait(313, -1);
 	}
 
 	showCur();
@@ -233,7 +233,7 @@ int16 Room54::use_zelle() {
 			action_ret = true;
 
 			if (!_G(spieler).R54Schild) {
-				start_aad_wait(318, -1);
+				startAadWait(318, -1);
 			} else {
 				autoMove(5, P_CHEWY);
 				_G(spieler).R54HowardVorne = 1;
@@ -247,11 +247,11 @@ int16 Room54::use_zelle() {
 				load_chewy_taf(CHEWY_JMANS);
 				_G(zoom_horizont) = 90;
 
-				set_person_pos(283, 93, P_CHEWY, P_LEFT);
-				set_person_pos(238, 99, P_HOWARD, P_RIGHT);
-				start_aad_wait(315, -1);
+				setPersonPos(283, 93, P_CHEWY, P_LEFT);
+				setPersonPos(238, 99, P_HOWARD, P_RIGHT);
+				startAadWait(315, -1);
 				goAutoXy(241, 74, P_CHEWY, ANI_WAIT);
-				start_aad_wait(316, -1);
+				startAadWait(316, -1);
 
 				_G(spieler_mi)[P_HOWARD].Mode = true;
 				switch_room(55);
@@ -261,7 +261,7 @@ int16 Room54::use_zelle() {
 		action_ret = true;
 		autoMove(6, P_CHEWY);
 		_G(spieler).R54HowardVorne = 1;
-		start_aad_wait(319, -1);
+		startAadWait(319, -1);
 	}
 
 	showCur();
@@ -284,7 +284,7 @@ int16 Room54::use_azug() {
 			if (_G(spieler).R54FputzerWeg) {
 				autoMove(8, P_CHEWY);
 				_G(spieler).R54HowardVorne = 0;
-				start_aad_wait(298, -1);
+				startAadWait(298, -1);
 				_G(spieler).PersonHide[P_CHEWY] = true;
 				_G(det)->showStaticSpr(12);
 				_G(spieler).R55Location = true;
@@ -309,14 +309,14 @@ int16 Room54::use_azug() {
 						--delay;
 					}
 
-					set_up_screen(DO_SETUP);
+					setupScreen(DO_SETUP);
 					SHOULD_QUIT_RETURN0;
 				}
 
 				switch_room(55);
 			}
 		} else {
-			start_aad_wait(314, -1);
+			startAadWait(314, -1);
 		}
 
 		showCur();
@@ -326,8 +326,8 @@ int16 Room54::use_azug() {
 }
 
 void Room54::aufzug_ab() {
-	set_person_pos(91, 62, P_HOWARD, P_RIGHT);
-	set_person_pos(99, 82, P_CHEWY, P_RIGHT);
+	setPersonPos(91, 62, P_HOWARD, P_RIGHT);
+	setPersonPos(99, 82, P_CHEWY, P_RIGHT);
 	_G(spieler).scrollx = 0;
 	_G(SetUpScreenFunc) = setup_func;
 	_G(det)->showStaticSpr(12);
@@ -350,16 +350,16 @@ void Room54::aufzug_ab() {
 			--delay;
 		}
 
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN;
 	}
 
 	g_engine->_sound->stopSound(0);
 	_G(det)->hideStaticSpr(12);
-	set_person_pos(99, 82, P_CHEWY, P_RIGHT);
+	setPersonPos(99, 82, P_CHEWY, P_RIGHT);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	_G(maus_links_click) = false;
-	stop_person(P_CHEWY);
+	stopPerson(P_CHEWY);
 	_G(spieler).R55Location = false;
 }
 
diff --git a/engines/chewy/rooms/room55.cpp b/engines/chewy/rooms/room55.cpp
index faf2c0bbe9f..e27e2421977 100644
--- a/engines/chewy/rooms/room55.cpp
+++ b/engines/chewy/rooms/room55.cpp
@@ -39,7 +39,7 @@ void Room55::entry() {
 	_G(spieler).ZoomXy[P_HOWARD][1] = 22;
 
 	if (!_G(spieler).R54FputzerWeg)
-		_G(det)->start_detail(6, 255, ANI_FRONT);
+		_G(det)->startDetail(6, 255, ANI_FRONT);
 
 	if (_G(spieler).R54FputzerWeg && !_G(spieler).R55Location)
 		_G(det)->hideStaticSpr(6);
@@ -48,8 +48,8 @@ void Room55::entry() {
 		_G(det)->hideStaticSpr(0);
 
 	if (!_G(spieler).R55SekWeg) {
-		_G(det)->start_detail(8, 255, ANI_FRONT);
-		_G(det)->start_detail(9, 255, ANI_FRONT);
+		_G(det)->startDetail(8, 255, ANI_FRONT);
+		_G(det)->startDetail(9, 255, ANI_FRONT);
 		_G(spieler).R55Entry ^= 1;
 		const int aniNr = 19 + (_G(spieler).R55Entry ? 1 : 0);
 		_G(timer_nr)[0] = _G(room)->set_timer(aniNr, 10);
@@ -64,7 +64,7 @@ void Room55::entry() {
 	}
 
 	if (_G(spieler).ChewyAni == CHEWY_JMANS) {
-		set_person_pos(51, 75, P_CHEWY, P_RIGHT);
+		setPersonPos(51, 75, P_CHEWY, P_RIGHT);
 		_G(room)->set_zoom(10);
 	}
 
@@ -74,8 +74,8 @@ void Room55::entry() {
 	if (!_G(flags).LoadGame) {
 		if (_G(spieler).R55Location) {
 			_G(spieler).scrollx = 136;
-			set_person_pos(404, 66, P_CHEWY, P_RIGHT);
-			start_detail_wait(3, 1, ANI_FRONT);
+			setPersonPos(404, 66, P_CHEWY, P_RIGHT);
+			startSetailWait(3, 1, ANI_FRONT);
 			_G(spieler).PersonHide[P_CHEWY] = false;
 			_G(zoom_horizont) = 1;
 			_G(atds)->del_steuer_bit(340, ATS_AKTIV_BIT, ATS_DATA);
@@ -83,7 +83,7 @@ void Room55::entry() {
 			_G(spieler).scrollx = 0;
 
 			if (_G(spieler).PersonRoomNr[P_HOWARD] == 55) {
-				set_person_pos(21, 77, P_HOWARD, P_RIGHT);
+				setPersonPos(21, 77, P_HOWARD, P_RIGHT);
 			}
 
 			_G(det)->showStaticSpr(8);
@@ -92,7 +92,7 @@ void Room55::entry() {
 			_G(det)->hideStaticSpr(8);
 
 			if (_G(spieler).R55SekWeg && !_G(spieler).R55Job) {
-				set_person_spr(P_LEFT, P_CHEWY);
+				setPersonSpr(P_LEFT, P_CHEWY);
 
 				if (_G(spieler).ChewyAni == CHEWY_ROCKER) {
 					verleger_mov(0);
@@ -144,7 +144,7 @@ int16 Room55::use_stapel1() {
 
 		} else if (_G(spieler).R55EscScriptOk && !_G(spieler).R55RaumOk) {
 			action_ret = true;
-			start_aad_wait(333, -1);
+			startAadWait(333, -1);
 		}
 	} else if (is_cur_inventar(MANUSKRIPT_INV)) {
 		action_ret = true;
@@ -156,7 +156,7 @@ int16 Room55::use_stapel1() {
 			del_inventar(_G(spieler).AkInvent);
 			_G(atds)->set_ats_str(354, 2, ATS_DATA);
 		} else {
-			start_aad_wait(326, -1);
+			startAadWait(326, -1);
 		}
 	}
 	showCur();
@@ -170,7 +170,7 @@ int16 Room55::use_stapel2() {
 	if (is_cur_inventar(MANUSKRIPT_INV)) {
 		action_ret = true;
 		hideCur();
-		start_aad_wait(327, -1);
+		startAadWait(327, -1);
 		showCur();
 	}
 
@@ -188,40 +188,40 @@ int16 Room55::use_telefon() {
 				_G(spieler).R55RaumOk = true;
 				autoMove(6, P_CHEWY);
 				_G(spieler).PersonHide[P_CHEWY] = true;
-				start_detail_wait(10, 1, ANI_FRONT);
-				_G(det)->start_detail(11, 255, ANI_FRONT);
-				start_aad_wait(329, -1);
+				startSetailWait(10, 1, ANI_FRONT);
+				_G(det)->startDetail(11, 255, ANI_FRONT);
+				startAadWait(329, -1);
 				_G(det)->stop_detail(11);
-				start_detail_wait(10, 1, ANI_BACK);
+				startSetailWait(10, 1, ANI_BACK);
 
 				_G(spieler).PersonHide[P_CHEWY] = false;
 				autoMove(7, P_CHEWY);
 				_G(flags).NoScroll = true;
 				auto_scroll(0, 0);
-				start_aad_wait(330, -1);
+				startAadWait(330, -1);
 				_G(det)->showStaticSpr(8);
-				start_detail_wait(0, 1, ANI_FRONT);
-				_G(det)->start_detail(1, 255, ANI_FRONT);
-				start_aad_wait(331, -1);
+				startSetailWait(0, 1, ANI_FRONT);
+				_G(det)->startDetail(1, 255, ANI_FRONT);
+				startAadWait(331, -1);
 				_G(det)->stop_detail(1);
 
 				_G(det)->showStaticSpr(16);
-				start_aad_wait(608, -1);
+				startAadWait(608, -1);
 				_G(det)->hideStaticSpr(16);
-				start_detail_wait(2, 1, ANI_FRONT);
+				startSetailWait(2, 1, ANI_FRONT);
 				_G(det)->hideStaticSpr(0);
 				_G(det)->hideStaticSpr(8);
 				_G(atds)->set_ats_str(354, 1, ATS_DATA);
 				flic_cut(FCUT_071);
 				_G(spieler).PersonRoomNr[P_HOWARD] = 55;
 
-				set_person_pos(178, 75, P_CHEWY, P_LEFT);
-				set_person_pos(66, 73, P_HOWARD, P_RIGHT);
+				setPersonPos(178, 75, P_CHEWY, P_LEFT);
+				setPersonPos(66, 73, P_HOWARD, P_RIGHT);
 				_G(SetUpScreenFunc) = nullptr;
 				_G(det)->set_static_ani(18, -1);
-				start_aad_wait(334, -1);
-				start_aad_wait(335, -1);
-				start_aad_wait(336, -1);
+				startAadWait(334, -1);
+				startAadWait(335, -1);
+				startAadWait(336, -1);
 				const int16 tmp_delay = _G(spieler).DelaySpeed;
 
 				for (int16 i = 0; i < 7; i++) {
@@ -234,7 +234,7 @@ int16 Room55::use_telefon() {
 						--delay;
 					}
 
-					set_up_screen(DO_SETUP);
+					setupScreen(DO_SETUP);
 					SHOULD_QUIT_RETURN0;
 				}
 
@@ -258,12 +258,12 @@ int16 Room55::use_telefon() {
 				switch_room(54);
 			} else {
 				hideCur();
-				start_aad_wait(332, -1);
+				startAadWait(332, -1);
 				showCur();
 			}
 		} else {
 			hideCur();
-			start_aad_wait(328, -1);
+			startAadWait(328, -1);
 			showCur();
 		}
 	}
@@ -303,7 +303,7 @@ void Room55::get_job() {
 	if (r_nr == 54)
 		_G(flags).LoadGame = false;
 
-	set_person_pos(118, 96, P_CHEWY, P_LEFT);
+	setPersonPos(118, 96, P_CHEWY, P_LEFT);
 	switch_room(r_nr);
 	_G(flags).LoadGame = false;
 }
@@ -326,16 +326,16 @@ void Room55::rock2mans() {
 }
 
 void Room55::verleger_mov(int16 mode) {
-	start_detail_wait(7, 1, ANI_FRONT);
+	startSetailWait(7, 1, ANI_FRONT);
 	_G(det)->showStaticSpr(11);
-	start_detail_wait(13, 1, ANI_FRONT);
-	start_detail_wait(14, 1, ANI_FRONT);
+	startSetailWait(13, 1, ANI_FRONT);
+	startSetailWait(14, 1, ANI_FRONT);
 
 	if (_G(spieler).ChewyAni == CHEWY_JMANS)
 		start_spz(CH_JM_TITS, 1, ANI_FRONT, P_CHEWY);
 	
 	if (mode)
-		start_detail_wait(15, 1, ANI_FRONT);
+		startSetailWait(15, 1, ANI_FRONT);
 
 	_G(det)->set_static_ani(16, -1);
 }
@@ -347,7 +347,7 @@ void Room55::strasse(int16 mode) {
 		_G(det)->del_static_ani(4);
 		_G(det)->stop_detail(4);
 		_G(atds)->set_steuer_bit(340, ATS_AKTIV_BIT, ATS_DATA);
-		start_detail_wait(3, 1, ANI_BACK);
+		startSetailWait(3, 1, ANI_BACK);
 
 		_G(spieler).scrollx = 0;
 		switch_room(54);
@@ -361,11 +361,11 @@ int16 Room55::use_kammeraus() {
 		action_ret = true;
 
 		if (!_G(spieler).R52KakerWeg)
-			start_aad_wait(325, -1);
+			startAadWait(325, -1);
 		else if (!_G(spieler).R55SekWeg) {
 			hideCur();
 			_G(spieler).PersonHide[P_CHEWY] = true;
-			start_detail_wait(5, 1, ANI_FRONT);
+			startSetailWait(5, 1, ANI_FRONT);
 			_G(det)->showStaticSpr(10);
 			flic_cut(FCUT_070);
 			register_cutscene(18);
@@ -437,7 +437,7 @@ void Room55::talk_line() {
 		_G(room)->set_timer_status(aniNr, TIMER_STOP);
 		_G(det)->stop_detail(aniNr);
 		_G(det)->del_static_ani(aniNr);
-		start_detail_wait(22, 1, ANI_FRONT);
+		startSetailWait(22, 1, ANI_FRONT);
 		_G(det)->set_static_ani(21, -1);
 	} else if (!_G(spieler).R55RaumOk) {
 		autoMove(3, P_CHEWY);
@@ -445,14 +445,14 @@ void Room55::talk_line() {
 		_G(spieler).R55ExitDia = 324;
 	}
 
-	start_aad_wait(aad_nr, -1);
+	startAadWait(aad_nr, -1);
 
 	if (_G(spieler).R55SekWeg) {
 		_G(det)->del_static_ani(16);
-		start_detail_wait(14, 1, ANI_FRONT);
+		startSetailWait(14, 1, ANI_FRONT);
 	} else {
 		_G(det)->del_static_ani(21);
-		start_detail_wait(22, 1, ANI_FRONT);
+		startSetailWait(22, 1, ANI_FRONT);
 	}
 
 	_G(flags).NoScroll = false;
diff --git a/engines/chewy/rooms/room56.cpp b/engines/chewy/rooms/room56.cpp
index 3f9beb7d48b..0e2cb14324a 100644
--- a/engines/chewy/rooms/room56.cpp
+++ b/engines/chewy/rooms/room56.cpp
@@ -40,7 +40,7 @@ void Room56::entry() {
 		_G(det)->showStaticSpr(10);
 		_G(room)->set_timer_status(0, TIMER_STOP);
 		_G(det)->del_static_ani(0);
-		_G(det)->start_detail(13, 255, ANI_FRONT);
+		_G(det)->startDetail(13, 255, ANI_FRONT);
 	} else
 		_G(timer_nr)[0] = _G(room)->set_timer(255, 25);
 
@@ -54,16 +54,16 @@ void Room56::entry() {
 			_G(spieler).PersonHide[P_HOWARD] = true;
 			_G(det)->hideStaticSpr(2);
 			_G(zoom_horizont) = 0;
-			set_person_pos(-6, 16, P_HOWARD, P_RIGHT);
-			set_person_pos(3, 42, P_CHEWY, P_RIGHT);
+			setPersonPos(-6, 16, P_HOWARD, P_RIGHT);
+			setPersonPos(3, 42, P_CHEWY, P_RIGHT);
 			g_engine->_sound->stopSound(0);
 			g_engine->_sound->playSound(7, 1);
-			start_detail_wait(7, 1, ANI_BACK);
-			start_detail_wait(8, 1, ANI_FRONT);
+			startSetailWait(7, 1, ANI_BACK);
+			startSetailWait(8, 1, ANI_FRONT);
 			g_engine->_sound->stopSound(1);
 			g_engine->_sound->playSound(7, 0);
-			start_detail_wait(7, 1, ANI_FRONT);
-			set_up_screen(DO_SETUP);
+			startSetailWait(7, 1, ANI_FRONT);
+			setupScreen(DO_SETUP);
 
 			if (!_G(spieler).R56GetTabak) {
 				flic_cut(FCUT_074);
@@ -88,8 +88,8 @@ void Room56::entry() {
 			_G(zoom_horizont) = 114;
 			_G(room)->set_zoom(70);
 			_G(spieler).R62Flucht = false;
-			set_person_pos(308, 97, P_HOWARD, P_RIGHT);
-			set_person_pos(429, 146, P_CHEWY, P_LEFT);
+			setPersonPos(308, 97, P_HOWARD, P_RIGHT);
+			setPersonPos(429, 146, P_CHEWY, P_LEFT);
 			_G(spieler).scrollx = 262;
 			_G(spieler).PersonHide[P_HOWARD] = false;
 			_G(det)->showStaticSpr(9);
@@ -100,7 +100,7 @@ void Room56::entry() {
 			_G(maus_links_click) = false;
 			_G(atds)->stop_aad();
 			hideCur();
-			start_aad_wait(306, -1);
+			startAadWait(306, -1);
 			showCur();
 			flic_cut(FCUT_076);
 			mode = 1;
@@ -134,8 +134,8 @@ void Room56::entry() {
 					hideCur();
 					_G(spieler).scrollx = _G(spieler).scrolly = 0;
 					_G(zoom_horizont) = 0;
-					set_person_pos(-6, 16, P_HOWARD, P_RIGHT);
-					set_person_pos(3, 42, P_CHEWY, P_RIGHT);
+					setPersonPos(-6, 16, P_HOWARD, P_RIGHT);
+					setPersonPos(3, 42, P_CHEWY, P_RIGHT);
 					_G(room)->set_zoom(23);
 					_G(spieler).ZoomXy[P_HOWARD][0] = 17;
 					_G(spieler).ZoomXy[P_HOWARD][1] = 37;
@@ -214,8 +214,8 @@ int16 Room56::use_taxi() {
 		autoMove(1, P_CHEWY);
 		g_engine->_sound->stopSound(0);
 		g_engine->_sound->playSound(7, 1);
-		start_detail_wait(7, 1, ANI_BACK);
-		_G(det)->start_detail(8, 1, ANI_FRONT);
+		startSetailWait(7, 1, ANI_BACK);
+		_G(det)->startDetail(8, 1, ANI_FRONT);
 		_G(zoom_horizont) = 0;
 		_G(room)->set_zoom(23);
 		_G(spieler).ZoomXy[P_HOWARD][0] = 17;
@@ -242,7 +242,7 @@ void Room56::talk_man() {
 		start_ads_wait(16);
 	} else if (!_G(spieler).R62Flucht) {
 		hideCur();
-		start_aad_wait(343, -1);
+		startAadWait(343, -1);
 		showCur();
 	}
 }
@@ -260,20 +260,20 @@ int16 Room56::use_man() {
 	_G(det)->del_static_ani(0);
 
 	if (!_G(spieler).R56WhiskyMix) {
-		start_detail_wait(4, 1, ANI_FRONT);
+		startSetailWait(4, 1, ANI_FRONT);
 
 		_G(det)->set_static_ani(5, -1);
-		start_aad_wait(304, -1);
+		startAadWait(304, -1);
 		_G(det)->del_static_ani(5);
 		_G(room)->set_timer_status(0, TIMER_START);
 		_G(det)->set_static_ani(0, -1);
 	} else {
 		del_inventar(_G(spieler).AkInvent);
 		_G(spieler).R56AbfahrtOk = true;
-		start_detail_wait(6, 1, ANI_FRONT);
+		startSetailWait(6, 1, ANI_FRONT);
 
 		_G(det)->set_static_ani(1, -1);
-		start_aad_wait(305, -1);
+		startAadWait(305, -1);
 		_G(det)->del_static_ani(1);
 	}
 	_G(room)->set_timer_status(0, TIMER_START);
@@ -290,7 +290,7 @@ int16 Room56::use_kneipe() {
 			action_ret = true;
 			hideCur();
 			if (_G(spieler).R56Kneipe) {
-				start_aad_wait(344, -1);
+				startAadWait(344, -1);
 			} else {
 				_G(SetUpScreenFunc) = nullptr;
 				autoMove(4, P_CHEWY);
@@ -300,29 +300,29 @@ int16 Room56::use_kneipe() {
 				_G(spieler).R56Kneipe = true;
 				_G(flags).NoScroll = true;
 				auto_scroll(0, 0);
-				start_detail_wait(12, 3, ANI_FRONT);
+				startSetailWait(12, 3, ANI_FRONT);
 				flic_cut(FCUT_075);
 				g_engine->_sound->stopSound(0);
 				g_engine->_sound->playSound(9);
-				_G(det)->start_detail(10, 6, ANI_FRONT);
-				start_aad_wait(307, -1);
+				_G(det)->startDetail(10, 6, ANI_FRONT);
+				startAadWait(307, -1);
 				_G(det)->stop_detail(10);
 				g_engine->_sound->playSound(10, 0);
 				_G(out)->ausblenden(0);
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 				_G(spieler).PersonHide[P_CHEWY] = false;
 				_G(spieler).PersonHide[P_HOWARD] = false;
 				_G(spieler).scrollx = 0;
-				set_person_pos(23, 70, P_HOWARD, P_RIGHT);
-				set_person_pos(50, 81, P_CHEWY, P_LEFT);
+				setPersonPos(23, 70, P_HOWARD, P_RIGHT);
+				setPersonPos(50, 81, P_CHEWY, P_LEFT);
 				_G(fx_blend) = BLEND3;
-				start_aad_wait(308, -1);
+				startAadWait(308, -1);
 
 				_G(SetUpScreenFunc) = setup_func;
 				_G(flags).NoScroll = false;
 				if (_G(obj)->checkInventory(SACKGELD_INV)) {
 					remove_inventory(SACKGELD_INV);
-					start_aad_wait(309, -1);
+					startAadWait(309, -1);
 				}
 			}
 			showCur();
@@ -334,16 +334,16 @@ int16 Room56::use_kneipe() {
 			autoMove(4, P_CHEWY);
 			flic_cut(FCUT_111);
 			_G(fx_blend) = BLEND3;
-			start_aad_wait(522, -1);
+			startAadWait(522, -1);
 			start_spz_wait(66, 1, false, P_CHEWY);
 			start_spz(67, 255, false, P_CHEWY);
-			start_aad_wait(524, -1);
+			startAadWait(524, -1);
 			_G(spieler).SVal1 = 56;
 			_G(spieler).SVal2 = 523;
 			cur_2_inventory();
 			switch_room(92);
 		} else {
-			start_aad_wait(518, -1);
+			startAadWait(518, -1);
 		}
 		showCur();
 	} else if (_G(menu_item) == 0 || _G(menu_item) == 2 || (_G(menu_item) == 1 && !_G(spieler).inv_cur)){
@@ -351,14 +351,14 @@ int16 Room56::use_kneipe() {
 		action_ret = 1;
 		_G(maus_links_click) = false;
 		autoMove(4, P_CHEWY);
-		start_aad_wait(521, -1);
+		startAadWait(521, -1);
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
 		_G(flags).NoPalAfterFlc = true;
 		flic_cut(FCUT_112);
 		register_cutscene(31);
 
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		_G(fx_blend) = BLEND3;
 		showCur();
 		g_engine->_sound->playSound(9, 0);
@@ -379,7 +379,7 @@ int16 Room56::proc1(int16 key) {
 void Room56::start_flug() {
 	if (!_G(spieler).flags32_10 && !_G(r56koch_flug)) {
 		_G(r56koch_flug) = 12;
-		_G(det)->start_detail(_G(r56koch_flug), 1, ANI_FRONT);
+		_G(det)->startDetail(_G(r56koch_flug), 1, ANI_FRONT);
 	}
 }
 
@@ -400,14 +400,14 @@ void Room56::setup_func() {
 
 		case 11:
 			if (_G(det)->get_ani_status(11) == false) {
-				_G(det)->start_detail(10, 1, ANI_FRONT);
+				_G(det)->startDetail(10, 1, ANI_FRONT);
 				_G(r56koch_flug) = 10;
 			}
 			break;
 
 		case 12:
 			if (_G(det)->get_ani_status(12) == false) {
-				_G(det)->start_detail(11, 1, ANI_FRONT);
+				_G(det)->startDetail(11, 1, ANI_FRONT);
 				_G(r56koch_flug) = 11;
 			}
 			break;
diff --git a/engines/chewy/rooms/room57.cpp b/engines/chewy/rooms/room57.cpp
index 6956a1352f3..254a14b395b 100644
--- a/engines/chewy/rooms/room57.cpp
+++ b/engines/chewy/rooms/room57.cpp
@@ -45,8 +45,8 @@ void Room57::entry() {
 		_G(spieler).R48TaxiEntry = false;
 		_G(spieler).scrollx = 0;
 		_G(spieler).scrolly = 0;
-		set_person_pos(4, 144, P_HOWARD, P_LEFT);
-		set_person_pos(40, 160, P_CHEWY, P_RIGHT);
+		setPersonPos(4, 144, P_HOWARD, P_LEFT);
+		setPersonPos(40, 160, P_CHEWY, P_RIGHT);
 		autoMove(2, P_CHEWY);
 		_G(maus_links_click) = false;
 		showCur();
@@ -101,7 +101,7 @@ int16 Room57::use_taxi() {
 		g_engine->_sound->playSound(3);
 		_G(room)->set_timer_status(3, TIMER_STOP);
 		_G(det)->del_static_ani(3);
-		start_detail_wait(5, 1, ANI_FRONT);
+		startSetailWait(5, 1, ANI_FRONT);
 		g_engine->_sound->stopSound(0);
 		switch_room(48);
 	}
@@ -118,31 +118,31 @@ int16 Room57::use_pfoertner() {
 	if (is_cur_inventar(CUTMAG_INV)) {
 		action_ret = true;
 		if (_G(spieler).flags37_10)
-			start_aad_wait(596, -1);
+			startAadWait(596, -1);
 		else {
 			_G(spieler).flags37_10 = true;
-			start_aad_wait(339, -1);
+			startAadWait(339, -1);
 			new_invent_2_cur(BESTELL_INV);
 		}
 	} else if (is_cur_inventar(JMKOST_INV)) {
 		action_ret = true;
-		start_aad_wait(340, -1);
+		startAadWait(340, -1);
 	} else if (is_cur_inventar(EINLAD_INV)) {
 		action_ret = true;
 		_G(SetUpScreenFunc) = nullptr;
 		goAutoXy(132, 130, P_HOWARD, ANI_WAIT);
 		if (_G(spieler).R56AbfahrtOk) {
-			start_aad_wait(341, -1);
+			startAadWait(341, -1);
 			goAutoXy(176, 130, P_HOWARD, ANI_WAIT);
 			del_inventar(_G(spieler).AkInvent);
 			_G(spieler).R57StudioAuf = true;
 			_G(spieler).room_e_obj[91].Attribut = AUSGANG_OBEN;
 			_G(det)->hideStaticSpr(4);
-			start_detail_wait(6, 1, ANI_WAIT);
+			startSetailWait(6, 1, ANI_WAIT);
 			g_engine->_sound->stopSound(0);
 			_G(atds)->set_steuer_bit(358, ATS_AKTIV_BIT, ATS_DATA);
 		} else {
-			start_aad_wait(349, -1);
+			startAadWait(349, -1);
 			goAutoXy(176, 130, P_HOWARD, ANI_WAIT);
 		}
 		_G(SetUpScreenFunc) = setup_func;
@@ -164,7 +164,7 @@ void Room57::talk_pfoertner() {
 		aad_nr = 338;
 	} else
 		aad_nr = 342;
-	start_aad_wait(aad_nr, -1);
+	startAadWait(aad_nr, -1);
 	_G(room)->set_timer_status(1, TIMER_START);
 	_G(det)->set_static_ani(1, -1);
 	showCur();
diff --git a/engines/chewy/rooms/room62.cpp b/engines/chewy/rooms/room62.cpp
index a61bf337551..5908b78ce8f 100644
--- a/engines/chewy/rooms/room62.cpp
+++ b/engines/chewy/rooms/room62.cpp
@@ -38,37 +38,37 @@ void Room62::entry() {
 		_G(cur_hide_flag) = false;
 		hideCur();
 		_G(spieler).R62FirstEntry = true;
-		set_person_pos(49, 113, P_HOWARD, P_RIGHT);
-		_G(det)->start_detail(6, 255, ANI_FRONT);
-		start_aad_wait(345, -1);
+		setPersonPos(49, 113, P_HOWARD, P_RIGHT);
+		_G(det)->startDetail(6, 255, ANI_FRONT);
+		startAadWait(345, -1);
 		_G(det)->stop_detail(6);
 		_G(det)->set_static_ani(5, -1);
 		goAutoXy(199, 59, P_HOWARD, ANI_WAIT);
-		set_person_spr(0, P_HOWARD);
+		setPersonSpr(0, P_HOWARD);
 		_G(det)->del_static_ani(5);
-		_G(det)->start_detail(5, 255, ANI_FRONT);
-		start_aad_wait(346, -1);
+		_G(det)->startDetail(5, 255, ANI_FRONT);
+		startAadWait(346, -1);
 		_G(det)->stop_detail(5);
-		_G(det)->start_detail(6, 255, ANI_FRONT);
-		start_aad_wait(347, -1);
+		_G(det)->startDetail(6, 255, ANI_FRONT);
+		startAadWait(347, -1);
 		_G(det)->stop_detail(6);
-		start_detail_wait(7, 1, ANI_FRONT);
+		startSetailWait(7, 1, ANI_FRONT);
 		_G(det)->set_static_ani(5, -1);
-		_G(det)->start_detail(0, 255, ANI_FRONT);
-		start_aad_wait(348, -1);
+		_G(det)->startDetail(0, 255, ANI_FRONT);
+		startAadWait(348, -1);
 		_G(det)->stop_detail(0);
 		_G(det)->del_static_ani(0);
-		_G(det)->start_detail(1, 1, ANI_FRONT);
+		_G(det)->startDetail(1, 1, ANI_FRONT);
 		autoMove(0, P_CHEWY);
 		_G(spieler_mi)[P_CHEWY].Mode = true;
 		goAutoXy(160, 240, P_CHEWY, ANI_WAIT);
 		_G(spieler_mi)[P_CHEWY].Mode = false;
 		_G(det)->del_static_ani(5);
-		start_detail_wait(7, 1, ANI_FRONT);
+		startSetailWait(7, 1, ANI_FRONT);
 		showCur();
 		_G(spieler).R64Moni1Ani = 3;
 		_G(spieler).R64Moni2Ani = 4;
-		set_person_pos(187, 43, P_CHEWY, P_RIGHT);
+		setPersonPos(187, 43, P_CHEWY, P_RIGHT);
 		_G(spieler).R62TShow = true;
 		switch_room(64);
 	} else {
@@ -90,7 +90,7 @@ void Room62::setup_func() {
 			_G(r62TalkAni) = 8;
 		else
 			_G(r62TalkAni) = 4;
-		_G(det)->start_detail(_G(r62TalkAni), 255, ANI_FRONT);
+		_G(det)->startDetail(_G(r62TalkAni), 255, ANI_FRONT);
 	} else
 		--_G(r62Delay);
 }
@@ -106,9 +106,9 @@ int16 Room62::use_laura() {
 		_G(det)->del_static_ani(8);
 		_G(det)->stop_detail(8);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		_G(det)->start_detail(2, 255, ANI_FRONT);
-		_G(det)->start_detail(6, 255, ANI_FRONT);
-		start_aad_wait(399, -1);
+		_G(det)->startDetail(2, 255, ANI_FRONT);
+		_G(det)->startDetail(6, 255, ANI_FRONT);
+		startAadWait(399, -1);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		flic_cut(FCUT_077);
 		showCur();
diff --git a/engines/chewy/rooms/room63.cpp b/engines/chewy/rooms/room63.cpp
index b5dd906c603..93d0cd6d9ce 100644
--- a/engines/chewy/rooms/room63.cpp
+++ b/engines/chewy/rooms/room63.cpp
@@ -38,16 +38,16 @@ void Room63::entry() {
 	if (!_G(spieler).R63Uhr) {
 		_G(cur_hide_flag) = false;
 		hideCur();
-		_G(det)->start_detail(12, 255, ANI_FRONT);
-		_G(det)->start_detail(10, 255, ANI_FRONT);
-		_G(det)->start_detail(18, 255, ANI_FRONT);
+		_G(det)->startDetail(12, 255, ANI_FRONT);
+		_G(det)->startDetail(10, 255, ANI_FRONT);
+		_G(det)->startDetail(18, 255, ANI_FRONT);
 		autoMove(4, P_CHEWY);
 		_G(det)->stop_detail(10);
-		_G(det)->start_detail(11, 255, ANI_FRONT);
+		_G(det)->startDetail(11, 255, ANI_FRONT);
 		auto_scroll(58, 0);
-		start_aad_wait(355, -1);
+		startAadWait(355, -1);
 		_G(det)->stop_detail(11);
-		_G(det)->start_detail(10, 255, ANI_FRONT);
+		_G(det)->startDetail(10, 255, ANI_FRONT);
 		showCur();
 	} else if (!_G(spieler).R63Feuer) {
 		_G(det)->showStaticSpr(10);
@@ -57,11 +57,11 @@ void Room63::entry() {
 		_G(SetUpScreenFunc) = setup_func;
 		cur_2_inventory();
 		_G(spieler).scrollx = 176;
-		set_person_pos(424, 78, P_CHEWY, P_LEFT);
+		setPersonPos(424, 78, P_CHEWY, P_LEFT);
 		_G(spieler).PersonHide[P_CHEWY] = true;
 		_G(spieler).room_e_obj[95].Attribut = 255;
 		_G(r63ChewyAni) = 0;
-		_G(det)->start_detail(0, 1, ANI_FRONT);
+		_G(det)->startDetail(0, 1, ANI_FRONT);
 	}
 }
 
@@ -79,7 +79,7 @@ void Room63::setup_func() {
 			if (_G(r63RunDia) < 4)
 				++_G(r63RunDia);
 			start_aad(370 + _G(r63RunDia));
-			_G(det)->start_detail(1, 1, ANI_FRONT);
+			_G(det)->startDetail(1, 1, ANI_FRONT);
 			_G(r63ChewyAni) = 1;
 		}
 		break;
@@ -87,9 +87,9 @@ void Room63::setup_func() {
 	case 1:
 		if (_G(det)->get_ani_status(1) == false) {
 			_G(spieler).ScrollxStep = 4;
-			set_person_pos(0, 0, P_CHEWY, P_RIGHT);
-			_G(det)->start_detail(22, 1, ANI_FRONT);
-			_G(det)->start_detail(2, 1, ANI_FRONT);
+			setPersonPos(0, 0, P_CHEWY, P_RIGHT);
+			_G(det)->startDetail(22, 1, ANI_FRONT);
+			_G(det)->startDetail(2, 1, ANI_FRONT);
 			_G(atds)->stop_aad();
 			_G(r63ChewyAni) = 2;
 		}
@@ -97,7 +97,7 @@ void Room63::setup_func() {
 
 	case 2:
 		if (_G(det)->get_ani_status(2) == false) {
-			_G(det)->start_detail(3, 1, ANI_FRONT);
+			_G(det)->startDetail(3, 1, ANI_FRONT);
 			_G(r63ChewyAni) = 3;
 		}
 		break;
@@ -111,11 +111,11 @@ void Room63::setup_func() {
 				_G(spieler).ScrollxStep = 16;
 				_G(spieler).scrollx -= _G(spieler).scrollx % 16;
 				auto_scroll(176, 0);
-				set_person_pos(424, 78, P_CHEWY, P_LEFT);
+				setPersonPos(424, 78, P_CHEWY, P_LEFT);
 				_G(flags).NoScroll = false;
 				_G(spieler).ScrollxStep = 4;
 				if (!_G(r63Schalter)) {
-					_G(det)->start_detail(0, 1, ANI_FRONT);
+					_G(det)->startDetail(0, 1, ANI_FRONT);
 					_G(r63ChewyAni) = 0;
 				} else
 					bork_platt();
@@ -140,10 +140,10 @@ void Room63::bork_platt() {
 	_G(spieler_mi)[P_CHEWY].Mode = true;
 	autoMove(6, P_CHEWY);
 	_G(spieler_mi)[P_CHEWY].Mode = false;
-	start_aad_wait(370, -1);
-	start_detail_wait(4, 1, ANI_FRONT);
+	startAadWait(370, -1);
+	startSetailWait(4, 1, ANI_FRONT);
 	_G(det)->showStaticSpr(13);
-	start_aad_wait(361, -1);
+	startAadWait(361, -1);
 	_G(out)->cls();
 	_G(flags).NoPalAfterFlc = true;
 	flic_cut(FCUT_079);
@@ -160,8 +160,8 @@ void Room63::talk_hunter() {
 	autoMove(3, P_CHEWY);
 	if (_G(spieler).R63Uhr)
 		_G(det)->hideStaticSpr(10);
-	_G(det)->start_detail(10, 255, ANI_FRONT);
-	start_aad_wait(356, -1);
+	_G(det)->startDetail(10, 255, ANI_FRONT);
+	startAadWait(356, -1);
 	if (_G(spieler).R63Uhr) {
 		_G(det)->showStaticSpr(10);
 		_G(det)->stop_detail(10);
@@ -175,13 +175,13 @@ void Room63::talk_regie() {
 	if (_G(spieler).R63Uhr)
 		_G(det)->hideStaticSpr(12);
 	_G(det)->stop_detail(18);
-	_G(det)->start_detail(19, 255, ANI_FRONT);
-	start_aad_wait(357, -1);
+	_G(det)->startDetail(19, 255, ANI_FRONT);
+	startAadWait(357, -1);
 	_G(det)->stop_detail(19);
 	if (_G(spieler).R63Uhr) {
 		_G(det)->showStaticSpr(12);
 	} else {
-		_G(det)->start_detail(18, 255, ANI_FRONT);
+		_G(det)->startDetail(18, 255, ANI_FRONT);
 	}
 	showCur();
 }
@@ -189,7 +189,7 @@ void Room63::talk_regie() {
 void Room63::talk_fx_man() {
 	hideCur();
 	autoMove(1, P_CHEWY);
-	start_aad_wait(358, -1);
+	startAadWait(358, -1);
 	showCur();
 }
 
@@ -201,13 +201,13 @@ int16 Room63::use_fx_man() {
 		autoMove(1, P_CHEWY);
 		del_inventar(_G(spieler).AkInvent);
 		remove_inventory(34);
-		start_aad_wait(359, -1);
+		startAadWait(359, -1);
 		_G(det)->del_static_ani(5);
-		start_detail_wait(6, 1, ANI_FRONT);
-		_G(det)->start_detail(7, 255, ANI_FRONT);
-		start_aad_wait(362, -1);
+		startSetailWait(6, 1, ANI_FRONT);
+		_G(det)->startDetail(7, 255, ANI_FRONT);
+		startAadWait(362, -1);
 		_G(det)->stop_detail(7);
-		start_detail_wait(8, 1, ANI_FRONT);
+		startSetailWait(8, 1, ANI_FRONT);
 		_G(spieler).R63FxMannWeg = true;
 		_G(atds)->set_steuer_bit(384, ATS_AKTIV_BIT, ATS_DATA);
 		showCur();
@@ -229,21 +229,21 @@ int16 Room63::use_schalter() {
 				autoMove(1, P_CHEWY);
 				start_spz_wait(CH_ROCK_GET2, 1, false, P_CHEWY);
 				_G(det)->showStaticSpr(2);
-				set_person_spr(P_LEFT, P_CHEWY);
-				start_detail_wait(21, 1, ANI_FRONT);
+				setPersonSpr(P_LEFT, P_CHEWY);
+				startSetailWait(21, 1, ANI_FRONT);
 				_G(det)->showStaticSpr(14);
-				wait_show_screen(18);
+				waitShowScreen(18);
 				_G(det)->hideStaticSpr(14);
-				start_detail_wait(24, 1, ANI_FRONT);
+				startSetailWait(24, 1, ANI_FRONT);
 				_G(det)->showStaticSpr(1);
 				_G(det)->hideStaticSpr(2);
-				start_aad_wait(364, -1);
+				startAadWait(364, -1);
 				_G(atds)->set_ats_str(385, 1, ATS_DATA);
 				showCur();
 			}
 		} else {
 			hideCur();
-			start_aad_wait(363, -1);
+			startAadWait(363, -1);
 			showCur();
 		}
 	}
@@ -253,11 +253,11 @@ int16 Room63::use_schalter() {
 void Room63::talk_girl() {
 	autoMove(2, P_CHEWY);
 	_G(det)->stop_detail(12);
-	start_detail_wait(13, 1, ANI_FRONT);
+	startSetailWait(13, 1, ANI_FRONT);
 	_G(det)->set_static_ani(14, -1);
 	start_ads_wait(17);
 	_G(det)->del_static_ani(14);
-	_G(det)->start_detail(12, 255, ANI_FRONT);
+	_G(det)->startDetail(12, 255, ANI_FRONT);
 }
 
 int16 Room63::use_girl() {
@@ -268,14 +268,14 @@ int16 Room63::use_girl() {
 		autoMove(2, P_CHEWY);
 		del_inventar(_G(spieler).AkInvent);
 		_G(det)->stop_detail(12);
-		start_detail_wait(13, 1, ANI_FRONT);
+		startSetailWait(13, 1, ANI_FRONT);
 		_G(det)->set_static_ani(14, -1);
-		start_aad_wait(365, -1);
+		startAadWait(365, -1);
 		_G(det)->del_static_ani(14);
-		_G(det)->start_detail(15, 255, ANI_FRONT);
-		start_aad_wait(360, -1);
+		_G(det)->startDetail(15, 255, ANI_FRONT);
+		startAadWait(360, -1);
 		_G(det)->stop_detail(15);
-		start_detail_wait(16, 1, ANI_FRONT);
+		startSetailWait(16, 1, ANI_FRONT);
 		_G(spieler).R63Uhr = true;
 		_G(det)->stop_detail(10);
 		_G(det)->stop_detail(18);
@@ -284,7 +284,7 @@ int16 Room63::use_girl() {
 		_G(atds)->set_ats_str(381, 1, ATS_DATA);
 		_G(atds)->set_ats_str(382, 1, ATS_DATA);
 		_G(atds)->set_steuer_bit(380, ATS_AKTIV_BIT, ATS_DATA);
-		start_aad_wait(367, -1);
+		startAadWait(367, -1);
 		showCur();
 	}
 	return action_ret;
@@ -304,12 +304,12 @@ int16 Room63::use_aschenbecher() {
 				auto_scroll(70, 0);
 				autoMove(1, P_CHEWY);
 				_G(spieler).PersonHide[P_CHEWY] = true;
-				_G(det)->start_detail(20, 255, ANI_FRONT);
-				_G(det)->start_detail(10, 255, ANI_FRONT);
-				_G(det)->start_detail(18, 255, ANI_FRONT);
+				_G(det)->startDetail(20, 255, ANI_FRONT);
+				_G(det)->startDetail(10, 255, ANI_FRONT);
+				_G(det)->startDetail(18, 255, ANI_FRONT);
 				_G(det)->hideStaticSpr(10);
 				_G(det)->hideStaticSpr(12);
-				start_aad_wait(368, -1);
+				startAadWait(368, -1);
 				flic_cut(FCUT_080);
 				_G(atds)->set_steuer_bit(381, ATS_AKTIV_BIT, ATS_DATA);
 				_G(atds)->set_steuer_bit(382, ATS_AKTIV_BIT, ATS_DATA);
@@ -317,13 +317,13 @@ int16 Room63::use_aschenbecher() {
 				_G(spieler).R63Feuer = true;
 				_G(spieler).PersonHide[P_CHEWY] = false;
 				_G(spieler).scrollx = 0;
-				set_person_pos(187, 42, P_CHEWY, P_RIGHT);
+				setPersonPos(187, 42, P_CHEWY, P_RIGHT);
 				switch_room(64);
 				_G(flags).NoScroll = false;
 			} else
-				start_aad_wait(369, -1);
+				startAadWait(369, -1);
 		} else
-			start_aad_wait(366, -1);
+			startAadWait(366, -1);
 		
 		showCur();
 	}
diff --git a/engines/chewy/rooms/room64.cpp b/engines/chewy/rooms/room64.cpp
index 3400019d662..7295e93320a 100644
--- a/engines/chewy/rooms/room64.cpp
+++ b/engines/chewy/rooms/room64.cpp
@@ -34,7 +34,7 @@ void Room64::entry() {
 	_G(r64TalkAni) = _G(spieler).R64Moni1Ani;
 
 	if (_G(spieler).flags38_1)
-		_G(det)->start_detail(0, 255, false);
+		_G(det)->startDetail(0, 255, false);
 	
 	if (!_G(spieler).R64ManWeg) {
 		_G(timer_nr)[0] = _G(room)->set_timer(1, 10);
@@ -49,7 +49,7 @@ void Room64::entry() {
 			_G(spieler).R64Moni1Ani = 5;
 			calc_monitor();
 			hideCur();
-			start_aad_wait(354, -1);
+			startAadWait(354, -1);
 			showCur();
 		}
 	} else
@@ -91,7 +91,7 @@ void Room64::calc_monitor() {
 
 	case 5:
 		str_nr = 1;
-		_G(det)->start_detail(5, 255, ANI_FRONT);
+		_G(det)->startDetail(5, 255, ANI_FRONT);
 		break;
 
 	default:
@@ -127,7 +127,7 @@ void Room64::setup_func() {
 			_G(r64TalkAni) = _G(spieler).R64Moni2Ani;
 
 		if (_G(r64TalkAni) != 0)
-			_G(det)->start_detail(_G(r64TalkAni), 255, ANI_FRONT);
+			_G(det)->startDetail(_G(r64TalkAni), 255, ANI_FRONT);
 	} else
 		--_G(r62Delay);
 }
@@ -144,7 +144,7 @@ void Room64::talk_man(int16 aad_nr) {
 		_G(det)->del_static_ani(1);
 		_G(det)->stop_detail(1);
 		_G(det)->set_static_ani(2, -1);
-		start_aad_wait(aad_nr, -1);
+		startAadWait(aad_nr, -1);
 		_G(det)->del_static_ani(2);
 		_G(room)->set_timer_status(1, TIMER_START);
 		_G(det)->set_static_ani(1, -1);
@@ -162,7 +162,7 @@ int16 Room64::use_tasche() {
 				start_spz_wait(CH_ROCK_GET1, 1, false, P_CHEWY);
 				new_invent_2_cur(GERAET_INV);
 				_G(atds)->set_steuer_bit(375, ATS_AKTIV_BIT, ATS_DATA);
-				start_aad_wait(353, -1);
+				startAadWait(353, -1);
 			} else {
 				showCur();
 				return 0;
@@ -172,8 +172,8 @@ int16 Room64::use_tasche() {
 			_G(room)->set_timer_status(1, TIMER_STOP);
 			_G(det)->del_static_ani(1);
 			_G(det)->stop_detail(1);
-			_G(det)->start_detail(6, 255, false);
-			start_aad_wait(352, -1);
+			_G(det)->startDetail(6, 255, false);
+			startAadWait(352, -1);
 			_G(det)->stop_detail(6);
 			_G(room)->set_timer_status(0, TIMER_START);
 			_G(det)->set_static_ani(1, -1);
diff --git a/engines/chewy/rooms/room65.cpp b/engines/chewy/rooms/room65.cpp
index 72c08c49d70..dcbbfe642ff 100644
--- a/engines/chewy/rooms/room65.cpp
+++ b/engines/chewy/rooms/room65.cpp
@@ -48,7 +48,7 @@ void Room65::entry() {
 	if (_G(spieler).PersonDia[P_HOWARD] < 10000) {
 		_G(cur_hide_flag) = false;
 		hideCur();
-		start_aad_wait(_G(spieler).PersonDia[P_HOWARD], -1);
+		startAadWait(_G(spieler).PersonDia[P_HOWARD], -1);
 		showCur();
 	} else {
 		start_ads_wait(_G(spieler).PersonDia[P_HOWARD] - 10000);
@@ -62,8 +62,8 @@ void Room65::xit() {
 	_G(spieler).scrollx = _G(r65tmp_scrollx);
 	_G(spieler).scrolly = _G(r65tmp_scrolly);
 	set_person_rnr();
-	set_person_pos(_G(r65tmp_ch_x), _G(r65tmp_ch_y), P_CHEWY, -1);
-	set_person_pos(_G(r65tmp_ho_x), _G(r65tmp_ho_y), P_HOWARD, -1);
+	setPersonPos(_G(r65tmp_ch_x), _G(r65tmp_ch_y), P_CHEWY, -1);
+	setPersonPos(_G(r65tmp_ho_x), _G(r65tmp_ho_y), P_HOWARD, -1);
 	_G(room_blk).AadLoad = true;
 	_G(room_blk).AtsLoad = true;
 	_G(maus_links_click) = false;
@@ -138,7 +138,7 @@ void Room65::atds_string_start(int16 dia_nr, int16 str_nr, int16 person_nr, int1
 			break;
 		}
 	} else if (mode == AAD_STR_START) {
-		_G(det)->start_detail(person_nr, 255, ANI_FRONT);
+		_G(det)->startDetail(person_nr, 255, ANI_FRONT);
 	} else {
 		_G(det)->stop_detail(person_nr);
 	}
diff --git a/engines/chewy/rooms/room66.cpp b/engines/chewy/rooms/room66.cpp
index cdc6d1745ce..4b829f4865b 100644
--- a/engines/chewy/rooms/room66.cpp
+++ b/engines/chewy/rooms/room66.cpp
@@ -45,38 +45,38 @@ void Room66::entry(int16 eib_nr) {
 		hideCur();
 		_G(spieler).flags26_4 = true;
 		_G(spieler).scrollx = 476;
-		set_person_pos(598, 101, P_CHEWY, P_RIGHT);
-		set_person_pos(644, 82, P_NICHELLE, P_LEFT);
-		set_person_pos(623, 81, P_HOWARD, P_LEFT);
-		start_aad_wait(413, -1);
+		setPersonPos(598, 101, P_CHEWY, P_RIGHT);
+		setPersonPos(644, 82, P_NICHELLE, P_LEFT);
+		setPersonPos(623, 81, P_HOWARD, P_LEFT);
+		startAadWait(413, -1);
 		autoMove(9, P_CHEWY);
 		_G(SetUpScreenFunc) = setup_func;
-		start_aad_wait(403, -1);
+		startAadWait(403, -1);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(0, 1, ANI_FRONT);
+		startSetailWait(0, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(14);
-		wait_show_screen(15);
+		waitShowScreen(15);
 		_G(det)->hideStaticSpr(14);
-		start_detail_wait(1, 1, ANI_FRONT);
+		startSetailWait(1, 1, ANI_FRONT);
 		load_chewy_taf(CHEWY_NORMAL);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		start_spz(CH_TALK12, 255, false, P_CHEWY);
-		start_aad_wait(404, -1);
-		start_aad_wait(415, -1);
+		startAadWait(404, -1);
+		startAadWait(415, -1);
 		showCur();
 	} else if (!_G(flags).LoadGame && _G(spieler).PersonRoomNr[P_HOWARD] == 66) {
 		switch (eib_nr) {
 		case 96:
-			set_person_pos(488, 114, P_HOWARD, P_RIGHT);
-			set_person_pos(520, 114, P_NICHELLE, P_RIGHT);
+			setPersonPos(488, 114, P_HOWARD, P_RIGHT);
+			setPersonPos(520, 114, P_NICHELLE, P_RIGHT);
 			break;
 		case 97:
-			set_person_pos(22, 114, P_HOWARD, P_RIGHT);
-			set_person_pos(50, 114, P_NICHELLE, P_RIGHT);
+			setPersonPos(22, 114, P_HOWARD, P_RIGHT);
+			setPersonPos(50, 114, P_NICHELLE, P_RIGHT);
 			break;
 		case 101:
-			set_person_pos(150, 114, P_HOWARD, P_RIGHT);
-			set_person_pos(182, 114, P_NICHELLE, P_RIGHT);
+			setPersonPos(150, 114, P_HOWARD, P_RIGHT);
+			setPersonPos(182, 114, P_NICHELLE, P_RIGHT);
 			break;
 		default:
 			break;
@@ -143,14 +143,14 @@ void Room66::setup_func() {
 		return;
 
 	_G(spieler).flags26_8 = true;
-	_G(det)->start_detail(9, 5, false);
-	start_aad_wait(405, -1);
+	_G(det)->startDetail(9, 5, false);
+	startAadWait(405, -1);
 }
 
 void Room66::talk1() {
 	hideCur();
 	autoMove(5, P_CHEWY);
-	start_aad_wait(407, -1);
+	startAadWait(407, -1);
 	showCur();
 }
 
@@ -195,7 +195,7 @@ int Room66::proc7() {
 	_G(cur_hide_flag) = 0;
 	hideCur();
 	if (_G(spieler).flags26_20)
-		start_detail_wait(4, 1, ANI_FRONT);
+		startSetailWait(4, 1, ANI_FRONT);
 	showCur();
 
 	return 1;
@@ -210,7 +210,7 @@ void Room66::proc8(int chewyAutoMovNr, int restartAniNr, int transitionAniNr, in
 	_G(room)->set_timer_status(restartAniNr, TIMER_STOP);
 	_G(det)->del_static_ani(restartAniNr);
 	_G(det)->set_static_ani(transitionAniNr, -1);
-	start_aad_wait(transitionDiaNr, -1);
+	startAadWait(transitionDiaNr, -1);
 	_G(det)->del_static_ani(transitionAniNr);
 	_G(det)->set_static_ani(restartAniNr, -1);
 	_G(room)->set_timer_status(restartAniNr, TIMER_START);
diff --git a/engines/chewy/rooms/room67.cpp b/engines/chewy/rooms/room67.cpp
index e1dc5f43ad1..0a8dd7091f2 100644
--- a/engines/chewy/rooms/room67.cpp
+++ b/engines/chewy/rooms/room67.cpp
@@ -43,10 +43,10 @@ void Room67::entry() {
 		_G(det)->showStaticSpr(0);
 	if (!_G(flags).LoadGame) {
 		hideCur();
-		set_person_pos(102, 132, P_CHEWY, P_RIGHT);
+		setPersonPos(102, 132, P_CHEWY, P_RIGHT);
 		if (_G(spieler).PersonRoomNr[P_HOWARD] == 67) {
-			set_person_pos(12, 100, P_HOWARD, P_RIGHT);
-			set_person_pos(47, 106, P_NICHELLE, P_RIGHT);
+			setPersonPos(12, 100, P_HOWARD, P_RIGHT);
+			setPersonPos(47, 106, P_NICHELLE, P_RIGHT);
 			goAutoXy(214, 112, P_NICHELLE, ANI_GO);
 		}
 		autoMove(7, P_CHEWY);
@@ -83,11 +83,11 @@ int16 Room67::use_grammo() {
 		action_flag = true;
 		autoMove(6, P_CHEWY);
 		start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
-		_G(det)->start_detail(0, 255, ANI_FRONT);
+		_G(det)->startDetail(0, 255, ANI_FRONT);
 		if (_G(spieler).PersonRoomNr[P_HOWARD] == 67)
-			start_aad_wait(376, -1);
+			startAadWait(376, -1);
 		else
-			start_aad_wait(614, -1);
+			startAadWait(614, -1);
 
 		start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
 		_G(det)->stop_detail(0);
@@ -99,7 +99,7 @@ int16 Room67::use_grammo() {
 void Room67::look_brief() {
 	hideCur();
 	autoMove(3, P_CHEWY);
-	start_aad_wait(379, -1);
+	startAadWait(379, -1);
 	showCur();
 }
 
@@ -132,7 +132,7 @@ void Room67::kostuem_aad(int16 aad_nr) {
 	if (_G(spieler).DiaAMov != -1) {
 		autoMove(_G(spieler).DiaAMov, P_CHEWY);
 	}
-	start_aad_wait(aad_nr, -1);
+	startAadWait(aad_nr, -1);
 	showCur();
 }
 
@@ -151,7 +151,7 @@ int16 Room67::talk_papagei() {
 			start_ads_wait(19);
 			_G(room)->set_timer_status(1, TIMER_START);
 		} else if (_G(menu_item) == CUR_NICHELLE) {
-			start_aad_wait(380, -1);
+			startAadWait(380, -1);
 			_G(room)->set_timer_status(1, TIMER_START);
 		} else if (_G(menu_item) == CUR_TALK) {
 			autoMove(5, P_CHEWY);
diff --git a/engines/chewy/rooms/room68.cpp b/engines/chewy/rooms/room68.cpp
index 11a9938df24..59a9458f2d2 100644
--- a/engines/chewy/rooms/room68.cpp
+++ b/engines/chewy/rooms/room68.cpp
@@ -51,7 +51,7 @@ void Room68::entry() {
 	
 	if (_G(spieler).R68Papagei) {
 		_G(det)->showStaticSpr(12);
-		_G(det)->start_detail(21, 255, ANI_FRONT);
+		_G(det)->startDetail(21, 255, ANI_FRONT);
 	}
 
 	if (!_G(spieler).R68DivaWeg) {
@@ -63,8 +63,8 @@ void Room68::entry() {
 	if (!_G(flags).LoadGame) {
 		hideCur();
 		if (_G(spieler).PersonRoomNr[P_HOWARD] == 68) {
-			set_person_pos(524, 51, P_HOWARD, P_LEFT);
-			set_person_pos(550, 54, P_NICHELLE, P_LEFT);
+			setPersonPos(524, 51, P_HOWARD, P_LEFT);
+			setPersonPos(550, 54, P_NICHELLE, P_LEFT);
 		}
 		autoMove(7, P_CHEWY);
 		showCur();
@@ -93,7 +93,7 @@ void Room68::setup_func() {
 	case 0:
 		if (_G(det)->get_ani_status(_G(r68HohesC)) == false) {
 			_G(r68HohesC) = 1;
-			_G(det)->start_detail(_G(r68HohesC), 1, ANI_FRONT);
+			_G(det)->startDetail(_G(r68HohesC), 1, ANI_FRONT);
 		}
 		break;
 
@@ -103,18 +103,18 @@ void Room68::setup_func() {
 			if (_G(spieler).SpeechSwitch) {
 				g_engine->_sound->playSound(2, 0);
 				g_engine->_sound->playSound(_G(r68HohesC));
-				_G(det)->start_detail(_G(r68HohesC), 255, ANI_FRONT);
+				_G(det)->startDetail(_G(r68HohesC), 255, ANI_FRONT);
 
 				// TODO
 				//while (_G(sndPlayer)->getSampleStatus(1) == 4)
-				//	set_up_screen(DO_SETUP);
+				//	setupScreen(DO_SETUP);
 				_G(det)->stop_detail(_G(r68HohesC));
 			} else {
-				_G(det)->start_detail(_G(r68HohesC), 3, ANI_FRONT);
+				_G(det)->startDetail(_G(r68HohesC), 3, ANI_FRONT);
 			}
 			
 			
-			_G(det)->start_detail(_G(r68HohesC), 3, ANI_FRONT);
+			_G(det)->startDetail(_G(r68HohesC), 3, ANI_FRONT);
 		}
 		break;
 
@@ -150,7 +150,7 @@ void Room68::setup_func() {
 void Room68::look_kaktus() {
 	hideCur();
 	autoMove(6, P_CHEWY);
-	start_aad_wait(383, -1);
+	startAadWait(383, -1);
 	showCur();
 }
 
@@ -165,12 +165,12 @@ void Room68::talk_indigo(int16 aad_nr) {
 	_G(det)->del_static_ani(8);
 	if (aad_nr == -1) {
 		_G(det)->set_static_ani(9, -1);
-		start_aad_wait(384 + (int16)_G(spieler).R68IndigoDia, -1);
+		startAadWait(384 + (int16)_G(spieler).R68IndigoDia, -1);
 		_G(spieler).R68IndigoDia ^= 1;
 		_G(det)->del_static_ani(9);
 	} else {
 		_G(det)->set_static_ani(12, -1);
-		start_aad_wait(aad_nr, -1);
+		startAadWait(aad_nr, -1);
 		_G(det)->del_static_ani(12);
 	}
 	_G(room)->set_timer_status(8, TIMER_START);
@@ -194,8 +194,8 @@ int16 Room68::use_indigo() {
 			_G(room)->set_timer_status(8, TIMER_STOP);
 			_G(det)->del_static_ani(8);
 			_G(det)->stop_detail(8);
-			start_detail_wait(13, 3, ANI_FRONT);
-			start_detail_wait(25, 1, ANI_FRONT);
+			startSetailWait(13, 3, ANI_FRONT);
+			startSetailWait(25, 1, ANI_FRONT);
 			_G(det)->set_static_ani(12, -1);
 			talk_indigo(398);
 			_G(cur_hide_flag) = false;
@@ -203,7 +203,7 @@ int16 Room68::use_indigo() {
 			_G(room)->set_timer_status(8, TIMER_STOP);
 			_G(det)->del_static_ani(8);
 			_G(det)->stop_detail(8);
-			start_detail_wait(26, 1, ANI_FRONT);
+			startSetailWait(26, 1, ANI_FRONT);
 			_G(room)->set_timer_status(8, TIMER_START);
 			_G(det)->set_static_ani(8, -1);
 			new_invent_2_cur(KARTE_INV);
@@ -213,7 +213,7 @@ int16 Room68::use_indigo() {
 		}
 	} else if (is_cur_inventar(CLINT_1500_INV) || is_cur_inventar(CLINT_3000_INV)) {
 		action_flag = true;
-		start_aad_wait(393, -1);
+		startAadWait(393, -1);
 	}
 	showCur();
 	return action_flag;
@@ -224,7 +224,7 @@ void Room68::talk_keeper() {
 	autoMove(2, P_CHEWY);
 	_G(room)->set_timer_status(20, TIMER_STOP);
 	_G(det)->del_static_ani(20);
-	start_detail_wait(15, 1, ANI_FRONT);
+	startSetailWait(15, 1, ANI_FRONT);
 	_G(det)->set_static_ani(16, -1);
 	showCur();
 	_G(ssi)[3].X = _G(spieler_vector)[P_CHEWY].Xypos[0] - _G(spieler).scrollx + _G(spieler_mi)[P_CHEWY].HotX;;
@@ -234,7 +234,7 @@ void Room68::talk_keeper() {
 	_G(cur_hide_flag) = false;
 	hideCur();
 	_G(det)->del_static_ani(16);
-	start_detail_wait(15, 1, ANI_BACK);
+	startSetailWait(15, 1, ANI_BACK);
 	_G(room)->set_timer_status(20, TIMER_START);
 	_G(det)->set_static_ani(20, -1);
 	showCur();
@@ -250,7 +250,7 @@ int16 Room68::use_papagei() {
 		autoMove(5, P_CHEWY);
 		start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
 		_G(det)->showStaticSpr(12);
-		_G(det)->start_detail(21, 255, ANI_FRONT);
+		_G(det)->startDetail(21, 255, ANI_FRONT);
 		_G(atds)->del_steuer_bit(408, ATS_AKTIV_BIT, ATS_DATA);
 		_G(atds)->set_ats_str(407, 1, ATS_DATA);
 		showCur();
@@ -265,14 +265,14 @@ void Room68::calc_diva() {
 				_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
 				_G(r68HohesC) = 0;
 				_G(det)->hideStaticSpr(3);
-				_G(det)->start_detail(_G(r68HohesC), 1, ANI_BACK);
-				_G(det)->start_detail(18, 255, ANI_FRONT);
+				_G(det)->startDetail(_G(r68HohesC), 1, ANI_BACK);
+				_G(det)->startDetail(18, 255, ANI_FRONT);
 			}
 		} else if (!_G(spieler).R68Gutschein && !is_chewy_busy()) {
 			hideCur();
 			_G(spieler).R68Gutschein = true;
 			autoMove(4, P_CHEWY);
-			start_aad_wait(386, -1);
+			startAadWait(386, -1);
 			start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
 			new_invent_2_cur(BAR_GUT_INV);
 			_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
@@ -291,7 +291,7 @@ int16 Room68::use_keeper() {
 		start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
 		_G(room)->set_timer_status(20, TIMER_STOP);
 		_G(det)->del_static_ani(20);
-		start_ani_block(3, ABLOCK39);
+		startAniBlock(3, ABLOCK39);
 		_G(room)->set_timer_status(20, TIMER_START);
 		_G(det)->set_static_ani(20, -1);
 		new_invent_2_cur(B_MARY_INV);
@@ -309,7 +309,7 @@ int16 Room68::use_diva() {
 		autoMove(4, P_CHEWY);
 		_G(uhr)->resetTimer(_G(timer_nr)[0], 0);
 		_G(det)->hideStaticSpr(3);
-		start_detail_wait(4, 1, ANI_FRONT);
+		startSetailWait(4, 1, ANI_FRONT);
 		_G(spieler).R68Gutschein = false;
 		_G(det)->showStaticSpr(3);
 	} else if (is_cur_inventar(B_MARY2_INV)) {
@@ -318,16 +318,16 @@ int16 Room68::use_diva() {
 		autoMove(4, P_CHEWY);
 		_G(det)->hideStaticSpr(3);
 		_G(spieler).R68DivaWeg = true;
-		start_ani_block(2, ABLOCK38);
+		startAniBlock(2, ABLOCK38);
 		flic_cut(FCUT_083);
 		_G(det)->del_static_ani(18);
 		register_cutscene(22);
 		_G(det)->del_static_ani(18);
-		start_detail_wait(7, 1, ANI_FRONT);
+		startSetailWait(7, 1, ANI_FRONT);
 		_G(atds)->set_steuer_bit(407, ATS_AKTIV_BIT, ATS_DATA);
 		_G(atds)->set_steuer_bit(412, ATS_AKTIV_BIT, ATS_DATA);
-		set_person_spr(P_RIGHT, P_CHEWY);
-		start_aad_wait(402, -1);
+		setPersonSpr(P_RIGHT, P_CHEWY);
+		startAadWait(402, -1);
 	} else
 		action_flag = use_papagei();
 	showCur();
@@ -340,12 +340,12 @@ void Room68::kostuem_aad(int16 aad_nr) {
 		autoMove(_G(spieler).DiaAMov, P_CHEWY);
 	}
 
-	start_aad_wait(aad_nr, -1);
+	startAadWait(aad_nr, -1);
 
 	if (!_G(spieler).R68DivaWeg)
-		start_aad_wait(388, -1);
+		startAadWait(388, -1);
 	else if (!_G(spieler).R67LiedOk)
-		start_aad_wait(389, -1);
+		startAadWait(389, -1);
 	else {
 		if (_G(spieler).DisplayText == 0)
 			_G(sndPlayer)->fadeOut(5);
@@ -356,17 +356,17 @@ void Room68::kostuem_aad(int16 aad_nr) {
 		_G(spieler).PersonHide[P_NICHELLE] = true;
 		goAutoXy(161, 59, P_HOWARD, ANI_GO);
 		autoMove(4, P_CHEWY);
-		start_aad_wait(390, -1);
-		start_detail_wait(22, 1, ANI_FRONT);
+		startAadWait(390, -1);
+		startSetailWait(22, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_HOWARD] = true;
-		_G(det)->start_detail(27, 255, ANI_FRONT);
+		_G(det)->startDetail(27, 255, ANI_FRONT);
 
 		if (_G(spieler).DisplayText)
-			start_detail_wait(23, 3, ANI_FRONT);
+			startSetailWait(23, 3, ANI_FRONT);
 		else {
-			_G(det)->start_detail(23, 255, ANI_FRONT);
+			_G(det)->startDetail(23, 255, ANI_FRONT);
 			g_engine->_sound->playSound(109, 1, false);
-			wait_show_screen(2);
+			waitShowScreen(2);
 
 			g_engine->_sound->waitForSpeechToFinish();
 
@@ -377,31 +377,31 @@ void Room68::kostuem_aad(int16 aad_nr) {
 			g_engine->_sound->playSound(108, 1, false);
 		}
 		
-		_G(det)->start_detail(24, 255, ANI_FRONT);
-		set_person_pos(26, 40, P_NICHELLE, P_RIGHT);
+		_G(det)->startDetail(24, 255, ANI_FRONT);
+		setPersonPos(26, 40, P_NICHELLE, P_RIGHT);
 		if (_G(spieler).DisplayText) {
-			start_aad_wait(391, -1);
+			startAadWait(391, -1);
 		} else {
-			wait_show_screen(100);
-			start_aad_wait(602, -1);
-			wait_show_screen(100);
+			waitShowScreen(100);
+			startAadWait(602, -1);
+			waitShowScreen(100);
 		}
 
 		_G(room)->set_timer_status(8, TIMER_STOP);
 		_G(det)->del_static_ani(8);
-		start_detail_wait(10, 1, ANI_FRONT);
-		_G(det)->start_detail(11, 255, ANI_FRONT);
-		start_aad_wait(396, -1);
+		startSetailWait(10, 1, ANI_FRONT);
+		_G(det)->startDetail(11, 255, ANI_FRONT);
+		startAadWait(396, -1);
 		_G(det)->stop_detail(11);
 		_G(det)->set_static_ani(12, -1);
-		start_aad_wait(611, -1);
+		startAadWait(611, -1);
 		_G(det)->del_static_ani(12);
-		_G(det)->start_detail(14, 255, ANI_FRONT);
-		start_aad_wait(395, -1);
+		_G(det)->startDetail(14, 255, ANI_FRONT);
+		startAadWait(395, -1);
 		_G(det)->stop_detail(14);
 		_G(room)->set_timer_status(8, TIMER_START);
 		_G(det)->set_static_ani(8, -1);
-		start_aad_wait(392, -1);
+		startAadWait(392, -1);
 
 		g_engine->_sound->waitForSpeechToFinish();
 		
@@ -414,7 +414,7 @@ void Room68::kostuem_aad(int16 aad_nr) {
 		auto_scroll(216, 0);
 		_G(det)->hideStaticSpr(13);
 		_G(spieler).PersonHide[P_NICHELLE] = false;
-		set_person_pos(150, -13, P_NICHELLE, P_RIGHT);
+		setPersonPos(150, -13, P_NICHELLE, P_RIGHT);
 
 		if (_G(spieler).DisplayText) {
 			_G(currentSong) = -1;
diff --git a/engines/chewy/rooms/room69.cpp b/engines/chewy/rooms/room69.cpp
index 3ef062feaae..3f54edc54f2 100644
--- a/engines/chewy/rooms/room69.cpp
+++ b/engines/chewy/rooms/room69.cpp
@@ -54,9 +54,9 @@ void Room69::entry(int16 eib_nr) {
 	if (eib_nr == 102)
 		proc1();
 	else {
-		set_person_pos(295, 118, P_CHEWY, P_RIGHT);
-		set_person_pos(237, 101, P_NICHELLE, P_RIGHT);
-		set_person_pos(347, 119, P_HOWARD, P_RIGHT);
+		setPersonPos(295, 118, P_CHEWY, P_RIGHT);
+		setPersonPos(237, 101, P_NICHELLE, P_RIGHT);
+		setPersonPos(347, 119, P_HOWARD, P_RIGHT);
 		goAutoXy(351, 97, P_HOWARD, ANI_WAIT);
 		showCur();
 	}
@@ -78,7 +78,7 @@ void Room69::setup_func() {
 void Room69::look_schild() {
 	hideCur();
 	autoMove(1, P_CHEWY);
-	start_aad_wait(382, -1);
+	startAadWait(382, -1);
 	showCur();
 }
 
@@ -124,9 +124,9 @@ int16 Room69::use_bruecke() {
 void Room69::proc1() {
 	_G(spieler).scrollx = 0;
 	_G(spieler_mi)[P_CHEWY].Mode = true;
-	set_person_pos(46, 83, P_CHEWY, P_RIGHT);
-	set_person_pos(59, 68, P_NICHELLE, P_RIGHT);
-	set_person_pos(94, 82, P_HOWARD, P_RIGHT);
+	setPersonPos(46, 83, P_CHEWY, P_RIGHT);
+	setPersonPos(59, 68, P_NICHELLE, P_RIGHT);
+	setPersonPos(94, 82, P_HOWARD, P_RIGHT);
 	goAutoXy(59, 68, P_NICHELLE, ANI_GO);
 	goAutoXy(94, 82, P_HOWARD, ANI_WAIT);
 	goAutoXy(94, 77, P_NICHELLE, ANI_GO);
diff --git a/engines/chewy/rooms/room71.cpp b/engines/chewy/rooms/room71.cpp
index 9f68705dea7..79be4905b55 100644
--- a/engines/chewy/rooms/room71.cpp
+++ b/engines/chewy/rooms/room71.cpp
@@ -53,7 +53,7 @@ void Room71::entry(int16 eib_nr) {
 		_G(timer_nr)[0] = _G(room)->set_timer(0, 10);
 		_G(det)->set_static_ani(0, -1);
 	} else if (_G(spieler).R71LeopardVined) {
-		_G(det)->start_detail(2, 255, ANI_FRONT);
+		_G(det)->startDetail(2, 255, ANI_FRONT);
 		_G(det)->showStaticSpr(8);
 		_G(det)->hideStaticSpr(2);
 		_G(det)->hideStaticSpr(3);
@@ -67,14 +67,14 @@ void Room71::entry(int16 eib_nr) {
 
 	switch (eib_nr) {
 	case 110:
-		set_person_pos(500, 67, P_CHEWY, P_LEFT);
-		set_person_pos(568, 31, P_NICHELLE, P_LEFT);
-		set_person_pos(538, 35, P_HOWARD, P_LEFT);
+		setPersonPos(500, 67, P_CHEWY, P_LEFT);
+		setPersonPos(568, 31, P_NICHELLE, P_LEFT);
+		setPersonPos(538, 35, P_HOWARD, P_LEFT);
 		break;
 	case 114:
-		set_person_pos(70, 48, P_CHEWY, P_RIGHT);
-		set_person_pos(165, 16, P_NICHELLE, P_RIGHT);
-		set_person_pos(120, 18, P_HOWARD, P_RIGHT);
+		setPersonPos(70, 48, P_CHEWY, P_RIGHT);
+		setPersonPos(165, 16, P_NICHELLE, P_RIGHT);
+		setPersonPos(120, 18, P_HOWARD, P_RIGHT);
 		break;
 	default:
 		break;
@@ -185,7 +185,7 @@ int Room71::proc1() {
 	}
 
 	if (!_G(spieler).R71LeopardVined)
-		start_aad_wait(432, -1);
+		startAadWait(432, -1);
 
 	showCur();
 	_G(flags).NoScroll = false;
@@ -193,8 +193,8 @@ int Room71::proc1() {
 }
 
 void Room71::proc2() {
-	start_aad_wait(432, -1);
-	start_aad_wait(433, -1);
+	startAadWait(432, -1);
+	startAadWait(433, -1);
 	_G(SetUpScreenFunc) = nullptr;
 	goAutoXy(518, 35, P_HOWARD, ANI_GO);
 	goAutoXy(568, 36, P_NICHELLE, ANI_WAIT);
@@ -206,11 +206,11 @@ void Room71::proc2() {
 	_G(spieler).PersonHide[P_HOWARD] = true;
 	proc5(5);
 	_G(det)->hideStaticSpr(2);
-	_G(det)->start_detail(5, 255, false);
+	_G(det)->startDetail(5, 255, false);
 	auto_scroll(160, 0);
 	_G(det)->hideStaticSpr(5);
-	start_detail_wait(1, 1, ANI_FRONT);
-	_G(det)->start_detail(2, 255, false);
+	startSetailWait(1, 1, ANI_FRONT);
+	_G(det)->startDetail(2, 255, false);
 	_G(det)->stop_detail(5);
 	_G(det)->showStaticSpr(8);
 	_G(atds)->set_steuer_bit(442, ATS_AKTIV_BIT, ATS_DATA);
@@ -222,11 +222,11 @@ void Room71::proc2() {
 	_G(flags).NoScroll = false;
 	_G(menu_item) = CUR_WALK;
 	cursorChoice(CUR_WALK);
-	start_aad_wait(434, -1);
+	startAadWait(434, -1);
 }
 
 void Room71::proc3() {
-	start_aad_wait(431, -1);
+	startAadWait(431, -1);
 	_G(SetUpScreenFunc) = nullptr;
 	goAutoXy(510, 34, P_NICHELLE, ANI_WAIT);
 	_G(SetUpScreenFunc) = setup_func;
@@ -238,7 +238,7 @@ void Room71::proc3() {
 }
 
 void Room71::proc4() {
-	start_aad_wait(430, -1);
+	startAadWait(430, -1);
 	_G(SetUpScreenFunc) = nullptr;
 	goAutoXy(518, 35, P_HOWARD, ANI_WAIT);
 	_G(SetUpScreenFunc) = setup_func;
@@ -252,7 +252,7 @@ void Room71::proc4() {
 void Room71::proc5(int16 val) {
 	_state = 1 + (_G(spieler).flags28_4 ? 1 : 0);
 	_G(det)->hideStaticSpr(2);
-	start_detail_wait(val, 5, ANI_FRONT);
+	startSetailWait(val, 5, ANI_FRONT);
 	_G(det)->showStaticSpr(2);
 	_state = 0;
 }
@@ -285,20 +285,20 @@ int Room71::proc6() {
 void Room71::proc7() {
 	hideCur();
 	autoMove(4, P_CHEWY);
-	start_aad_wait(429, -1);
+	startAadWait(429, -1);
 	_G(SetUpScreenFunc) = nullptr;
-	set_person_spr(P_LEFT, P_CHEWY);
+	setPersonSpr(P_LEFT, P_CHEWY);
 	goAutoXy(323, 28, P_NICHELLE, ANI_WAIT);
 	_G(flags).NoScroll = true;
 	auto_scroll(200, 0);
 	_G(spieler).PersonHide[P_NICHELLE] = true;
-	_G(det)->start_detail(7, 255, false);
-	start_aad_wait(624, -1);
+	_G(det)->startDetail(7, 255, false);
+	startAadWait(624, -1);
 	_G(det)->stop_detail(7);
 	_G(spieler).PersonHide[P_NICHELLE] = false;
 	_G(SetUpScreenFunc) = setup_func;
 	_G(flags).NoScroll = false;
-	start_aad_wait(432, -1);
+	startAadWait(432, -1);
 
 	showCur();
 }
diff --git a/engines/chewy/rooms/room72.cpp b/engines/chewy/rooms/room72.cpp
index 0240738297c..1cbde46067f 100644
--- a/engines/chewy/rooms/room72.cpp
+++ b/engines/chewy/rooms/room72.cpp
@@ -56,9 +56,9 @@ void Room72::entry(int16 eib_nr) {
 
 	switch (eib_nr) {
 	case 112:
-		set_person_pos(50, 129, P_CHEWY, P_RIGHT);
-		set_person_pos(15, 103, P_HOWARD, P_RIGHT);
-		set_person_pos(-15, 102, P_NICHELLE, P_RIGHT);
+		setPersonPos(50, 129, P_CHEWY, P_RIGHT);
+		setPersonPos(15, 103, P_HOWARD, P_RIGHT);
+		setPersonPos(-15, 102, P_NICHELLE, P_RIGHT);
 		goAutoXy(185, 130, P_CHEWY, ANI_GO);
 		goAutoXy(147, 103, P_HOWARD, ANI_GO);
 		goAutoXy(120, 104, P_NICHELLE, ANI_WAIT);
@@ -66,9 +66,9 @@ void Room72::entry(int16 eib_nr) {
 		register_cutscene(23);
 		break;
 	case 113:
-		set_person_pos(213, 129, P_CHEWY, P_LEFT);
-		set_person_pos(262, 103, P_HOWARD, P_LEFT);
-		set_person_pos(293, 102, P_NICHELLE, P_LEFT);
+		setPersonPos(213, 129, P_CHEWY, P_LEFT);
+		setPersonPos(262, 103, P_HOWARD, P_LEFT);
+		setPersonPos(293, 102, P_NICHELLE, P_LEFT);
 		goAutoXy(120, 130, P_CHEWY, ANI_GO);
 		goAutoXy(154, 102, P_HOWARD, ANI_GO);
 		goAutoXy(186, 102, P_NICHELLE, ANI_WAIT);
@@ -87,14 +87,14 @@ void Room72::xit(int16 eib_nr) {
 void Room72::proc1(int16 flicNr) {
 	_G(atds)->set_steuer_bit(389, ATS_AKTIV_BIT, ATS_DATA);
 	_G(spieler).flags28_10 = true;
-	wait_show_screen(7);
-	start_aad_wait(437, -1);
+	waitShowScreen(7);
+	startAadWait(437, -1);
 	flic_cut(flicNr);
 	_G(spieler).PersonRoomNr[P_HOWARD] = 76;
 	_G(spieler).PersonRoomNr[P_NICHELLE] = 76;
 	_G(spieler).PersonHide[P_CHEWY] = true;
 	_G(det)->hideStaticSpr(0);
-	set_up_screen(DO_SETUP);
+	setupScreen(DO_SETUP);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	_G(spieler_mi)[P_CHEWY].Mode = false;
 	showCur();
diff --git a/engines/chewy/rooms/room74.cpp b/engines/chewy/rooms/room74.cpp
index 615238689ba..13239cfda29 100644
--- a/engines/chewy/rooms/room74.cpp
+++ b/engines/chewy/rooms/room74.cpp
@@ -45,7 +45,7 @@ void Room74::entry(int16 eib_nr) {
 	_G(SetUpScreenFunc) = setup_func;
 
 	if (_G(spieler).flags29_1)
-		_G(det)->start_detail(0, 255, false);
+		_G(det)->startDetail(0, 255, false);
 
 	if (_G(flags).LoadGame)
 		return;
@@ -96,10 +96,10 @@ int Room74::proc1() {
 		_G(spieler).R74CutRubberPlant = true;
 		autoMove(4, P_CHEWY);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(1, 1, ANI_FRONT);
-		set_person_pos(272, 116, P_CHEWY, P_RIGHT);
+		startSetailWait(1, 1, ANI_FRONT);
+		setPersonPos(272, 116, P_CHEWY, P_RIGHT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
-		_G(det)->start_detail(0, 255, false);
+		_G(det)->startDetail(0, 255, false);
 		_G(spieler).flags29_1 = true;
 		_G(atds)->set_ats_str(435, 1, ATS_DATA);
 
diff --git a/engines/chewy/rooms/room75.cpp b/engines/chewy/rooms/room75.cpp
index 13f47780bec..bfb24c73bee 100644
--- a/engines/chewy/rooms/room75.cpp
+++ b/engines/chewy/rooms/room75.cpp
@@ -86,9 +86,9 @@ void Room75::xit(int16 eib_nr) {
 void Room75::proc1() {
 	_G(cur_hide_flag) = 0;
 	hideCur();
-	set_person_pos(363, 110, P_CHEWY, P_LEFT);
-	set_person_pos(322, 85, P_NICHELLE, P_RIGHT);
-	set_person_pos(317, 96, P_HOWARD, P_RIGHT);
+	setPersonPos(363, 110, P_CHEWY, P_LEFT);
+	setPersonPos(322, 85, P_NICHELLE, P_RIGHT);
+	setPersonPos(317, 96, P_HOWARD, P_RIGHT);
 	goAutoXy(318, 110, P_NICHELLE, ANI_WAIT);
 	showCur();
 }
diff --git a/engines/chewy/rooms/room76.cpp b/engines/chewy/rooms/room76.cpp
index 1a02387243f..e8e1fb284c3 100644
--- a/engines/chewy/rooms/room76.cpp
+++ b/engines/chewy/rooms/room76.cpp
@@ -41,8 +41,8 @@ void Room76::entry() {
 	_G(SetUpScreenFunc) = setup_func;
 	_state = 0;
 
-	set_person_pos(308, 84, P_NICHELLE, P_RIGHT);
-	set_person_pos(365, 84, P_HOWARD, P_RIGHT);
+	setPersonPos(308, 84, P_NICHELLE, P_RIGHT);
+	setPersonPos(365, 84, P_HOWARD, P_RIGHT);
 	_G(spieler).PersonHide[P_HOWARD] = true;
 	_G(spieler).PersonHide[P_NICHELLE] = true;
 
@@ -69,7 +69,7 @@ void Room76::entry() {
 		_G(flags).NoScroll = true;
 		_G(spieler).scrollx = 122;
 		_G(spieler).flags29_2 = true;
-		set_person_pos(128, 135, P_CHEWY, P_RIGHT);
+		setPersonPos(128, 135, P_CHEWY, P_RIGHT);
 		proc3(420);
 		proc5();
 
@@ -78,7 +78,7 @@ void Room76::entry() {
 		_G(flags).NoScroll = true;
 		_G(spieler).scrollx = 122;
 		_G(spieler).r76State = -1;
-		set_person_pos(128, 135, P_CHEWY, P_RIGHT);
+		setPersonPos(128, 135, P_CHEWY, P_RIGHT);
 		proc3(422);
 		_G(flags).NoScroll = false;
 	}
@@ -94,8 +94,8 @@ void Room76::setup_func() {
 		return;
 
 	_state = 0;
-	_G(det)->start_detail(11, 1, false);
-	_G(det)->start_detail(12, 1, false);
+	_G(det)->startDetail(11, 1, false);
+	_G(det)->startDetail(12, 1, false);
 }
 
 void Room76::talk1() {
@@ -103,7 +103,7 @@ void Room76::talk1() {
 	autoMove(4, P_CHEWY);
 	auto_scroll(172, 0);
 	const int diaNr = 425 + (_G(spieler).flags32_4 ? 1 : 0);
-	start_aad_wait(diaNr, -1);
+	startAadWait(diaNr, -1);
 	showCur();
 }
 
@@ -126,28 +126,28 @@ void Room76::talk2() {
 }
 
 void Room76::proc3(int diaNr) {
-	start_aad_wait(diaNr, -1);
+	startAadWait(diaNr, -1);
 	_G(det)->del_static_ani(2);
-	start_detail_wait(3, 1, ANI_FRONT);
-	start_detail_wait(4, 2, ANI_FRONT);
+	startSetailWait(3, 1, ANI_FRONT);
+	startSetailWait(4, 2, ANI_FRONT);
 	_G(det)->set_static_ani(2, -1);
 }
 
 void Room76::proc5() {
 	_state = 1;
 	_G(det)->del_static_ani(2);
-	_G(det)->start_detail(6, 1, false);
+	_G(det)->startDetail(6, 1, false);
 	_G(flags).NoScroll = false;
-	wait_show_screen(15);
+	waitShowScreen(15);
 	autoMove(5, P_CHEWY);
 	_G(det)->hideStaticSpr(10);
-	_G(det)->start_detail(13, 1, false);
+	_G(det)->startDetail(13, 1, false);
 	_G(spieler_mi)[P_CHEWY].Mode = true;
 	goAutoXy(669, 127, P_CHEWY, ANI_WAIT);
-	wait_show_screen(20);
+	waitShowScreen(20);
 	_G(spieler_mi)[P_CHEWY].Mode = false;
 	showCur();
-	set_person_pos(30, 150, P_CHEWY, P_RIGHT);
+	setPersonPos(30, 150, P_CHEWY, P_RIGHT);
 	switch_room(78);
 }
 
@@ -163,16 +163,16 @@ int Room76::proc6() {
 		proc3(424);
 		start_spz_wait(13, 1, false, P_CHEWY);
 		_G(det)->del_static_ani(2);
-		start_detail_wait(5, 1, ANI_FRONT);
+		startSetailWait(5, 1, ANI_FRONT);
 		_G(det)->set_static_ani(2, -1);
-		start_detail_wait(9, 1, ANI_FRONT);
-		start_detail_wait(10, 1, ANI_FRONT);
+		startSetailWait(9, 1, ANI_FRONT);
+		startSetailWait(10, 1, ANI_FRONT);
 		showCur();
 	} else if (is_cur_inventar(94)) {
 		hideCur();
 		retVal = 1;
-		set_person_spr(P_RIGHT, P_CHEWY);
-		start_aad_wait(436, 1);
+		setPersonSpr(P_RIGHT, P_CHEWY);
+		startAadWait(436, 1);
 		showCur();
 	}
 
@@ -190,32 +190,32 @@ int Room76::proc7() {
 		del_inventar(_G(spieler).AkInvent);
 		invent_2_slot(106);
 		invent_2_slot(105);
-		start_aad_wait(444, -1);
+		startAadWait(444, -1);
 		_G(out)->ausblenden(0);
 		_G(out)->set_teilpalette(_G(pal), 255, 1);
-		start_aad_wait(443, -1);
+		startAadWait(443, -1);
 		_G(spieler).scrollx = 0;
 		_G(fx_blend) = BLEND3;
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
-		set_person_pos(128, 135, P_CHEWY, P_RIGHT);
+		setPersonPos(128, 135, P_CHEWY, P_RIGHT);
 		_G(det)->set_static_ani(2, -1);
 
 		for (int i = 0; i < 3; ++i)
 			_G(det)->showStaticSpr(8 + i);
 
-		start_aad_wait(427, -1);
+		startAadWait(427, -1);
 		showCur();
 		start_ads_wait(21);
 		hideCur();
-		start_aad_wait(428, -1);
+		startAadWait(428, -1);
 		showCur();
 		_G(spieler).flags29_80 = true;
 		switch_room(78);
 	} else {
 		hideCur();
 		start_spz(CH_TALK12, 255, false, P_CHEWY);
-		start_aad_wait(577, -1);
+		startAadWait(577, -1);
 		showCur();
 	}
 
diff --git a/engines/chewy/rooms/room77.cpp b/engines/chewy/rooms/room77.cpp
index 22ec2047c37..a3981a2121d 100644
--- a/engines/chewy/rooms/room77.cpp
+++ b/engines/chewy/rooms/room77.cpp
@@ -57,8 +57,8 @@ void Room77::entry() {
 		_G(spieler).r76State = -1;
 		hideCur();
 		_G(spieler).scrollx = 62;
-		set_person_pos(158, 127, P_CHEWY, P_RIGHT);
-		start_aad_wait(440, -1);
+		setPersonPos(158, 127, P_CHEWY, P_RIGHT);
+		startAadWait(440, -1);
 		showCur();
 	}
 }
@@ -88,7 +88,7 @@ int Room77::proc1() {
 
 	cur_2_inventory();
 	start_spz(aniId, 255, false, P_CHEWY);
-	start_aad_wait(diaNr, -1);
+	startAadWait(diaNr, -1);
 	showCur();
 	if (_G(spieler).flags29_10)
 		remove_inventory(103);
@@ -118,7 +118,7 @@ int Room77::proc2() {
 	}
 
 	start_spz(aniId, 255, false, P_CHEWY);
-	start_aad_wait(diaNr, -1);
+	startAadWait(diaNr, -1);
 
 	showCur();
 	return 1;
diff --git a/engines/chewy/rooms/room78.cpp b/engines/chewy/rooms/room78.cpp
index 7ace3d82744..0079ab77d81 100644
--- a/engines/chewy/rooms/room78.cpp
+++ b/engines/chewy/rooms/room78.cpp
@@ -39,13 +39,13 @@ void Room78::entry() {
 	_G(spieler).PersonHide[P_HOWARD] = true;
 	_G(spieler).PersonHide[P_NICHELLE] = true;
 	_G(spieler).scrollx = 320;
-	set_person_pos(0, 0, P_CHEWY, P_RIGHT);
+	setPersonPos(0, 0, P_CHEWY, P_RIGHT);
 
 	int delay = 0;
 	int destRoom;
 
 	if (_G(spieler).flags29_80) {
-		_G(det)->start_detail(3, 255, false);
+		_G(det)->startDetail(3, 255, false);
 
 		int destX = 592;
 		while (destX > 0) {
@@ -56,14 +56,14 @@ void Room78::entry() {
 				delay = _G(spieler).DelaySpeed / 2;
 				destX -= 4;
 			}
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		}
 		_G(flags).NoPalAfterFlc = true;
 		flic_cut(FCUT_101);
 		destRoom = 79;
 	} else {
-		_G(det)->start_detail(0, 255, false);
-		_G(det)->start_detail(4, 255, false);
+		_G(det)->startDetail(0, 255, false);
+		_G(det)->startDetail(4, 255, false);
 		int det0DestX = 608;
 		int det4DestX = 570;
 		bool exitLoopFlag = false;
@@ -85,7 +85,7 @@ void Room78::entry() {
 					} else {
 						flag1 = true;
 						_G(det)->stop_detail(0);
-						_G(det)->start_detail(1, 1, false);
+						_G(det)->startDetail(1, 1, false);
 					}
 				}
 
@@ -96,9 +96,9 @@ void Room78::entry() {
 						flag2 = true;
 						_G(det)->stop_detail(4);
 						if (flag1 == 0) {
-							_G(det)->start_detail(5, 1, false);
+							_G(det)->startDetail(5, 1, false);
 						} else {
-							start_detail_wait(5, 1, ANI_FRONT);
+							startSetailWait(5, 1, ANI_FRONT);
 						}
 					} else {
 						if (det4DestX <= 0)
@@ -112,7 +112,7 @@ void Room78::entry() {
 			if (flag1 && flag2)
 				exitLoopFlag = true;
 
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		}
 
 		if (_G(spieler).flags29_10 && _G(spieler).flags29_20) {
diff --git a/engines/chewy/rooms/room79.cpp b/engines/chewy/rooms/room79.cpp
index 7ce0f7bc85e..d1f4c991a6e 100644
--- a/engines/chewy/rooms/room79.cpp
+++ b/engines/chewy/rooms/room79.cpp
@@ -41,12 +41,12 @@ void Room79::entry() {
 	_G(spieler).PersonRoomNr[P_HOWARD] = 79;
 	_G(spieler).PersonRoomNr[P_NICHELLE] = 79;
 	if (!_G(flags).LoadGame) {
-		set_person_pos(459, 114, P_CHEWY, P_LEFT);
-		set_person_pos(568, 65, P_HOWARD, P_LEFT);
-		set_person_pos(534, 75, P_NICHELLE, P_LEFT);
+		setPersonPos(459, 114, P_CHEWY, P_LEFT);
+		setPersonPos(568, 65, P_HOWARD, P_LEFT);
+		setPersonPos(534, 75, P_NICHELLE, P_LEFT);
 		_G(spieler).scrollx = 300;
 		hideCur();
-		start_aad_wait(484, -1);
+		startAadWait(484, -1);
 		_G(spieler).PersonGlobalDia[P_HOWARD] = 10026;
 		_G(spieler).PersonDiaRoom[P_HOWARD] = true;
 		showCur();
diff --git a/engines/chewy/rooms/room80.cpp b/engines/chewy/rooms/room80.cpp
index e004d6b8183..56839a7301d 100644
--- a/engines/chewy/rooms/room80.cpp
+++ b/engines/chewy/rooms/room80.cpp
@@ -50,9 +50,9 @@ void Room80::entry() {
 		return;
 	}
 
-	set_person_pos(37, 10, P_CHEWY, P_RIGHT);
-	set_person_pos(22, -1, P_HOWARD, P_RIGHT);
-	set_person_pos(6, 2, P_NICHELLE, P_RIGHT);
+	setPersonPos(37, 10, P_CHEWY, P_RIGHT);
+	setPersonPos(22, -1, P_HOWARD, P_RIGHT);
+	setPersonPos(6, 2, P_NICHELLE, P_RIGHT);
 	_G(spieler).scrollx = 10;
 	_G(flags).NoScroll = true;
 	_G(spieler).ZoomXy[P_HOWARD][0] = 24;
@@ -120,7 +120,7 @@ void Room80::setup_func() {
 	cursorChoice(CUR_WALK);
 	_G(spieler).flags30_1 = true;
 	_G(maus_links_click) = false;
-	set_up_screen(DO_SETUP);
+	setupScreen(DO_SETUP);
 	
 	for (int i = P_CHEWY; i <= P_NICHELLE; ++i) {
 		if (_G(spieler).R79Val[i] != 0) {
diff --git a/engines/chewy/rooms/room81.cpp b/engines/chewy/rooms/room81.cpp
index 8253970655f..40cc65e8e47 100644
--- a/engines/chewy/rooms/room81.cpp
+++ b/engines/chewy/rooms/room81.cpp
@@ -47,9 +47,9 @@ void Room81::entry() {
 	if (_G(flags).LoadGame || !_G(spieler).flags30_1)
 		return;
 
-	set_person_pos(155, 146, P_CHEWY, P_LEFT);
-	set_person_pos(103, 115, P_HOWARD, P_RIGHT);
-	set_person_pos(62, 112, P_NICHELLE, P_RIGHT);
+	setPersonPos(155, 146, P_CHEWY, P_LEFT);
+	setPersonPos(103, 115, P_HOWARD, P_RIGHT);
+	setPersonPos(62, 112, P_NICHELLE, P_RIGHT);
 	_G(spieler).flags30_1 = false;
 	_G(maus_links_click) = false;
 	_G(spieler).scrollx = 0;
@@ -78,14 +78,14 @@ void Room81::proc1() {
 		goAutoXy(171, 93, P_CHEWY, ANI_WAIT);
 		goAutoXy(143, 62, P_CHEWY, ANI_WAIT);
 		goAutoXy(112, 60, P_CHEWY, ANI_WAIT);
-		start_aad_wait(461, -1);
+		startAadWait(461, -1);
 		goAutoXy(143, 62, P_CHEWY, ANI_WAIT);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(0, 1, ANI_FRONT);
-		_G(det)->start_detail(1, 255, false);
-		start_aad_wait(459, -1);
+		startSetailWait(0, 1, ANI_FRONT);
+		_G(det)->startDetail(1, 255, false);
+		startAadWait(459, -1);
 		_G(det)->stop_detail(1);
-		start_detail_wait(0, 1, ANI_GO);
+		startSetailWait(0, 1, ANI_GO);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		goAutoXy(171, 93, P_CHEWY, ANI_WAIT);
 		goAutoXy(100, 96, P_CHEWY, ANI_WAIT);
@@ -99,7 +99,7 @@ void Room81::proc1() {
 	
 	if (diaNr != -1) {
 		start_spz(CH_TALK12, 255, false, P_CHEWY);
-		start_aad_wait(diaNr, -1);
+		startAadWait(diaNr, -1);
 	}
 
 	showCur();
@@ -129,7 +129,7 @@ int Room81::proc2() {
 	if (diaNr != -1) {
 		retVal = 1;
 		start_spz(aniId, 255, false, P_CHEWY);
-		start_aad_wait(diaNr, -1);
+		startAadWait(diaNr, -1);
 		proc3();
 	}
 
@@ -139,12 +139,12 @@ int Room81::proc2() {
 
 void Room81::proc3() {
 	if (!_G(spieler).flags30_2) {
-		_G(det)->start_detail(2, 255, false);
+		_G(det)->startDetail(2, 255, false);
 		return;
 	}
 
 	for (int i = 0; i < 3; ++i)
-		_G(det)->start_detail(3 + i, 255, false);
+		_G(det)->startDetail(3 + i, 255, false);
 
 	_G(det)->stop_detail(2);
 	_G(atds)->del_steuer_bit(486, ATS_AKTIV_BIT, ATS_DATA);
diff --git a/engines/chewy/rooms/room82.cpp b/engines/chewy/rooms/room82.cpp
index 52a074c7455..4e02ee335f1 100644
--- a/engines/chewy/rooms/room82.cpp
+++ b/engines/chewy/rooms/room82.cpp
@@ -53,15 +53,15 @@ void Room82::entry() {
 	}
 
 	if (_G(spieler).flags30_1) {
-		set_person_pos(635, 144, P_CHEWY, P_LEFT);
-		set_person_pos(592, 115, P_HOWARD, P_RIGHT);
-		set_person_pos(543, 110, P_NICHELLE, P_RIGHT);
+		setPersonPos(635, 144, P_CHEWY, P_LEFT);
+		setPersonPos(592, 115, P_HOWARD, P_RIGHT);
+		setPersonPos(543, 110, P_NICHELLE, P_RIGHT);
 		_G(spieler).flags30_1 = false;
 		_G(spieler).scrollx = 479;
 	} else if (_G(spieler).flags31_8) {
-		set_person_pos(130, 138, P_CHEWY, P_LEFT);
-		set_person_pos(104, 111, P_HOWARD, P_RIGHT);
-		set_person_pos(153, 110, P_NICHELLE, P_RIGHT);
+		setPersonPos(130, 138, P_CHEWY, P_LEFT);
+		setPersonPos(104, 111, P_HOWARD, P_RIGHT);
+		setPersonPos(153, 110, P_NICHELLE, P_RIGHT);
 		_G(spieler).flags31_8 = false;
 		_G(spieler).scrollx = 0;
 	}
@@ -134,7 +134,7 @@ void Room82::talk1() {
 void Room82::talk2() {
 	hideCur();
 	autoMove(3, P_CHEWY);
-	start_aad_wait(453, -1);
+	startAadWait(453, -1);
 	showCur();
 }
 
@@ -151,8 +151,8 @@ int Room82::proc3() {
 	start_spz_wait(13, 1, false, P_CHEWY);
 	_G(room)->set_timer_status(0, TIMER_STOP);
 	_G(det)->del_static_ani(0);
-	start_detail_wait(2, 1, ANI_FRONT);
-	start_detail_wait(3, 1, ANI_FRONT);
+	startSetailWait(2, 1, ANI_FRONT);
+	startSetailWait(3, 1, ANI_FRONT);
 	_G(det)->set_static_ani(0, -1);
 	start_spz_wait(13, 1, false, P_CHEWY);
 
@@ -175,7 +175,7 @@ void Room82::proc4() {
 	_G(room)->set_timer_status(4, TIMER_STOP);
 	_G(det)->del_static_ani(4);
 	_G(det)->set_static_ani(5, 3);
-	start_aad_wait(445, -1);
+	startAadWait(445, -1);
 	_G(det)->del_static_ani(5);
 	_G(det)->set_static_ani(4, -1);
 	_G(room)->set_timer_status(4, TIMER_START);
@@ -195,15 +195,15 @@ int Room82::proc6() {
 	autoMove(2, P_CHEWY);
 
 	if (_G(spieler).flags30_10) {
-		start_aad_wait(450, -1);
+		startAadWait(450, -1);
 		_G(out)->ausblenden(0);
 		_G(out)->set_teilpalette(_G(pal), 255, 1);
 		_G(atds)->enableEvents(false);
-		start_aad_wait(598, -1);
+		startAadWait(598, -1);
 		_G(atds)->enableEvents(true);
 		_G(det)->showStaticSpr(7);
 		_G(fx_blend) = BLEND3;
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		Room66::proc8(2, 7, 7, 451);
 		_G(spieler).flags30_20 = true;
 		_G(spieler).flags37_20 = true;
@@ -212,7 +212,7 @@ int Room82::proc6() {
 		remove_inventory(106);
 	} else {
 		start_spz(CH_TALK12, 255, false, P_CHEWY);
-		start_aad_wait(276, -1);
+		startAadWait(276, -1);
 	}
 
 	showCur();
@@ -222,20 +222,20 @@ int Room82::proc6() {
 void Room82::proc8() {
 	hideCur();
 	_G(spieler).flags30_10 = true;
-	start_aad_wait(447, -1);
+	startAadWait(447, -1);
 	autoMove(6, P_CHEWY);
 
 	while (_G(spieler_vector)[P_NICHELLE].Count != 0)
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 
 	_G(spieler).PersonHide[P_NICHELLE] = true;
-	_G(det)->start_detail(10, 255, false);
-	start_aad_wait(625, -1);
+	_G(det)->startDetail(10, 255, false);
+	startAadWait(625, -1);
 	_G(det)->stop_detail(10);
 	_G(spieler).PersonHide[P_NICHELLE] = false;
-	start_aad_wait(448, -1);
+	startAadWait(448, -1);
 	_G(det)->del_static_ani(4);
-	start_detail_wait(6, 2, ANI_FRONT);
+	startSetailWait(6, 2, ANI_FRONT);
 	_G(det)->set_static_ani(4, -1);
 	showCur();
 }
diff --git a/engines/chewy/rooms/room84.cpp b/engines/chewy/rooms/room84.cpp
index ae1a28479b1..4a28e23e639 100644
--- a/engines/chewy/rooms/room84.cpp
+++ b/engines/chewy/rooms/room84.cpp
@@ -52,7 +52,7 @@ void Room84::entry() {
 	}
 
 	if (_G(spieler).flags32_10) {
-		_G(det)->start_detail(7, 255, false);
+		_G(det)->startDetail(7, 255, false);
 		_G(atds)->del_steuer_bit(504, ATS_AKTIV_BIT, ATS_DATA);
 		_G(spieler).room_e_obj[124].Attribut = 255;
 		_G(atds)->set_ats_str(485, 2, ATS_DATA);
@@ -74,38 +74,38 @@ void Room84::entry() {
 	if (_G(flags).LoadGame) {
 		; // Nothing. It avoids a deeper level of if, and we need the _G(SetUpScreenFunc) at the end
 	} else if (_G(spieler).flags30_1 || _G(spieler).flags31_8) {
-		set_person_pos(569, 135, P_CHEWY, P_LEFT);
-		set_person_pos(489, 113, P_HOWARD, P_RIGHT);
-		set_person_pos(523, 110, P_NICHELLE, P_RIGHT);
+		setPersonPos(569, 135, P_CHEWY, P_LEFT);
+		setPersonPos(489, 113, P_HOWARD, P_RIGHT);
+		setPersonPos(523, 110, P_NICHELLE, P_RIGHT);
 		_G(spieler).flags30_1 = false;
 		_G(spieler).flags31_8 = false;
 		_G(maus_links_click) = false;
 		_G(spieler).scrollx = 319;
 
 		if (_G(spieler).flags32_10) {
-			set_person_pos(347, 130, P_CHEWY, P_RIGHT);
-			set_person_pos(408, 113, P_HOWARD, P_LEFT);
+			setPersonPos(347, 130, P_CHEWY, P_RIGHT);
+			setPersonPos(408, 113, P_HOWARD, P_LEFT);
 			_G(spieler).scrollx = 250;
 			if (_G(spieler).flags32_40) {
-				start_aad_wait(481, -1);
+				startAadWait(481, -1);
 				_G(spieler).room_e_obj[124].Attribut = AUSGANG_OBEN;
 			}
 		}
 	} else if (_G(spieler).flags32_20) {
 		hideCur();
-		set_person_pos(347, 130, P_CHEWY, P_RIGHT);
-		set_person_pos(408, 113, P_HOWARD, P_LEFT);
+		setPersonPos(347, 130, P_CHEWY, P_RIGHT);
+		setPersonPos(408, 113, P_HOWARD, P_LEFT);
 		_G(spieler).scrollx = 250;
 		_G(spieler).flags32_20 = false;
 		_G(spieler).room_e_obj[124].Attribut = 255;
 		_G(spieler).room_e_obj[125].Attribut = 255;
 		_G(atds)->set_ats_str(485, 2, ATS_DATA);
-		start_aad_wait(477, -1);
+		startAadWait(477, -1);
 		showCur();
 	} else {
-		set_person_pos(263, 136, P_CHEWY, P_LEFT);
-		set_person_pos(238, 113, P_HOWARD, P_RIGHT);
-		set_person_pos(294, 110, P_NICHELLE, P_RIGHT);
+		setPersonPos(263, 136, P_CHEWY, P_LEFT);
+		setPersonPos(238, 113, P_HOWARD, P_RIGHT);
+		setPersonPos(294, 110, P_NICHELLE, P_RIGHT);
 		_G(spieler).flags30_1 = false;
 		_G(spieler).scrollx = 156;
 	}
@@ -138,16 +138,16 @@ void Room84::setup_func() {
 		hideCur();
 		autoMove(4, P_CHEWY);
 		_G(flags).NoScroll = true;
-		set_person_spr(P_LEFT, P_CHEWY);
+		setPersonSpr(P_LEFT, P_CHEWY);
 		auto_scroll(150, 0);
 		_G(det)->del_static_ani(3);
 		_G(det)->set_static_ani(4, -1);
-		start_aad_wait(455, -1);
+		startAadWait(455, -1);
 		_G(det)->del_static_ani(4);
 		start_spz(62, 1, false, P_HOWARD);
-		start_detail_wait(5, 1, ANI_FRONT);
+		startSetailWait(5, 1, ANI_FRONT);
 		_G(det)->set_static_ani(3, -1);
-		start_aad_wait(456, -1);
+		startAadWait(456, -1);
 		_G(flags).NoScroll = false;
 		showCur();
 	}
@@ -174,14 +174,14 @@ void Room84::setup_func() {
 void Room84::talk1() {
 	autoMove(4, P_CHEWY);
 	_G(flags).NoScroll = true;
-	set_person_spr(P_LEFT, P_CHEWY);
+	setPersonSpr(P_LEFT, P_CHEWY);
 	auto_scroll(150, 0);
 	start_ads_wait(22);
 	_G(flags).NoScroll = false;
 }
 
 void Room84::talk2() {
-	start_aad_wait(478, -1);
+	startAadWait(478, -1);
 }
 
 int Room84::proc4() {
@@ -193,7 +193,7 @@ int Room84::proc4() {
 
 	if (_G(spieler).flags32_10) {
 		_G(det)->stop_detail(7);
-		start_detail_wait(8, 1, ANI_FRONT);
+		startSetailWait(8, 1, ANI_FRONT);
 	} else {
 		_G(spieler).PersonRoomNr[P_NICHELLE] = 88;
 	}
diff --git a/engines/chewy/rooms/room85.cpp b/engines/chewy/rooms/room85.cpp
index c75316da5ba..ebb3da906c7 100644
--- a/engines/chewy/rooms/room85.cpp
+++ b/engines/chewy/rooms/room85.cpp
@@ -58,32 +58,32 @@ void Room85::entry(int16 eib_nr) {
 
 	if (_G(spieler).flags30_1 || eib_nr == 124) {
 		hideCur();
-		set_person_pos(278, 157, P_CHEWY, P_RIGHT);
-		set_person_pos(296, 142, P_HOWARD, P_RIGHT);
-		set_person_pos(322, 142, P_NICHELLE, P_RIGHT);
+		setPersonPos(278, 157, P_CHEWY, P_RIGHT);
+		setPersonPos(296, 142, P_HOWARD, P_RIGHT);
+		setPersonPos(322, 142, P_NICHELLE, P_RIGHT);
 		_G(spieler).flags30_1 = false;
 		_G(maus_links_click) = false;
 		_G(spieler).scrollx = 78;
 		if (_G(spieler).flags32_40) {
 			_G(atds)->del_steuer_bit(506, ATS_AKTIV_BIT, ATS_DATA);
-			_G(det)->start_detail(1, 255, false);
-			set_person_pos(195, 146, P_CHEWY, P_RIGHT);
-			set_person_pos(186, 142, P_HOWARD, P_RIGHT);
+			_G(det)->startDetail(1, 255, false);
+			setPersonPos(195, 146, P_CHEWY, P_RIGHT);
+			setPersonPos(186, 142, P_HOWARD, P_RIGHT);
 		}
 		showCur();
 	} else if (!_G(spieler.flags32_20)) {
-		set_person_pos(148, 152, P_CHEWY, P_RIGHT);
-		set_person_pos(98, 142, P_HOWARD, P_RIGHT);
-		set_person_pos(128, 142, P_NICHELLE, P_RIGHT);
+		setPersonPos(148, 152, P_CHEWY, P_RIGHT);
+		setPersonPos(98, 142, P_HOWARD, P_RIGHT);
+		setPersonPos(128, 142, P_NICHELLE, P_RIGHT);
 		_G(spieler).scrollx = 0;
 	} else {
 		hideCur();
 		_G(spieler).scrollx = 0;
-		set_person_pos(133, 152, P_CHEWY, P_RIGHT);
+		setPersonPos(133, 152, P_CHEWY, P_RIGHT);
 		_G(spieler).room_e_obj[127].Attribut = 255;
 		_G(det)->showStaticSpr(5);
 		_G(det)->showStaticSpr(6);
-		start_aad_wait(474, -1);
+		startAadWait(474, -1);
 		flic_cut(FCUT_090);
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
@@ -92,7 +92,7 @@ void Room85::entry(int16 eib_nr) {
 		_G(det)->hideStaticSpr(6);
 		_G(spieler).scrollx = 25;
 		_G(fx_blend) = BLEND3;
-		start_aad_wait(475, -1);
+		startAadWait(475, -1);
 		start_aad(476, -1);
 		flic_cut(FCUT_089);
 		register_cutscene(25);
@@ -155,7 +155,7 @@ int Room85::proc2() {
 
 	autoMove(2, P_CHEWY);
 	_G(det)->stop_detail(1);
-	start_detail_wait(2, 1, ANI_FRONT);
+	startSetailWait(2, 1, ANI_FRONT);
 	_G(spieler).PersonRoomNr[P_HOWARD] = 89;
 	cur_2_inventory();
 	remove_inventory(109);
diff --git a/engines/chewy/rooms/room86.cpp b/engines/chewy/rooms/room86.cpp
index fbb680c1ac9..c45965a32f7 100644
--- a/engines/chewy/rooms/room86.cpp
+++ b/engines/chewy/rooms/room86.cpp
@@ -42,7 +42,7 @@ void Room86::entry(int16 eib_nr) {
 	_G(zoom_horizont) = 110;
 	_G(spieler).DiaAMov = 0;
 	if (_G(spieler).flags32_2) {
-		_G(det)->start_detail(0, 255, false);
+		_G(det)->startDetail(0, 255, false);
 		_G(det)->setStaticPos(0, 352, 107, false, false);
 		_G(det)->showStaticSpr(0);
 	}
@@ -51,15 +51,15 @@ void Room86::entry(int16 eib_nr) {
 		return;
 
 	if (eib_nr == 127) {
-		set_person_pos(82, 56, P_HOWARD, P_RIGHT);
-		set_person_pos(134, 56, P_NICHELLE, P_LEFT);
+		setPersonPos(82, 56, P_HOWARD, P_RIGHT);
+		setPersonPos(134, 56, P_NICHELLE, P_LEFT);
 		return;
 	}
 
 	if (!_G(spieler).flags32_10) {
-		set_person_pos(260, 66, P_CHEWY, P_RIGHT);
-		set_person_pos(298, 44, P_HOWARD, P_LEFT);
-		set_person_pos(320, 42, P_NICHELLE, P_LEFT);
+		setPersonPos(260, 66, P_CHEWY, P_RIGHT);
+		setPersonPos(298, 44, P_HOWARD, P_LEFT);
+		setPersonPos(320, 42, P_NICHELLE, P_LEFT);
 		_G(spieler).scrollx = 164;
 	} else {
 		_G(spieler_mi)[P_CHEWY].Vorschub = 16;
@@ -67,7 +67,7 @@ void Room86::entry(int16 eib_nr) {
 		_G(flags).ZoomMov = false;
 		_G(spieler).scrollx = 246;
 		_G(spieler).ScrollxStep = 8;
-		set_person_pos(443, 66, P_CHEWY, P_RIGHT);
+		setPersonPos(443, 66, P_CHEWY, P_RIGHT);
 		_G(spieler).PersonRoomNr[P_HOWARD] = 84;
 		_G(spieler).PersonRoomNr[P_NICHELLE] = 0;
 		autoMove(2, P_CHEWY);
@@ -149,7 +149,7 @@ int Room86::proc2() {
 	hideCur();
 	autoMove(2, P_CHEWY);
 	start_spz_wait(13, 1, false, P_CHEWY);
-	_G(det)->start_detail(0, 255, false);
+	_G(det)->startDetail(0, 255, false);
 	g_engine->_sound->playSound(0, 0);
 	g_engine->_sound->playSound(0);
 	del_inventar(_G(spieler).AkInvent);
@@ -161,7 +161,7 @@ int Room86::proc2() {
 	_G(spieler).flags32_2 = true;
 	_G(spieler).room_e_obj[132].Attribut = AUSGANG_RECHTS;
 	start_spz(CH_TALK12, 255, false, P_CHEWY);
-	start_aad_wait(468, -1);
+	startAadWait(468, -1);
 
 	showCur();
 	return 1;
@@ -189,7 +189,7 @@ void Room86::proc3(bool cond) {
 	g_engine->_sound->playSound(0, 2, false);
 
 	for (int i = 0; i < 48; ++i) {
-		set_up_screen(NO_SETUP);
+		setupScreen(NO_SETUP);
 		_G(det)->setStaticPos(0, 352, destY, false, false);
 		destY += deltaY;
 		_G(out)->setPointer(nullptr);
diff --git a/engines/chewy/rooms/room87.cpp b/engines/chewy/rooms/room87.cpp
index a8017d3a18d..ab2eff561ee 100644
--- a/engines/chewy/rooms/room87.cpp
+++ b/engines/chewy/rooms/room87.cpp
@@ -47,8 +47,8 @@ void Room87::entry() {
 	if (_G(flags).LoadGame)
 		return;
 
-	set_person_pos(11, 70, P_HOWARD, P_RIGHT);
-	set_person_pos(-3, 81, P_NICHELLE, P_RIGHT);
+	setPersonPos(11, 70, P_HOWARD, P_RIGHT);
+	setPersonPos(-3, 81, P_NICHELLE, P_RIGHT);
 	autoMove(2, P_CHEWY);
 }
 
@@ -129,7 +129,7 @@ int Room87::proc2(int16 txt_nr) {
 
 	if (diaNr) {
 		start_spz(CH_TALK1, 255, false, P_CHEWY);
-		start_aad_wait(diaNr, -1);
+		startAadWait(diaNr, -1);
 	} else {
 		autoMove(movNr, P_CHEWY);
 		del_inventar(_G(spieler).AkInvent);
@@ -160,8 +160,8 @@ int Room87::proc4() {
 	flic_cut(FCUT_095);
 	flic_cut(FCUT_096);
 	_G(det)->hideStaticSpr(2);
-	_G(det)->start_detail(2, 255, false);
-	start_aad_wait(471, -1);
+	_G(det)->startDetail(2, 255, false);
+	startAadWait(471, -1);
 	flic_cut(FCUT_097);
 	flic_cut(FCUT_098);
 	flic_cut(FCUT_099);
diff --git a/engines/chewy/rooms/room88.cpp b/engines/chewy/rooms/room88.cpp
index 7e507aaa608..91fa5ad90a7 100644
--- a/engines/chewy/rooms/room88.cpp
+++ b/engines/chewy/rooms/room88.cpp
@@ -31,9 +31,9 @@ namespace Rooms {
 
 void Room88::entry() {
 	_G(spieler).scrollx = 0;
-	set_person_pos(163, 122, P_CHEWY, P_LEFT);
-	set_person_pos(59, 107, P_HOWARD, P_RIGHT);
-	set_person_pos(91, 110, P_NICHELLE, P_RIGHT);
+	setPersonPos(163, 122, P_CHEWY, P_LEFT);
+	setPersonPos(59, 107, P_HOWARD, P_RIGHT);
+	setPersonPos(91, 110, P_NICHELLE, P_RIGHT);
 	
 	_G(det)->showStaticSpr(1 + (_G(spieler).flags30_10 ? 1 : 0));
 	if (_G(spieler).r88DestRoom == 0)
@@ -42,7 +42,7 @@ void Room88::entry() {
 	_G(SetUpScreenFunc) = calc_person_look;
 
 	if (_G(spieler).flags32_10) {
-		_G(det)->start_detail(4, 255, false);
+		_G(det)->startDetail(4, 255, false);
 		_G(atds)->del_steuer_bit(505, ATS_AKTIV_BIT, ATS_DATA);
 	}
 }
@@ -77,7 +77,7 @@ int Room88::proc2() {
 	autoMove(1, P_CHEWY);
 	start_spz_wait(13, 1, false, P_CHEWY);
 	_G(det)->showStaticSpr(0);
-	start_detail_wait(0, 1, _G(spieler).flags30_10 ? ANI_GO : ANI_FRONT);
+	startSetailWait(0, 1, _G(spieler).flags30_10 ? ANI_GO : ANI_FRONT);
 	_G(det)->hideStaticSpr(1 + (_G(spieler).flags30_10 ? 1 : 0));
 	_G(spieler).flags31_10 = false;
 	_G(det)->showStaticSpr(1 + (!_G(spieler).flags30_10 ? 1 : 0));
@@ -98,7 +98,7 @@ int Room88::proc3() {
 	if (!_G(spieler).flags30_80 || _G(spieler).R88UsedMonkey) {
 		hideCur();
 		if (_G(spieler).flags32_10) {
-			start_aad_wait(480, -1);
+			startAadWait(480, -1);
 			_G(out)->setPointer(nullptr);
 			_G(out)->cls();
 			_G(flags).NoPalAfterFlc = true;
@@ -108,17 +108,17 @@ int Room88::proc3() {
 			_G(spieler).flags32_40 = true;
 			switch_room(84);
 		} else {
-			start_aad_wait(465, -1);
+			startAadWait(465, -1);
 		}
 	} else {
-		start_aad_wait(466, -1);
+		startAadWait(466, -1);
 		start_spz_wait(13, 1, false, P_CHEWY);
 
 		const int aniNr = 1 + (_G(spieler).flags31_10 ? 1 : 0);
 
 		for (int i = 0; i < 3; ++i) {
-			start_detail_wait(aniNr, 1, ANI_FRONT);
-			start_detail_wait(aniNr, 1, ANI_GO);
+			startSetailWait(aniNr, 1, ANI_FRONT);
+			startSetailWait(aniNr, 1, ANI_GO);
 		}
 
 		_G(out)->setPointer(nullptr);
@@ -130,7 +130,7 @@ int Room88::proc3() {
 		_G(out)->raster_col(0, 0, 0, 0);
 		switch_room(80);
 		hideCur();
-		start_detail_wait(1, 1, ANI_FRONT);
+		startSetailWait(1, 1, ANI_FRONT);
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
 		_G(flags).NoPalAfterFlc = true;
diff --git a/engines/chewy/rooms/room89.cpp b/engines/chewy/rooms/room89.cpp
index 8eb6aad4fe6..71d81449523 100644
--- a/engines/chewy/rooms/room89.cpp
+++ b/engines/chewy/rooms/room89.cpp
@@ -48,8 +48,8 @@ void Room89::entry() {
 
 	if (_G(spieler).scrollx != 5000) {
 		_G(spieler).scrollx = 0;
-		set_person_pos(116, 114, P_HOWARD, P_RIGHT);
-		set_person_pos(93, 98, P_CHEWY, P_RIGHT);
+		setPersonPos(116, 114, P_HOWARD, P_RIGHT);
+		setPersonPos(93, 98, P_CHEWY, P_RIGHT);
 	}
 
 	if (_G(spieler).flags35_2) {
@@ -58,7 +58,7 @@ void Room89::entry() {
 		_G(spieler).SVal1 = 89;
 		_G(spieler).SVal2 = 537;
 		switch_room(92);
-		start_aad_wait(490, -1);
+		startAadWait(490, -1);
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
 		_G(flags).NoPalAfterFlc = true;
@@ -74,9 +74,9 @@ void Room89::entry() {
 	} else if (_G(spieler).flags35_4) {
 		// End sequence
 		hideCur();
-		set_person_pos(138, 82, P_CHEWY, P_RIGHT);
-		set_person_pos(116, 114, P_HOWARD, P_RIGHT);
-		set_person_pos(260, 57, P_NICHELLE, P_LEFT);
+		setPersonPos(138, 82, P_CHEWY, P_RIGHT);
+		setPersonPos(116, 114, P_HOWARD, P_RIGHT);
+		setPersonPos(260, 57, P_NICHELLE, P_LEFT);
 		_G(spieler).ZoomXy[P_NICHELLE][0] = _G(spieler).ZoomXy[P_NICHELLE][1] = 10;
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
@@ -176,7 +176,7 @@ int Room89::proc2() {
 	_G(spieler).SVal1 = 89;
 	_G(spieler).SVal2 = 489;
 	switch_room(92);
-	start_aad_wait(490, -1);
+	startAadWait(490, -1);
 	_G(out)->setPointer(nullptr);
 	_G(out)->cls();
 	_G(flags).NoPalAfterFlc = true;
@@ -205,7 +205,7 @@ int Room89::proc4() {
 		_G(det)->hideStaticSpr(6);
 		new_invent_2_cur(111);
 		start_spz(CH_TALK6, 255, false, P_CHEWY);
-		start_aad_wait(491, -1);
+		startAadWait(491, -1);
 	} else {
 		_G(det)->showStaticSpr(5);
 		_G(det)->showStaticSpr(6);
diff --git a/engines/chewy/rooms/room90.cpp b/engines/chewy/rooms/room90.cpp
index 372fdd6fea3..87e11d1f059 100644
--- a/engines/chewy/rooms/room90.cpp
+++ b/engines/chewy/rooms/room90.cpp
@@ -48,13 +48,13 @@ void Room90::entry(int16 eib_nr) {
 		case 78:
 		case 136:
 			_G(spieler).scrollx = 0;
-			set_person_pos(32, 137, P_CHEWY, P_RIGHT);
-			set_person_pos(20, 121, P_HOWARD, P_RIGHT);
+			setPersonPos(32, 137, P_CHEWY, P_RIGHT);
+			setPersonPos(20, 121, P_HOWARD, P_RIGHT);
 			break;
 		case 137:
 			_G(spieler).scrollx = 176;
-			set_person_pos(411, 146, P_CHEWY, P_RIGHT);
-			set_person_pos(440, 132, P_HOWARD, P_RIGHT);
+			setPersonPos(411, 146, P_CHEWY, P_RIGHT);
+			setPersonPos(440, 132, P_HOWARD, P_RIGHT);
 			break;
 		default:
 			break;
@@ -66,7 +66,7 @@ void Room90::entry(int16 eib_nr) {
 
 	if (_G(spieler).flags34_40 && !_G(spieler).flags33_40) {
 		_G(det)->setSetailPos(12, 329, 15);
-		_G(det)->start_detail(12, 255, false);
+		_G(det)->startDetail(12, 255, false);
 		g_engine->_sound->playSound(12, 0);
 		g_engine->_sound->playSound(12);
 	}
@@ -78,26 +78,26 @@ void Room90::entry(int16 eib_nr) {
 
 	if (!_G(spieler).flags33_10) {
 		_G(flags).ZoomMov = false;
-		start_aad_wait(498, -1);
+		startAadWait(498, -1);
 		goAutoXy(-20, 121, P_HOWARD, ANI_GO);
 		autoMove(1, P_CHEWY);
-		start_detail_frame(2, 1, ANI_FRONT, 3);
-		_G(det)->start_detail(0, 1, false);
-		start_detail_wait(1, 1, ANI_FRONT);
+		startDetailFrame(2, 1, ANI_FRONT, 3);
+		_G(det)->startDetail(0, 1, false);
+		startSetailWait(1, 1, ANI_FRONT);
 		_G(spieler).flags33_10 = true;
 		_G(spieler).PersonRoomNr[P_HOWARD] = 91;
 		switch_room(91);
 
 	} else if (!_G(spieler).flags33_20) {
-		start_aad_wait(499, -1);
+		startAadWait(499, -1);
 		_G(spieler).flags33_20 = true;
 
 	} else if (_G(spieler).flags34_20) {
-		set_person_pos(411, 146, P_CHEWY, P_RIGHT);
-		set_person_pos(440, 132, P_HOWARD, P_RIGHT);
+		setPersonPos(411, 146, P_CHEWY, P_RIGHT);
+		setPersonPos(440, 132, P_HOWARD, P_RIGHT);
 		_G(spieler).scrollx = 176;
 		_G(spieler).flags34_20 = false;
-		start_aad_wait(520, -1);
+		startAadWait(520, -1);
 	}
 
 	_G(HowardMov) = 0;
@@ -153,7 +153,7 @@ void Room90::setup_func() {
 				_G(det)->setSetailPos(i + 4, destX, _G(Adi)[i + 4].y);
 				
 				if (!_G(spieler).flags34_40)
-					_G(det)->start_detail(i + 4, 255, false);
+					_G(det)->startDetail(i + 4, 255, false);
 			}
 		}
 	}
@@ -217,7 +217,7 @@ void Room90::proc2() {
 	}
 
 	if (diaNr != -1) {
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		if (_G(spieler).ChewyAni == CHEWY_ANI7) {
 			start_spz_wait(66, 1, false, P_CHEWY);
 			start_spz(67, 255, false, P_CHEWY);
@@ -227,7 +227,7 @@ void Room90::proc2() {
 		}
 
 		hideCur();
-		start_aad_wait(-1, diaNr);
+		startAadWait(-1, diaNr);
 		showCur();
 	}
 	_G(flags).AutoAniPlay = false;
@@ -239,25 +239,25 @@ int Room90::getHubcaps() {
 
 	hideCur();
 	autoMove(3, P_CHEWY);
-	start_aad_wait(515, -1);
+	startAadWait(515, -1);
 	start_spz_wait(14, 1, false, P_CHEWY);
 	start_spz_wait(43, 1, false, P_CHEWY);
 	load_chewy_taf(CHEWY_ANI7);
 
 	while (_G(spieler_vector)[P_HOWARD].Xypos[0] != 176) {
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN0;
 	}
 
 	start_spz_wait(47, 1, false, P_HOWARD);
 	_G(spieler).mi[1] = 2;
-	start_aad_wait(516, -1);
+	startAadWait(516, -1);
 	_G(spieler).flags34_40 = true;
 	_G(spieler).flags35_1 = true;
 	autoMove(4, P_CHEWY);
 	auto_scroll(176, 0);
 	_G(det)->setSetailPos(12, 495, 15);
-	_G(det)->start_detail(12, 255, false);
+	_G(det)->startDetail(12, 255, false);
 	g_engine->_sound->playSound(12, 0);
 	g_engine->_sound->playSound(12);
 
@@ -266,11 +266,11 @@ int Room90::getHubcaps() {
 	while (destX > 329) {
 		destX -= 2;
 		_G(det)->setSetailPos(12, destX, 15);
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN0;
 	}
 
-	start_aad_wait(517, -1);
+	startAadWait(517, -1);
 	_G(spieler).flags35_1 = false;
 	_G(atds)->set_steuer_bit(517, ATS_AKTIV_BIT, ATS_DATA);
 	_G(atds)->del_steuer_bit(519, ATS_AKTIV_BIT, ATS_DATA);
@@ -292,15 +292,15 @@ int Room90::shootControlUnit() {
 	goAutoXy(232, 142, P_CHEWY, ANI_WAIT);
 	_G(flags).NoScroll = true;
 	auto_scroll(176, 0);
-	start_detail_wait(13, 1, ANI_FRONT);
+	startSetailWait(13, 1, ANI_FRONT);
 	_G(flags).NoPalAfterFlc = true;
 	flic_cut(FCUT_107);
 	_G(spieler).scrollx = 0;
-	set_person_pos(76, 145, P_CHEWY, P_LEFT);
+	setPersonPos(76, 145, P_CHEWY, P_LEFT);
 	_G(maus_links_click) = false;
 	_G(det)->showStaticSpr(4);
 	_G(det)->showStaticSpr(5);
-	set_up_screen(NO_SETUP);
+	setupScreen(NO_SETUP);
 	_G(fx_blend) = BLEND3;
 	_G(spieler_mi)[P_CHEWY].Mode = false;
 	_G(flags).NoScroll = false;
@@ -339,7 +339,7 @@ int Room90::useSurimyOnWreck() {
 	_G(det)->hideStaticSpr(5);
 	_G(spieler).scrollx = 176;
 	start_spz(45, 255, false, P_CHEWY);
-	start_aad_wait(519, -1);
+	startAadWait(519, -1);
 	_G(atds)->set_steuer_bit(520, ATS_AKTIV_BIT, ATS_DATA);
 
 	showCur();
diff --git a/engines/chewy/rooms/room91.cpp b/engines/chewy/rooms/room91.cpp
index 8bfdddfa8c7..50a0a430db2 100644
--- a/engines/chewy/rooms/room91.cpp
+++ b/engines/chewy/rooms/room91.cpp
@@ -47,28 +47,28 @@ void Room91::entry() {
 	hideCur();
 
 	if (_G(spieler).flags34_1) {
-		set_person_pos(499, 106, P_CHEWY, P_RIGHT);
-		set_person_pos(536, 90, P_HOWARD, P_RIGHT);
+		setPersonPos(499, 106, P_CHEWY, P_RIGHT);
+		setPersonPos(536, 90, P_HOWARD, P_RIGHT);
 		if (!_G(spieler).flags34_2) {
 			_G(spieler).flags34_2 = true;
-			start_aad_wait(503, -1);
+			startAadWait(503, -1);
 		}
 	} else {
 		_G(flags).MainInput = false;
 		_G(flags).NoScroll = true;
 		_G(spieler).flags34_1 = true;
-		set_person_pos(326, 99, P_CHEWY, P_RIGHT);
-		set_person_pos(312, 75, P_HOWARD, P_RIGHT);
+		setPersonPos(326, 99, P_CHEWY, P_RIGHT);
+		setPersonPos(312, 75, P_HOWARD, P_RIGHT);
 		_G(spieler).SVal3 = 0;
 		_G(spieler).flags34_4 = true;
-		start_aad_wait(502, -1);
+		startAadWait(502, -1);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		_G(det)->start_detail(0, 255, false);
+		_G(det)->startDetail(0, 255, false);
 
 		for (int i = 0; i < 3; ++i) {
 			_G(timer_nr)[i] = _G(room)->set_timer(5 + i, 3 + (2 * i));
 		}
-		_G(det)->start_detail(5, 2, false);
+		_G(det)->startDetail(5, 2, false);
 	}
 
 	showCur();
@@ -115,11 +115,11 @@ void Room91::setup_func() {
 		const int aniNr = 1 + (_G(minfo).y <= 100 ? 1 : 0);
 		hideCur();
 		_G(det)->stop_detail(0);
-		start_detail_wait(aniNr, 1, ANI_FRONT);
+		startSetailWait(aniNr, 1, ANI_FRONT);
 		_click = oldClick;
-		_G(det)->start_detail(0, 255, false);
-		_G(det)->start_detail(aniNr + 2, 1, false);
-		_G(det)->start_detail(7, 1, false);
+		_G(det)->startDetail(0, 255, false);
+		_G(det)->startDetail(aniNr + 2, 1, false);
+		_G(det)->startDetail(7, 1, false);
 		start_spz_wait(62, 1, false, P_HOWARD);
 		_G(spieler).SVal3 += 1;
 		showCur();
@@ -129,9 +129,9 @@ void Room91::setup_func() {
 			hideCur();
 			autoMove(1, P_CHEWY);
 			stop_spz();
-			start_aad_wait(505, -1);
+			startAadWait(505, -1);
 			_G(spieler).PersonHide[P_HOWARD] = true;
-			start_detail_wait(9, 1, ANI_FRONT);
+			startSetailWait(9, 1, ANI_FRONT);
 			_G(spieler).PersonHide[P_HOWARD] = false;
 			_G(spieler).PersonRoomNr[P_HOWARD] = 50;
 			_G(spieler).flags34_4 = false;
diff --git a/engines/chewy/rooms/room92.cpp b/engines/chewy/rooms/room92.cpp
index 8cc707eed92..4aadbaa685e 100644
--- a/engines/chewy/rooms/room92.cpp
+++ b/engines/chewy/rooms/room92.cpp
@@ -34,7 +34,7 @@ void Room92::entry() {
 	cur_2_inventory();
 	hideCur();
 	hide_person();
-	start_aad_wait(_G(spieler).SVal2, -1);
+	startAadWait(_G(spieler).SVal2, -1);
 	switch (_G(spieler).SVal2) {
 	case 487:
 		_G(out)->setPointer(nullptr);
diff --git a/engines/chewy/rooms/room93.cpp b/engines/chewy/rooms/room93.cpp
index ec0d8b1f83b..bc11bc906e1 100644
--- a/engines/chewy/rooms/room93.cpp
+++ b/engines/chewy/rooms/room93.cpp
@@ -34,29 +34,29 @@ void Room93::entry() {
 
 	_G(spieler).scrollx = 0;
 	hide_person();
-	start_detail_wait(3, 0, ANI_GO);
+	startSetailWait(3, 0, ANI_GO);
 	_G(det)->set_static_ani(0, -1);
-	start_aad_wait(616, -1);
+	startAadWait(616, -1);
 	_G(det)->del_static_ani(0);
-	start_detail_wait(3, 1, ANI_FRONT);
+	startSetailWait(3, 1, ANI_FRONT);
 	_G(det)->set_static_ani(1, -1);
 	start_ads_wait(27);
 
 	if (!_G(spieler).flags37_40) {
 		_G(det)->del_static_ani(1);
 		hideCur();
-		start_detail_wait(3, 1, ANI_GO);
+		startSetailWait(3, 1, ANI_GO);
 		_G(det)->set_static_ani(0, -1);
-		start_aad_wait(549, -1);
+		startAadWait(549, -1);
 		_G(det)->del_static_ani(0);
-		start_detail_wait(3, 1, ANI_FRONT);
-		start_detail_wait(6, 1, ANI_FRONT);
+		startSetailWait(3, 1, ANI_FRONT);
+		startSetailWait(6, 1, ANI_FRONT);
 		_G(det)->set_static_ani(7, -1);
-		start_aad_wait(550, -1);
+		startAadWait(550, -1);
 		_G(det)->del_static_ani(7);
-		start_detail_wait(6, 1, ANI_GO);
-		start_detail_wait(2, 1, ANI_FRONT);
-		set_up_screen(DO_SETUP);
+		startSetailWait(6, 1, ANI_GO);
+		startSetailWait(2, 1, ANI_FRONT);
+		setupScreen(DO_SETUP);
 		showCur();
 	}
 
diff --git a/engines/chewy/rooms/room94.cpp b/engines/chewy/rooms/room94.cpp
index 00cb1981813..e582f31dbf0 100644
--- a/engines/chewy/rooms/room94.cpp
+++ b/engines/chewy/rooms/room94.cpp
@@ -52,8 +52,8 @@ void Room94::entry() {
 		_G(zoom_horizont) = 140;
 		_G(spieler).flags35_8 = false;
 		_G(spieler).scrollx = 0;
-		set_person_pos(156, 149, P_CHEWY, P_RIGHT);
-		set_person_pos(153, 122, P_HOWARD, P_RIGHT);
+		setPersonPos(156, 149, P_CHEWY, P_RIGHT);
+		setPersonPos(153, 122, P_HOWARD, P_RIGHT);
 		_G(out)->setPointer(nullptr);
 		_G(out)->cls();
 		flic_cut(FCUT_120);
@@ -67,8 +67,8 @@ void Room94::entry() {
 
 	if (_G(spieler).flags35_40) {
 		// Ghost shooting dolls during initial arrival
-		set_person_pos(373, 122, P_CHEWY, P_LEFT);
-		set_person_pos(393, 94, P_HOWARD, P_LEFT);
+		setPersonPos(373, 122, P_CHEWY, P_LEFT);
+		setPersonPos(393, 94, P_HOWARD, P_LEFT);
 		_G(spieler).flags35_40 = false;
 		_G(spieler).scrollx = 150;
 
@@ -90,7 +90,7 @@ void Room94::entry() {
 		// Normal scene entry after having dealt with Ghost
 		hideCur();
 		_G(spieler).scrollx = 120;
-		set_person_pos(255, 86, P_HOWARD, P_LEFT);
+		setPersonPos(255, 86, P_HOWARD, P_LEFT);
 		autoMove(3, P_CHEWY);
 		showCur();
 	}
@@ -142,20 +142,20 @@ int Room94::giveGhostBottle() {
 	_G(flags).NoPalAfterFlc = true;
 	flic_cut(FCUT_062);
 	_G(fx_blend) = BLEND3;
-	_G(det)->start_detail(5, 255, false);
-	start_aad_wait(541, -1);
+	_G(det)->startDetail(5, 255, false);
+	startAadWait(541, -1);
 	_G(det)->stop_detail(5);
 	_G(det)->showStaticSpr(5);
 	Room66::proc8(3, 3, 2, 617);
 	hideCur();
 	_G(det)->hideStaticSpr(5);
-	_G(det)->start_detail(5, 255, false);
-	start_aad_wait(622, -1);
+	_G(det)->startDetail(5, 255, false);
+	startAadWait(622, -1);
 	_G(det)->stop_detail(5);
-	_G(det)->start_detail(6, 1, false);	
+	_G(det)->startDetail(6, 1, false);	
 	_G(room)->set_timer_status(3, TIMER_STOP);
 	_G(det)->del_static_ani(3);
-	start_detail_wait(4, 1, ANI_FRONT);
+	startSetailWait(4, 1, ANI_FRONT);
 	_G(spieler).flags35_10 = true;
 	_G(spieler).room_e_obj[138].Attribut = AUSGANG_OBEN;
 	_G(atds)->set_steuer_bit(522, ATS_AKTIV_BIT, ATS_DATA);
diff --git a/engines/chewy/rooms/room95.cpp b/engines/chewy/rooms/room95.cpp
index 39de4dd09d3..ff2df698404 100644
--- a/engines/chewy/rooms/room95.cpp
+++ b/engines/chewy/rooms/room95.cpp
@@ -46,10 +46,10 @@ void Room95::entry(int16 eib_nr) {
 
 	hideCur();
 	if (eib_nr == 138) {
-		set_person_pos(-20, 120, P_HOWARD, ANI_GO);
+		setPersonPos(-20, 120, P_HOWARD, ANI_GO);
 		autoMove(2, P_CHEWY);
 	} else {
-		set_person_pos(473, 83, P_HOWARD, P_RIGHT);
+		setPersonPos(473, 83, P_HOWARD, P_RIGHT);
 	}
 
 	showCur();
@@ -116,7 +116,7 @@ int Room95::proc2() {
 		switch_room(97);
 	} else {
 		start_spz(CH_TALK1, 255, false, P_CHEWY);
-		start_aad_wait(548, -1);
+		startAadWait(548, -1);
 	}
 
 	showCur();
diff --git a/engines/chewy/rooms/room96.cpp b/engines/chewy/rooms/room96.cpp
index f9e53bb588d..be49c03a1b0 100644
--- a/engines/chewy/rooms/room96.cpp
+++ b/engines/chewy/rooms/room96.cpp
@@ -43,8 +43,8 @@ void Room96::entry() {
 		return;
 
 	hideCur();
-	set_person_pos(93, 62, P_HOWARD, P_RIGHT);
-	set_person_pos(116, 74, P_CHEWY, P_RIGHT);
+	setPersonPos(93, 62, P_HOWARD, P_RIGHT);
+	setPersonPos(116, 74, P_CHEWY, P_RIGHT);
 	autoMove(1, P_CHEWY);
 	showCur();
 }
diff --git a/engines/chewy/rooms/room97.cpp b/engines/chewy/rooms/room97.cpp
index e4868c1eeb6..2e9604e910d 100644
--- a/engines/chewy/rooms/room97.cpp
+++ b/engines/chewy/rooms/room97.cpp
@@ -65,14 +65,14 @@ void Room97::entry() {
 	}
 	
 	if (_G(spieler).flags36_10) {
-		_G(det)->start_detail(11, 255, ANI_FRONT);
+		_G(det)->startDetail(11, 255, ANI_FRONT);
 		_G(det)->stop_detail(5);
-		_G(det)->start_detail(6, 255, ANI_FRONT);
-		_G(det)->start_detail(12, 255, ANI_FRONT);
+		_G(det)->startDetail(6, 255, ANI_FRONT);
+		_G(det)->startDetail(12, 255, ANI_FRONT);
 	}
 
 	if (_G(spieler).flags36_40) {
-		_G(det)->start_detail(14, 255, ANI_FRONT);
+		_G(det)->startDetail(14, 255, ANI_FRONT);
 		_G(det)->showStaticSpr(13);
 		_G(atds)->del_steuer_bit(543, ATS_AKTIV_BIT, ATS_DATA);
 	} else {
@@ -83,7 +83,7 @@ void Room97::entry() {
 		_G(det)->setSetailPos(27, 272, 110);
 		for (int i = 0; i < 2; ++i) {
 			_G(det)->stop_detail(23 + i);
-			_G(det)->start_detail(27 + i, 255, ANI_FRONT);
+			_G(det)->startDetail(27 + i, 255, ANI_FRONT);
 		}
 		g_engine->_sound->stopSound(0);
 		g_engine->_sound->stopSound(0);
@@ -113,15 +113,15 @@ void Room97::entry() {
 		_G(spieler).SVal2 = 0;
 		_G(spieler).flags35_4 = true;
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(19, 1, ANI_FRONT);
+		startSetailWait(19, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		showCur();
 		switch_room(89);
 	} else {
 		_G(spieler).scrollx = 800;
-		set_person_pos(1067, 98, P_CHEWY, P_LEFT);
-		set_person_pos(1092, 83, P_HOWARD, P_LEFT);
-		set_person_pos(130, 29, P_NICHELLE, P_RIGHT);
+		setPersonPos(1067, 98, P_CHEWY, P_LEFT);
+		setPersonPos(1092, 83, P_HOWARD, P_LEFT);
+		setPersonPos(130, 29, P_NICHELLE, P_RIGHT);
 	}
 }
 
@@ -164,7 +164,7 @@ void Room97::setup_func() {
 	_G(spieler_mi)[P_NICHELLE].Vorschub = 4;
 
 	if (_G(spieler).flags35_80 && _G(spieler_vector)->Xypos[P_CHEWY] > 830)
-		set_person_pos(830, 98, P_CHEWY, P_RIGHT);
+		setPersonPos(830, 98, P_CHEWY, P_RIGHT);
 
 	if (_word18DB2E)
 		--_word18DB2E;
@@ -261,7 +261,7 @@ void Room97::proc2() {
 		return;
 
 	_G(flags).AutoAniPlay = true;
-	stop_person(P_CHEWY);
+	stopPerson(P_CHEWY);
 	hideCur();
 	_G(Sdi)[6].z_ebene = 6;
 	_G(Sdi)[24].z_ebene = 6;
@@ -285,16 +285,16 @@ void Room97::proc3() {
 
 	_G(flags).AutoAniPlay = true;
 	hideCur();
-	stop_person(P_CHEWY);
+	stopPerson(P_CHEWY);
 	_G(spieler_mi)[P_CHEWY].Mode = true;
 	
 	if (!_G(spieler).flags36_20) {
 		start_spz(CH_TALK5, 255, false, P_CHEWY);
-		start_aad_wait(557, -1);
+		startAadWait(557, -1);
 		goAutoXy(588, 129, P_CHEWY, ANI_WAIT);
 	} else if (!_G(spieler).flags36_40) {
 		start_spz(CH_TALK5, 255, false, P_CHEWY);
-		start_aad_wait(568, -1);
+		startAadWait(568, -1);
 		goAutoXy(588, 129, P_CHEWY, ANI_WAIT);
 	} else {
 		_G(spieler).flags36_1 = true;
@@ -317,7 +317,7 @@ void Room97::proc3() {
 		if (!_G(spieler).flags36_80) {
 			goAutoXy(442, 35, P_HOWARD, ANI_WAIT);
 			goAutoXy(497, 31, P_HOWARD, ANI_WAIT);
-			start_aad_wait(562, -1);
+			startAadWait(562, -1);
 		}
 		_G(spieler_mi)[P_CHEWY].Mode = false;
 		_G(Sdi)[6].z_ebene = 166;
@@ -336,14 +336,14 @@ void Room97::proc4() {
 		_G(flags).AutoAniPlay = true;
 		hideCur();
 		_G(spieler_mi)[P_CHEWY].Mode = true;
-		stop_person(P_CHEWY);
+		stopPerson(P_CHEWY);
 		g_engine->_sound->playSound(9, 0);
 		g_engine->_sound->stopSound(1);
-		start_detail_wait(9, 1, ANI_FRONT);
+		startSetailWait(9, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(21);
 
 		while (_G(spieler_vector)[P_HOWARD].Xypos[0] > 996) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 			SHOULD_QUIT_RETURN;
 		}
 
@@ -357,11 +357,11 @@ void Room97::proc4() {
 		goAutoXy(995, 77, P_HOWARD, ANI_WAIT);
 		goAutoXy(1047, 87, P_HOWARD, ANI_WAIT);
 
-		start_detail_wait(29, 1, ANI_FRONT);
+		startSetailWait(29, 1, ANI_FRONT);
 		_G(det)->hideStaticSpr(21);
 		g_engine->_sound->playSound(9, 1);
 		g_engine->_sound->stopSound(0);
-		start_detail_wait(9, 0, ANI_BACK);
+		startSetailWait(9, 0, ANI_BACK);
 
 		goAutoXy(1008, 93, P_CHEWY, ANI_WAIT);
 		goAutoXy(967, 111, P_CHEWY, ANI_WAIT);
@@ -369,7 +369,7 @@ void Room97::proc4() {
 		_G(det)->hideStaticSpr(2);
 		_G(spieler_mi)[P_CHEWY].Mode = false;
 		start_spz(CH_TALK5, 255, false, P_CHEWY);
-		start_aad_wait(553, -1);
+		startAadWait(553, -1);
 		_G(HowardMov) = 0;
 		showCur();
 	}
@@ -386,7 +386,7 @@ int Room97::proc5() {
 	auto_scroll(800, 0);
 	
 	while (_G(spieler_vector)[P_HOWARD].Xypos[0] < 1080) {
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN0;
 	}
 
@@ -396,16 +396,16 @@ int Room97::proc5() {
 	g_engine->_sound->playSound(0, 0);
 	g_engine->_sound->playSound(0);
 	_G(spieler).scrollx = 720;
-	set_person_pos(822, 98, P_CHEWY, P_LEFT);
-	set_person_pos(861, 81, P_HOWARD, P_LEFT);
+	setPersonPos(822, 98, P_CHEWY, P_LEFT);
+	setPersonPos(861, 81, P_HOWARD, P_LEFT);
 	del_inventar(_G(spieler).AkInvent);
 	_G(det)->showStaticSpr(21);
 	_G(spieler).flags35_80 = true;
-	start_aad_wait(546, -1);
+	startAadWait(546, -1);
 	_G(det)->hideStaticSpr(21);
 	g_engine->_sound->playSound(9, 1);
 	g_engine->_sound->stopSound(0);
-	start_detail_wait(9, 0, ANI_GO);
+	startSetailWait(9, 0, ANI_GO);
 	
 	showCur();
 	return 1;
@@ -419,17 +419,17 @@ int Room97::proc6() {
 	autoMove(1, P_CHEWY);
 	_G(spieler_mi)[P_CHEWY].Mode = true;
 	goAutoXy(298, 120, P_CHEWY, ANI_WAIT);
-	set_person_spr(P_LEFT, P_CHEWY);
+	setPersonSpr(P_LEFT, P_CHEWY);
 	start_spz_wait(CH_LGET_O, 1, false, P_CHEWY);
 	_G(det)->hideStaticSpr(15);
-	start_detail_wait(1, 1, ANI_FRONT);
+	startSetailWait(1, 1, ANI_FRONT);
 	_G(det)->showStaticSpr(28);
 	autoMove(1, P_CHEWY);
 	_G(det)->hideStaticSpr(18);
-	start_detail_wait(15, 1, ANI_FRONT);
+	startSetailWait(15, 1, ANI_FRONT);
 	_G(det)->showStaticSpr(17);
 	start_spz(CH_TALK5, 255, false, P_CHEWY);
-	start_aad_wait(558, -1);
+	startAadWait(558, -1);
 	_G(det)->hideStaticSpr(28);
 	_G(det)->stop_detail(5);
 	_G(det)->showStaticSpr(15);
@@ -454,12 +454,12 @@ int Room97::proc7() {
 	_G(spieler_mi)[P_CHEWY].Mode = true;
 	_G(spieler).PersonHide[P_CHEWY] = true;
 	_G(det)->hideStaticSpr(17);
-	start_detail_wait(22, 1, ANI_FRONT);
+	startSetailWait(22, 1, ANI_FRONT);
 	_G(atds)->set_steuer_bit(538, ATS_AKTIV_BIT, ATS_DATA);
 	_G(atds)->set_ats_str(530, 2, ATS_DATA);
 	new_invent_2_cur(SLIME_INV);
 	_G(spieler).flags36_4 = true;
-	set_person_pos(304, 102, P_CHEWY, P_RIGHT);
+	setPersonPos(304, 102, P_CHEWY, P_RIGHT);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	autoMove(1, P_CHEWY);
 	_G(spieler_mi)[P_CHEWY].Mode = false;
@@ -481,45 +481,45 @@ int Room97::proc8() {
 		diaNr = 560;
 	else {
 		start_spz_wait(14, 1, false, P_CHEWY);
-		_G(det)->start_detail(11, 255, false);
+		_G(det)->startDetail(11, 255, false);
 		del_inventar(_G(spieler).AkInvent);
 		_G(spieler).flags36_10 = true;
 		_G(spieler).flags36_8 = false;
-		_G(det)->start_detail(12, 255, false);
+		_G(det)->startDetail(12, 255, false);
 		_G(atds)->set_ats_str(530, 3, ATS_DATA);
 		_G(atds)->del_steuer_bit(532, ATS_AKTIV_BIT, ATS_DATA);
 		_G(atds)->set_ats_str(532, 1, ATS_DATA);
-		_G(det)->start_detail(6, 255, false);
+		_G(det)->startDetail(6, 255, false);
 		_G(det)->hideStaticSpr(14);
 		autoMove(3, P_CHEWY);
 		auto_scroll(406, 0);
-		wait_show_screen(40);
+		waitShowScreen(40);
 		_G(det)->stop_detail(24);
 		g_engine->_sound->playSound(26, 0);
 		g_engine->_sound->playSound(26);
-		start_detail_wait(25, 1, ANI_FRONT);
-		_G(det)->start_detail(26, 255, false);
+		startSetailWait(25, 1, ANI_FRONT);
+		_G(det)->startDetail(26, 255, false);
 		_G(det)->stop_detail(23);
-		_G(det)->start_detail(27, 255, false);
-		wait_show_screen(80);
+		_G(det)->startDetail(27, 255, false);
+		waitShowScreen(80);
 		autoMove(4, P_CHEWY);
 		auto_scroll(646, 0);
-		start_aad_wait(566, -1);
-		wait_show_screen(60);
-		start_aad_wait(567, -1);
+		startAadWait(566, -1);
+		waitShowScreen(60);
+		startAadWait(567, -1);
 		_G(det)->stop_detail(26);
 		_G(det)->stop_detail(27);
 		_G(spieler).flags36_20 = true;
-		_G(det)->start_detail(28, 255, false);
+		_G(det)->startDetail(28, 255, false);
 		_G(det)->setSetailPos(27, 272, 110);
-		_G(det)->start_detail(27, 255, false);
+		_G(det)->startDetail(27, 255, false);
 		_G(atds)->set_steuer_bit(533, ATS_AKTIV_BIT, ATS_DATA);
 		_G(atds)->set_steuer_bit(534, ATS_AKTIV_BIT, ATS_DATA);
 	}
 
 	if (diaNr != -1) {
 		start_spz(CH_TALK5, 255, false, P_CHEWY);
-		start_aad_wait(diaNr, -1);
+		startAadWait(diaNr, -1);
 	}
 
 	showCur();
@@ -535,14 +535,14 @@ int Room97::proc9() {
 	
 	if (!_G(spieler).flags36_20) {
 		start_spz(CH_TALK5, 255, false, P_CHEWY);
-		start_aad_wait(556, -1);
+		startAadWait(556, -1);
 	} else {
 		start_spz_wait(13, 1, false, P_CHEWY);
-		start_detail_wait(0, 1, ANI_FRONT);
+		startSetailWait(0, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(13);
-		start_detail_wait(13, 1, ANI_FRONT);
-		_G(det)->start_detail(14, 255, false);
-		start_aad_wait(555, -1);
+		startSetailWait(13, 1, ANI_FRONT);
+		_G(det)->startDetail(14, 255, false);
+		startAadWait(555, -1);
 		_G(spieler).flags36_40 = true;
 		_G(atds)->set_steuer_bit(539, ATS_AKTIV_BIT, ATS_DATA);
 		_G(atds)->del_steuer_bit(537, ATS_AKTIV_BIT, ATS_DATA);
@@ -563,7 +563,7 @@ int Room97::proc10() {
 	start_spz_wait(13, 1, false, P_CHEWY);
 	g_engine->_sound->playSound(7, 0);
 	g_engine->_sound->stopSound(1);
-	start_detail_wait(7, 1, ANI_FRONT);
+	startSetailWait(7, 1, ANI_FRONT);
 	_G(det)->showStaticSpr(19);
 	_G(spieler).flags37_1 = true;
 	_G(atds)->set_steuer_bit(543, ATS_AKTIV_BIT, ATS_DATA);
@@ -582,21 +582,21 @@ int Room97::proc11() {
 
 	if (!_G(spieler).flags37_2) {
 		start_spz(CH_TALK5, 255, false, P_CHEWY);
-		start_aad_wait(569, -1);
+		startAadWait(569, -1);
 	} else {
 		autoMove(9, P_CHEWY);
-		start_aad_wait(570, -1);
+		startAadWait(570, -1);
 		start_spz_wait(13, 1, false, P_CHEWY);
 		autoMove(7, P_CHEWY);
 		start_spz(CH_TALK6, 255, false, P_CHEWY);
-		start_aad_wait(571, -1);
+		startAadWait(571, -1);
 		g_engine->_sound->playSound(4, 0);
 		g_engine->_sound->playSound(4);
-		_G(det)->start_detail(4, 1, false);
+		_G(det)->startDetail(4, 1, false);
 		autoMove(12, P_CHEWY);
 		start_spz_wait(64, 1, false, P_CHEWY);
 		start_spz(65, 255, false, P_CHEWY);
-		start_aad_wait(561, -1);
+		startAadWait(561, -1);
 		_G(spieler).SVal1 = 97;
 		_G(spieler).SVal2 = 523;
 		cur_2_inventory();
@@ -611,8 +611,8 @@ int Room97::proc11() {
 
 void Room97::proc12() {
 	if (!_G(spieler).flags37_1) {
-		stop_person(P_CHEWY);
-		set_person_pos(491, 42, P_CHEWY, P_RIGHT);
+		stopPerson(P_CHEWY);
+		setPersonPos(491, 42, P_CHEWY, P_RIGHT);
 		return;
 	}
 
@@ -621,13 +621,13 @@ void Room97::proc12() {
 
 	_G(flags).AutoAniPlay = true;
 	hideCur();
-	stop_person(P_CHEWY);
+	stopPerson(P_CHEWY);
 	_G(det)->showStaticSpr(26);
 	goAutoXy(481, 39, P_CHEWY, ANI_WAIT);
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	set_person_pos(327, 42, P_CHEWY, P_LEFT);
-	wait_show_screen(50);
-	set_person_pos(347, 42, P_CHEWY, P_LEFT);
+	setPersonPos(327, 42, P_CHEWY, P_LEFT);
+	waitShowScreen(50);
+	setPersonPos(347, 42, P_CHEWY, P_LEFT);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	_G(det)->hideStaticSpr(26);
 	_G(spieler_mi)[P_CHEWY].Mode = false;
@@ -641,13 +641,13 @@ void Room97::proc13() {
 
 	_G(flags).AutoAniPlay = true;
 	hideCur();
-	stop_person(P_CHEWY);
+	stopPerson(P_CHEWY);
 	_G(spieler_mi)[P_CHEWY].Mode = true;
 	_G(det)->showStaticSpr(26);
 	_G(spieler).PersonHide[P_CHEWY] = true;
-	set_person_pos(508, 41, P_CHEWY, P_LEFT);
-	wait_show_screen(50);
-	set_person_pos(488, 41, P_CHEWY, P_LEFT);
+	setPersonPos(508, 41, P_CHEWY, P_LEFT);
+	waitShowScreen(50);
+	setPersonPos(488, 41, P_CHEWY, P_LEFT);
 	_G(spieler).PersonHide[P_CHEWY] = false;
 	autoMove(6, P_CHEWY);
 	_G(det)->hideStaticSpr(26);
@@ -674,13 +674,13 @@ void Room97::sensorAnim() {
 		return;
 
 	_G(flags).AutoAniPlay = true;
-	stop_person(P_CHEWY);
+	stopPerson(P_CHEWY);
 	_G(menu_item) = CUR_USE;
 	cursorChoice(CUR_USE);
-	set_person_pos(294, 42, P_CHEWY, P_LEFT);
+	setPersonPos(294, 42, P_CHEWY, P_LEFT);
 	_G(atds)->del_steuer_bit(541, ATS_AKTIV_BIT, ATS_DATA);
 	_slimeThrown = false;
-	_G(det)->start_detail(16, 1, 0);
+	_G(det)->startDetail(16, 1, 0);
 	
 	while (_G(det)->get_ani_status(16)) {
 		get_user_key(NO_SETUP);
@@ -689,35 +689,35 @@ void Room97::sensorAnim() {
 				_G(maus_links_click) = true;
 		}
 
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 		SHOULD_QUIT_RETURN;
 	}
 
 	hideCur();
 	if (!_slimeThrown) {
-		start_detail_wait(17, 1, ANI_FRONT);
-		_G(det)->start_detail(16, 1, true);
+		startSetailWait(17, 1, ANI_FRONT);
+		_G(det)->startDetail(16, 1, true);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(20, 1, false);
-		set_person_pos(318, 42, P_CHEWY, P_LEFT);
+		startSetailWait(20, 1, false);
+		setPersonPos(318, 42, P_CHEWY, P_LEFT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 	} else {
 		_G(spieler).flags37_4 = true;
 		del_inventar(_G(spieler).AkInvent);
 		_G(det)->showStaticSpr(27);
 		_G(spieler).PersonHide[P_CHEWY] = true;
-		start_detail_wait(21, 1, ANI_FRONT);
+		startSetailWait(21, 1, ANI_FRONT);
 		_G(spieler).PersonHide[P_CHEWY] = false;
 		_G(det)->hideStaticSpr(27);
-		start_detail_wait(18, 1, ANI_FRONT);
+		startSetailWait(18, 1, ANI_FRONT);
 
 		g_engine->_sound->playSound(8, 0);
 		g_engine->_sound->stopSound(1);
-		start_detail_wait(8, 1, ANI_FRONT);
+		startSetailWait(8, 1, ANI_FRONT);
 		_G(det)->showStaticSpr(20);
 		autoMove(10, P_CHEWY);
 		auto_scroll(60, 0);
-		start_aad_wait(544, -1);
+		startAadWait(544, -1);
 		_bool18DB32 = true;
 		autoMove(11, P_CHEWY);
 		_bool18DB32 = false;
@@ -727,12 +727,12 @@ void Room97::sensorAnim() {
 		autoMove(7, P_CHEWY);
 
 		while (_G(spieler).scrollx < 368) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 			SHOULD_QUIT_RETURN;
 		}
 
 		_G(det)->showStaticSpr(26);
-		set_person_pos(482, 24, P_NICHELLE, P_RIGHT);
+		setPersonPos(482, 24, P_NICHELLE, P_RIGHT);
 		goAutoXy(477, 29, P_NICHELLE, ANI_WAIT);
 		_G(det)->hideStaticSpr(26);
 		_G(spieler).flags37_2 = true;
diff --git a/engines/chewy/sound.cpp b/engines/chewy/sound.cpp
index 6c4cdc6aa92..0bf762c5017 100644
--- a/engines/chewy/sound.cpp
+++ b/engines/chewy/sound.cpp
@@ -172,7 +172,7 @@ void Sound::playSpeech(int num, bool waitForFinish) {
 	if (waitForFinish) {
 		// Wait for speech to finish
 		while (isSpeechActive() && !SHOULD_QUIT) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		}
 	}
 }
@@ -275,7 +275,7 @@ void Sound::convertTMFToMod(uint8 *tmfData, uint32 tmfSize, uint8 *modData, uint
 void Sound::waitForSpeechToFinish() {
 	if (_G(spieler).SpeechSwitch) {
 		while (g_engine->_sound->isSpeechActive() && !SHOULD_QUIT) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		}
 	}
 }
diff --git a/engines/chewy/sprite.cpp b/engines/chewy/sprite.cpp
index 9b38c939bff..bd9d1faf8d1 100644
--- a/engines/chewy/sprite.cpp
+++ b/engines/chewy/sprite.cpp
@@ -28,7 +28,7 @@ namespace Chewy {
 
 #define ZOBJ_ANI_DETAIL 1
 #define ZOBJ_STATIC_DETAIL 2
-#define ZOBJ_INVENTAR 3
+#define ZOBJ_INVENTORY 3
 #define ZOBJ_AUTO_OBJ 4
 #define ZOBJ_PROGANI 5
 #define ZOBJ_CHEWY 6
@@ -108,9 +108,8 @@ static const int16 SPZ_ANI_PH[][2] = {
 };
 
 
-void sprite_engine() {
+void spriteEngine() {
 	int16 min_zeiger = 0;
-	int16 spr_nr;
 	int16 x, y;
 	ObjMov detmov;
 	TafSeqInfo *ts_info;
@@ -145,7 +144,7 @@ void sprite_engine() {
 			_G(det)->plot_static_details(_G(spieler).scrollx, _G(spieler).scrolly, nr, nr);
 			break;
 
-		case ZOBJ_INVENTAR:
+		case ZOBJ_INVENTORY:
 			_G(out)->sprite_set(_G(inv_spr)[nr],
 			                 _G(spieler).room_m_obj[nr].X - _G(spieler).scrollx,
 			                 _G(spieler).room_m_obj[nr].Y - _G(spieler).scrolly, 0);
@@ -154,28 +153,28 @@ void sprite_engine() {
 		case ZOBJ_CHEWY:
 			if (!_G(spieler).PersonHide[P_CHEWY]) {
 				if (!_G(spz_ani)[P_CHEWY]) {
-					spr_nr = _G(chewy_ph)[_G(spieler_vector)[P_CHEWY].Phase * 8 + _G(spieler_vector)[P_CHEWY].PhNr];
-					x = _G(spieler_mi)[P_CHEWY].XyzStart[0] + _G(chewy_kor)[spr_nr * 2] - _G(spieler).scrollx;
-					y = _G(spieler_mi)[P_CHEWY].XyzStart[1] + _G(chewy_kor)[spr_nr * 2 + 1] - _G(spieler).scrolly;
+					int16 sprNr = _G(chewy_ph)[_G(spieler_vector)[P_CHEWY].Phase * 8 + _G(spieler_vector)[P_CHEWY].PhNr];
+					x = _G(spieler_mi)[P_CHEWY].XyzStart[0] + _G(chewy_kor)[sprNr * 2] - _G(spieler).scrollx;
+					y = _G(spieler_mi)[P_CHEWY].XyzStart[1] + _G(chewy_kor)[sprNr * 2 + 1] - _G(spieler).scrolly;
 					calc_zoom(_G(spieler_mi)[P_CHEWY].XyzStart[1], (int16)_G(room)->_roomInfo->_zoomFactor,
 					          (int16)_G(room)->_roomInfo->_zoomFactor, &_G(spieler_vector)[P_CHEWY]);
 
-					_G(out)->scale_set(_G(chewy)->image[spr_nr], x, y,
+					_G(out)->scale_set(_G(chewy)->image[sprNr], x, y,
 					                _G(spieler_vector)[P_CHEWY].Xzoom,
 					                _G(spieler_vector)[P_CHEWY].Yzoom,
 					                _G(scr_width));
 				} else {
-					spr_nr = _G(spz_spr_nr)[_G(spieler_vector)[P_CHEWY].PhNr];
-					x = _G(spieler_mi)[P_CHEWY].XyzStart[0] + _G(spz_tinfo)->_correction[spr_nr * 2] -
+					int16 sprNr = _G(spz_spr_nr)[_G(spieler_vector)[P_CHEWY].PhNr];
+					x = _G(spieler_mi)[P_CHEWY].XyzStart[0] + _G(spz_tinfo)->_correction[sprNr * 2] -
 					    _G(spieler).scrollx;
-					y = _G(spieler_mi)[P_CHEWY].XyzStart[1] + _G(spz_tinfo)->_correction[spr_nr * 2 + 1] -
+					y = _G(spieler_mi)[P_CHEWY].XyzStart[1] + _G(spz_tinfo)->_correction[sprNr * 2 + 1] -
 					    _G(spieler).scrolly;
 					calc_zoom(_G(spieler_mi)[P_CHEWY].XyzStart[1],
 					          (int16)_G(room)->_roomInfo->_zoomFactor,
 					          (int16)_G(room)->_roomInfo->_zoomFactor,
 					          &_G(spieler_vector)[P_CHEWY]);
 
-					_G(out)->scale_set(_G(spz_tinfo)->image[spr_nr], x, y,
+					_G(out)->scale_set(_G(spz_tinfo)->image[sprNr], x, y,
 					                _G(spieler_vector)[P_CHEWY].Xzoom,
 					                _G(spieler_vector)[P_CHEWY].Yzoom,
 					                _G(scr_width));
@@ -185,20 +184,21 @@ void sprite_engine() {
 
 		case ZOBJ_HOWARD:
 		case ZOBJ_NICHELLE: {
-			int16 p_nr = _G(z_obj_sort)[min_zeiger].ObjArt - 6;
-			if (!_G(spieler).PersonHide[p_nr]) {
-				if (!_G(spz_ani)[p_nr]) {
-					ts_info = _G(PersonTaf)[p_nr];
-					spr_nr = _G(PersonSpr)[p_nr][_G(spieler_vector)[p_nr].PhNr];
+			int16 personNr = _G(z_obj_sort)[min_zeiger].ObjArt - 6;
+			if (!_G(spieler).PersonHide[personNr]) {
+				int16 sprNr;
+				if (!_G(spz_ani)[personNr]) {
+					ts_info = _G(PersonTaf)[personNr];
+					sprNr = _G(PersonSpr)[personNr][_G(spieler_vector)[personNr].PhNr];
 				} else {
 					ts_info = _G(spz_tinfo);
-					spr_nr = _G(spz_spr_nr)[_G(spieler_vector)[p_nr].PhNr];
+					sprNr = _G(spz_spr_nr)[_G(spieler_vector)[personNr].PhNr];
 				}
 
-				x = _G(spieler_mi)[p_nr].XyzStart[0] + ts_info->_correction[spr_nr * 2] - _G(spieler).scrollx;
-				y = _G(spieler_mi)[p_nr].XyzStart[1] + ts_info->_correction[spr_nr * 2 + 1] - _G(spieler).scrolly;
-				calc_zoom(_G(spieler_mi)[p_nr].XyzStart[1], _G(spieler).ZoomXy[p_nr][0],_G(spieler).ZoomXy[p_nr][1], &_G(spieler_vector)[p_nr]);
-				_G(out)->scale_set(ts_info->image[spr_nr], x, y, _G(spieler_vector)[p_nr].Xzoom, _G(spieler_vector)[p_nr].Yzoom, _G(scr_width));
+				x = _G(spieler_mi)[personNr].XyzStart[0] + ts_info->_correction[sprNr * 2] - _G(spieler).scrollx;
+				y = _G(spieler_mi)[personNr].XyzStart[1] + ts_info->_correction[sprNr * 2 + 1] - _G(spieler).scrolly;
+				calc_zoom(_G(spieler_mi)[personNr].XyzStart[1], _G(spieler).ZoomXy[personNr][0],_G(spieler).ZoomXy[personNr][1], &_G(spieler_vector)[personNr]);
+				_G(out)->scale_set(ts_info->image[sprNr], x, y, _G(spieler_vector)[personNr].Xzoom, _G(spieler_vector)[personNr].Yzoom, _G(scr_width));
 			}
 			}
 			break;
@@ -207,14 +207,14 @@ void sprite_engine() {
 			break;
 
 		case ZOBJ_AUTO_OBJ: {
-			spr_nr = _G(mov_phasen)[nr].Phase[_G(auto_mov_vector)[nr].Phase][0] +
+			int16 sprNr = _G(mov_phasen)[nr].Phase[_G(auto_mov_vector)[nr].Phase][0] +
 			         _G(auto_mov_vector)[nr].PhNr;
-			int16 *cxy = _G(room_blk).DetKorrekt + (spr_nr << 1);
+			int16 *cxy = _G(room_blk).DetKorrekt + (sprNr << 1);
 			calc_zoom(_G(auto_mov_vector)[nr].Xypos[1],
 			          _G(mov_phasen)[nr].ZoomFak,
 			          _G(mov_phasen)[nr].ZoomFak,
 			          &_G(auto_mov_vector)[nr]);
-			_G(out)->scale_set(_G(room_blk).DetImage[spr_nr],
+			_G(out)->scale_set(_G(room_blk).DetImage[sprNr],
 			                _G(auto_mov_vector)[nr].Xypos[0] + cxy[0] - _G(spieler).scrollx,
 			                _G(auto_mov_vector)[nr].Xypos[1] + cxy[1] - _G(spieler).scrolly,
 			                _G(auto_mov_vector)[nr].Xzoom,
@@ -230,10 +230,9 @@ void sprite_engine() {
 }
 
 void calc_z_ebene() {
-	int16 i;
 	_G(z_count) = 0;
 
-	for (i = 0; i < MAX_PERSON; i++) {
+	for (int16 i = 0; i < MAX_PERSON; i++) {
 		if (_G(spieler).PersonRoomNr[P_CHEWY + i] == _G(spieler).PersonRoomNr[P_CHEWY] &&
 		        _G(spieler_mi)[P_CHEWY + i].Id != NO_MOV_OBJ) {
 			_G(z_obj_sort)[_G(z_count)].ObjArt = ZOBJ_CHEWY + i;
@@ -244,7 +243,7 @@ void calc_z_ebene() {
 		}
 	}
 
-	for (i = 0; i < MAXDETAILS; i++) {
+	for (int16 i = 0; i < MAXDETAILS; i++) {
 		if (_G(Sdi)[i].SprNr != -1) {
 			_G(z_obj_sort)[_G(z_count)].ObjArt = ZOBJ_STATIC_DETAIL;
 			_G(z_obj_sort)[_G(z_count)].ObjNr = i;
@@ -259,17 +258,17 @@ void calc_z_ebene() {
 		}
 	}
 
-	for (i = 0; i < _G(obj)->mov_obj_room[0]; i++) {
+	for (int16 i = 0; i < _G(obj)->mov_obj_room[0]; i++) {
 
 		if (_G(spieler).room_m_obj[_G(obj)->mov_obj_room[i + 1]].ZEbene < 2000) {
-			_G(z_obj_sort)[_G(z_count)].ObjArt = ZOBJ_INVENTAR;
+			_G(z_obj_sort)[_G(z_count)].ObjArt = ZOBJ_INVENTORY;
 			_G(z_obj_sort)[_G(z_count)].ObjNr = _G(obj)->mov_obj_room[i + 1];
 			_G(z_obj_sort)[_G(z_count)].ObjZ = _G(spieler).room_m_obj[_G(obj)->mov_obj_room[i + 1]].ZEbene;
 			++_G(z_count);
 		}
 	}
 
-	for (i = 0; i < MAX_PROG_ANI; i++) {
+	for (int16 i = 0; i < MAX_PROG_ANI; i++) {
 		if (_G(spr_info)[i].ZEbene < 200) {
 			_G(z_obj_sort)[_G(z_count)].ObjArt = ZOBJ_PROGANI;
 			_G(z_obj_sort)[_G(z_count)].ObjNr = i;
@@ -278,7 +277,7 @@ void calc_z_ebene() {
 		}
 	}
 
-	for (i = 0; i < _G(auto_obj); i++) {
+	for (int16 i = 0; i < _G(auto_obj); i++) {
 		if (_G(auto_mov_vector)[i].Xypos[2] < 200) {
 			_G(z_obj_sort)[_G(z_count)].ObjArt = ZOBJ_AUTO_OBJ;
 			_G(z_obj_sort)[_G(z_count)].ObjNr = i;
@@ -289,54 +288,52 @@ void calc_z_ebene() {
 }
 
 int16 mouse_on_prog_ani() {
-	int16 ani_nr = -1;
-	for (int16 i = 0; i < MAX_PROG_ANI && ani_nr == -1; i++) {
+	int16 aniNr = -1;
+	for (int16 i = 0; i < MAX_PROG_ANI && aniNr == -1; i++) {
 		if (_G(minfo).x >= _G(spr_info)[i].X && _G(minfo).x <= _G(spr_info)[i].X1 &&
 		        _G(minfo).y >= _G(spr_info)[i].Y && _G(minfo).y <= _G(spr_info)[i].Y1) {
-			ani_nr = i;
+			aniNr = i;
 		}
 	}
 
-	return ani_nr;
+	return aniNr;
 }
 
-void set_person_pos(int16 x, int16 y, int16 p_nr, int16 richtung) {
-	if (richtung != -1)
-		set_person_spr(richtung, p_nr);
-	_G(spieler_vector)[p_nr].Xypos[0] = x;
-	_G(spieler_vector)[p_nr].Xypos[1] = y;
-	_G(spieler_mi)[p_nr].XyzStart[0] = x;
-	_G(spieler_mi)[p_nr].XyzStart[1] = y;
-	_G(spieler_vector)[p_nr].Count = 0;
-	_G(spieler_vector)[p_nr].Delay = _G(spieler).DelaySpeed;
-	_G(spieler_vector)[p_nr].DelayCount = 0;
-	calc_zoom(_G(spieler_mi)[p_nr].XyzStart[1],
-	          _G(spieler).ZoomXy[p_nr][0],
-	          _G(spieler).ZoomXy[p_nr][1],
-	          &_G(spieler_vector)[p_nr]);
-	int16 tmp_nr = p_nr;
-	if (p_nr >= P_NICHELLE) {
-		++tmp_nr;
+void setPersonPos(int16 x, int16 y, int16 personNr, int16 direction) {
+	if (direction != -1)
+		setPersonSpr(direction, personNr);
+	_G(spieler_vector)[personNr].Xypos[0] = x;
+	_G(spieler_vector)[personNr].Xypos[1] = y;
+	_G(spieler_mi)[personNr].XyzStart[0] = x;
+	_G(spieler_mi)[personNr].XyzStart[1] = y;
+	_G(spieler_vector)[personNr].Count = 0;
+	_G(spieler_vector)[personNr].Delay = _G(spieler).DelaySpeed;
+	_G(spieler_vector)[personNr].DelayCount = 0;
+	calc_zoom(_G(spieler_mi)[personNr].XyzStart[1],
+	          _G(spieler).ZoomXy[personNr][0],
+	          _G(spieler).ZoomXy[personNr][1],
+	          &_G(spieler_vector)[personNr]);
+	int16 tmpNr = personNr;
+	if (personNr >= P_NICHELLE) {
+		++tmpNr;
 	}
-	_G(ssi)[tmp_nr].X = _G(spieler_vector)[p_nr].Xypos[0] - _G(spieler).scrollx + _G(spieler_mi)[p_nr].HotX;
-	_G(ssi)[tmp_nr].Y = _G(spieler_vector)[p_nr].Xypos[1] - _G(spieler).scrolly;
-	if (!_G(flags).ExitMov) {
-		if (p_nr == P_CHEWY) {
-			int16 u_index = _G(ged)->ged_idx(x + _G(spieler_mi)[p_nr].HotX, y + _G(spieler_mi)[p_nr].HotY,
-			                                 _G(room)->_gedXAnz[_G(room_blk).AkAblage],
-			                                 _G(ged_mem)[_G(room_blk).AkAblage]);
-			check_shad(u_index, 1);
-		}
+	_G(ssi)[tmpNr].X = _G(spieler_vector)[personNr].Xypos[0] - _G(spieler).scrollx + _G(spieler_mi)[personNr].HotX;
+	_G(ssi)[tmpNr].Y = _G(spieler_vector)[personNr].Xypos[1] - _G(spieler).scrolly;
+	if (!_G(flags).ExitMov && personNr == P_CHEWY) {
+		int16 u_index = _G(ged)->ged_idx(x + _G(spieler_mi)[personNr].HotX, y + _G(spieler_mi)[personNr].HotY,
+		                                 _G(room)->_gedXAnz[_G(room_blk).AkAblage],
+		                                 _G(ged_mem)[_G(room_blk).AkAblage]);
+		check_shad(u_index, 1);
 	}
 }
 
-void set_person_spr(int16 nr, int16 p_nr) {
+void setPersonSpr(int16 nr, int16 personNr) {
 	if (nr == 5 || nr == 4)
 		nr = 0;
 	else if (nr == 10 || nr == 7)
 		nr = 1;
 
-	switch (p_nr) {
+	switch (personNr) {
 	case P_CHEWY:
 		switch (nr) {
 		case P_LEFT:
@@ -353,6 +350,8 @@ void set_person_spr(int16 nr, int16 p_nr) {
 			_G(person_end_phase)[P_CHEWY] = P_RIGHT;
 			break;
 
+		default:
+			break;
 		}
 		break;
 
@@ -360,24 +359,26 @@ void set_person_spr(int16 nr, int16 p_nr) {
 	case P_NICHELLE:
 #define HO_L_STEHEN 0
 #define HO_R_STEHEN 0
-		_G(spieler_vector)[p_nr].PhNr = 0;
-		_G(spieler_vector)[p_nr].PhAnz = 8;
-		_G(person_end_phase)[p_nr] = P_LEFT;
+		_G(spieler_vector)[personNr].PhNr = 0;
+		_G(spieler_vector)[personNr].PhAnz = 8;
+		_G(person_end_phase)[personNr] = P_LEFT;
 		switch (nr) {
 		case P_LEFT:
-			_G(spieler_vector)[p_nr].Phase = HO_L_STEHEN;
-			_G(spieler_vector)[p_nr].PhNr = 0;
-			_G(spieler_vector)[p_nr].PhAnz = 8;
-			_G(person_end_phase)[p_nr] = P_LEFT;
+			_G(spieler_vector)[personNr].Phase = HO_L_STEHEN;
+			_G(spieler_vector)[personNr].PhNr = 0;
+			_G(spieler_vector)[personNr].PhAnz = 8;
+			_G(person_end_phase)[personNr] = P_LEFT;
 			break;
 
 		case P_RIGHT:
-			_G(spieler_vector)[p_nr].Phase = HO_R_STEHEN;
-			_G(spieler_vector)[p_nr].PhNr = 0;
-			_G(spieler_vector)[p_nr].PhAnz = 8;
-			_G(person_end_phase)[p_nr] = P_RIGHT;
+			_G(spieler_vector)[personNr].Phase = HO_R_STEHEN;
+			_G(spieler_vector)[personNr].PhNr = 0;
+			_G(spieler_vector)[personNr].PhAnz = 8;
+			_G(person_end_phase)[personNr] = P_RIGHT;
 			break;
 
+		default:
+			break;
 		}
 		break;
 
@@ -386,120 +387,119 @@ void set_person_spr(int16 nr, int16 p_nr) {
 	}
 }
 
-void stop_person(int16 p_nr) {
+void stopPerson(int16 personNr) {
 	_G(mov)->stop_auto_go();
-	_G(spieler_vector)[p_nr].Count = 0;
+	_G(spieler_vector)[personNr].Count = 0;
 
 }
 
-void start_detail_wait(int16 ani_nr, int16 rep, int16 mode) {
-	_G(tmp_maus_links) = _G(maus_links_click);
+void startSetailWait(int16 aniNr, int16 rep, int16 mode) {
+	const int16 oldMouseLinksClick = _G(maus_links_click);
 	_G(maus_links_click) = false;
-	_G(det)->start_detail(ani_nr, rep, mode);
-	while (_G(det)->get_ani_status(ani_nr) && !SHOULD_QUIT) {
-		set_up_screen(DO_SETUP);
+	_G(det)->startDetail(aniNr, rep, mode);
+	while (_G(det)->get_ani_status(aniNr) && !SHOULD_QUIT) {
+		setupScreen(DO_SETUP);
 	}
-	_G(maus_links_click) = _G(tmp_maus_links);
+	_G(maus_links_click) = oldMouseLinksClick;
 }
 
-void start_detail_frame(int16 ani_nr, int16 rep, int16 mode, int16 frame) {
-	_G(tmp_maus_links) = _G(maus_links_click);
+void startDetailFrame(int16 aniNr, int16 rep, int16 mode, int16 frame) {
+	const int16 oldMouseLinksClick = _G(maus_links_click);
 	_G(maus_links_click) = false;
-	_G(det)->start_detail(ani_nr, rep, mode);
-	AniDetailInfo *adi = _G(det)->getAniDetail(ani_nr);
+	_G(det)->startDetail(aniNr, rep, mode);
+	AniDetailInfo *adi = _G(det)->getAniDetail(aniNr);
 	if (mode == ANI_FRONT)
 		frame = adi->ani_count + frame;
 	else
 		frame = adi->ani_count - frame;
-	while (_G(det)->get_ani_status(ani_nr) && adi->ani_count != frame && !SHOULD_QUIT) {
-		set_up_screen(DO_SETUP);
+	while (_G(det)->get_ani_status(aniNr) && adi->ani_count != frame && !SHOULD_QUIT) {
+		setupScreen(DO_SETUP);
 	}
-	_G(maus_links_click) = _G(tmp_maus_links);
+	_G(maus_links_click) = oldMouseLinksClick;
 }
 
-void wait_detail(int16 det_nr) {
-	while (_G(det)->get_ani_status(det_nr) && !SHOULD_QUIT)
-		set_up_screen(DO_SETUP);
+void waitDetail(int16 detNr) {
+	while (_G(det)->get_ani_status(detNr) && !SHOULD_QUIT)
+		setupScreen(DO_SETUP);
 }
 
-void wait_show_screen(int16 frames) {
-	_G(tmp_maus_links) = _G(maus_links_click);
+void waitShowScreen(int16 frames) {
+	const int16 oldMouseLinksClick = _G(maus_links_click);
 	_G(maus_links_click) = false;
 	if (_G(spieler).DelaySpeed > 0)
 		frames *= _G(spieler).DelaySpeed;
 	while (--frames > 0 && !SHOULD_QUIT) {
 		if (_G(flags).AniUserAction)
 			get_user_key(NO_SETUP);
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 	}
-	_G(maus_links_click) = _G(tmp_maus_links);
+	_G(maus_links_click) = oldMouseLinksClick;
 }
 
-void start_ani_block(int16 anz, const AniBlock *ab) {
-	_G(tmp_maus_links) = _G(maus_links_click);
+void startAniBlock(int16 nr, const AniBlock *ab) {
+	const int16 oldMouseLinksClick = _G(maus_links_click);
 	_G(maus_links_click) = false;
-	for (int16 i = 0; i < anz; i++) {
+	for (int16 i = 0; i < nr; i++) {
 		if (ab[i].Mode == ANI_WAIT)
-			start_detail_wait(ab[i].Nr, ab[i].Repeat, ab[i].Dir);
+			startSetailWait(ab[i].Nr, ab[i].Repeat, ab[i].Dir);
 		else
-			_G(det)->start_detail(ab[i].Nr, ab[i].Repeat, ab[i].Dir);
+			_G(det)->startDetail(ab[i].Nr, ab[i].Repeat, ab[i].Dir);
 	}
-	_G(maus_links_click) = _G(tmp_maus_links);
+	_G(maus_links_click) = oldMouseLinksClick;
 }
 
-void start_aad_wait(int16 dia_nr, int16 str_nr) {
-	_G(tmp_maus_links) = _G(maus_links_click);
+void startAadWait(int16 diaNr, int16 strNr) {
+	const int16 oldMouseLinksClick = _G(maus_links_click);
 	_G(maus_links_click) = false;
 	_G(talk_start_ani) = -1;
 	_G(talk_hide_static) = -1;
 	setSsiPos();
-	_G(atds)->start_aad(dia_nr);
+	_G(atds)->start_aad(diaNr);
 
 	while (!SHOULD_QUIT && (
 		_G(atds)->aad_get_status() != -1 ||
 		g_engine->_sound->isSpeechActive()
 		)) {
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 	}
 
-	_G(maus_links_click) = _G(tmp_maus_links);
+	_G(maus_links_click) = oldMouseLinksClick;
 	if (_G(minfo).button)
 		_G(flags).main_maus_flag = 1;
 	_G(kbinfo).scan_code = Common::KEYCODE_INVALID;
 	stop_spz();
 }
 
-void start_aad(int16 dia_nr) {
+void start_aad(int16 diaNr) {
 	g_engine->_sound->waitForSpeechToFinish();
 	setSsiPos();
-	_G(atds)->start_aad(dia_nr);
+	_G(atds)->start_aad(diaNr);
 }
 
-bool start_ats_wait(int16 txt_nr, int16 txt_mode, int16 col, int16 mode) {
-	int16 VocNr;
-	int16 vocx;
+bool startAtsWait(int16 txtNr, int16 txtMode, int16 col, int16 mode) {
 	DisplayMode ret = DISPLAY_NONE;
 
-	_G(tmp_maus_links) = _G(maus_links_click);
+	const int16 oldMouseLinksClick = _G(maus_links_click);
 	_G(maus_links_click) = false;
 
 	if (!_G(flags).AtsText) {
 		_G(flags).AtsText = true;
-		if (txt_nr != -1) {
+		if (txtNr != -1) {
 			if (_G(menu_item) != CUR_WALK)
 				atdsStringStart(30000, 0, 0, AAD_STR_START);
 
-			ret = _G(atds)->start_ats(txt_nr, txt_mode, col, mode, &VocNr);
+			int16 VocNr;
+			ret = _G(atds)->start_ats(txtNr, txtMode, col, mode, &VocNr);
 
 			if (ret == DISPLAY_VOC || ret == DISPLAY_ALL) {
-				vocx = _G(spieler_vector)[P_CHEWY].Xypos[0] - _G(spieler).scrollx + _G(spieler_mi)[P_CHEWY].HotX;
+				int16 vocx = _G(spieler_vector)[P_CHEWY].Xypos[0] - _G(spieler).scrollx + _G(spieler_mi)[P_CHEWY].HotX;
 
 				g_engine->_sound->setSoundChannelBalance(0, _G(atds)->getStereoPos(vocx));
 				g_engine->_sound->playSpeech(VocNr,
 					_G(atds)->getAtdDisplay() == DISPLAY_VOC);
 				//warning("FIXME - unknown constant SMP_PLAYING");
 
-				set_up_screen(DO_SETUP);
+				setupScreen(DO_SETUP);
 			}
 
 			if (ret != DISPLAY_NONE) {
@@ -510,7 +510,7 @@ bool start_ats_wait(int16 txt_nr, int16 txt_mode, int16 col, int16 mode) {
 							DISPLAY_TXT : DISPLAY_NONE;
 					}
 
-					set_up_screen(DO_SETUP);
+					setupScreen(DO_SETUP);
 				}
 			}
 
@@ -525,57 +525,57 @@ bool start_ats_wait(int16 txt_nr, int16 txt_mode, int16 col, int16 mode) {
 		_G(flags).main_maus_flag = 1;
 
 	_G(kbinfo).scan_code = Common::KEYCODE_INVALID;
-	_G(maus_links_click) = _G(tmp_maus_links);
+	_G(maus_links_click) = oldMouseLinksClick;
 
 	return ret != DISPLAY_NONE;
 }
 
-void aad_wait(int16 str_nr) {
-	_G(tmp_maus_links) = _G(maus_links_click);
+void aadWait(int16 strNr) {
+	const int16 oldMouseLinksClick = _G(maus_links_click);
 	_G(maus_links_click) = false;
-	if (str_nr == -1) {
+	if (strNr == -1) {
 		while (_G(atds)->aad_get_status() != -1 && !SHOULD_QUIT) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		}
 	} else {
-		while (_G(atds)->aad_get_status() < str_nr && !SHOULD_QUIT) {
-			set_up_screen(DO_SETUP);
+		while (_G(atds)->aad_get_status() < strNr && !SHOULD_QUIT) {
+			setupScreen(DO_SETUP);
 		}
 	}
-	_G(maus_links_click) = _G(tmp_maus_links);
+	_G(maus_links_click) = oldMouseLinksClick;
 	if (_G(minfo).button)
 		_G(flags).main_maus_flag = 1;
 	_G(kbinfo).scan_code = Common::KEYCODE_INVALID;
 }
 
-void start_aad(int16 dia_nr, int16 ssi_nr) {
-	if (ssi_nr == 0) {
+void start_aad(int16 diaNr, int16 ssiNr) {
+	if (ssiNr == 0) {
 		_G(ssi)[0].X = _G(spieler_vector)[P_CHEWY].Xypos[0] - _G(spieler).scrollx + _G(spieler_mi)[P_CHEWY].HotX;
 		_G(ssi)[0].Y = _G(spieler_vector)[P_CHEWY].Xypos[1] - _G(spieler).scrolly;
 		_G(atds)->set_split_win(0, &_G(ssi)[0]);
 	}
 
-	_G(atds)->start_aad(dia_nr);
+	_G(atds)->start_aad(diaNr);
 }
 
-void start_ads_wait(int16 dia_nr) {
+void start_ads_wait(int16 diaNr) {
 	if (!_G(flags).AdsDialog) {
 		_G(menu_item) = CUR_TALK;
 		cursorChoice(_G(menu_item));
-		loadAdsDia(dia_nr);
+		loadAdsDia(diaNr);
 		while (_G(flags).AdsDialog && !SHOULD_QUIT) {
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 		}
 	}
 }
 
 void wait_auto_obj(int16 nr) {
-	_G(tmp_maus_links) = _G(maus_links_click);
+	const int16 oldMouseLinksClick = _G(maus_links_click);
 	_G(maus_links_click) = false;
 	while (_G(mov_phasen)[nr].Repeat != -1 && !SHOULD_QUIT) {
-		set_up_screen(DO_SETUP);
+		setupScreen(DO_SETUP);
 	}
-	_G(maus_links_click) = _G(tmp_maus_links);
+	_G(maus_links_click) = oldMouseLinksClick;
 }
 
 void stop_auto_obj(int16 nr) {
@@ -929,7 +929,7 @@ void calc_person_end_ani(ObjMov *om, int16 p_nr) {
 		_G(ani_stand_count)[p_nr] = 0;
 		om->PhNr = 0;
 		_G(ani_stand_flag)[p_nr] = true;
-		set_person_spr(_G(person_end_phase)[p_nr], p_nr);
+		setPersonSpr(_G(person_end_phase)[p_nr], p_nr);
 	} else if (_G(ani_stand_flag)[p_nr]) {
 		om->Delay = _G(spieler).DelaySpeed + 1;
 		if (om->PhNr < om->PhAnz - 1)
@@ -937,7 +937,7 @@ void calc_person_end_ani(ObjMov *om, int16 p_nr) {
 		else
 			_G(ani_stand_flag)[p_nr] = false;
 	} else {
-		set_person_spr(_G(person_end_phase)[p_nr], p_nr);
+		setPersonSpr(_G(person_end_phase)[p_nr], p_nr);
 		om->PhNr = 0;
 		++_G(ani_stand_count)[p_nr];
 	}
@@ -1032,7 +1032,7 @@ void zoom_mov_anpass(ObjMov *om, MovInfo *mi) {
 void start_spz_wait(int16 ani_id, int16 count, bool reverse, int16 p_nr) {
 	if (start_spz(ani_id, count, reverse, p_nr)) {
 		while (_G(spz_count) && !SHOULD_QUIT)
-			set_up_screen(DO_SETUP);
+			setupScreen(DO_SETUP);
 	}
 }
 
@@ -1099,7 +1099,7 @@ void stop_spz() {
 		_G(spz_ani)[_G(spz_p_nr)] = false;
 		_G(spieler_vector)[_G(spz_p_nr)].Count = 0;
 		_G(spieler_vector)[_G(spz_p_nr)].PhNr = 0;
-		set_person_spr(_G(person_end_phase)[_G(spz_p_nr)], _G(spz_p_nr));
+		setPersonSpr(_G(person_end_phase)[_G(spz_p_nr)], _G(spz_p_nr));
 		_G(spz_delay)[_G(spz_p_nr)] = 0;
 	}
 }
diff --git a/engines/chewy/t_event.cpp b/engines/chewy/t_event.cpp
index 558c741b675..a8a34509137 100644
--- a/engines/chewy/t_event.cpp
+++ b/engines/chewy/t_event.cpp
@@ -144,7 +144,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
 					case 73:
 						if (!_G(spieler).R9Gitter) {
 							_G(spieler).PersonHide[P_CHEWY] = true;
-							start_detail_wait(5, 1, ANI_FRONT);
+							startSetailWait(5, 1, ANI_FRONT);
 							_G(spieler).PersonHide[P_CHEWY] = false;
 						} else {
 							retValue = false;
@@ -158,7 +158,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
 							autoMove(3, P_CHEWY);
 							flic_cut(FCUT_004);
 							start_spz(CH_TALK5, -1, false, P_CHEWY);
-							start_aad_wait(108, 0);
+							startAadWait(108, 0);
 							showCur();
 						} else {
 							retValue = false;
@@ -194,7 +194,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
 						if (is_cur_inventar(TRANSLATOR_INV)) {
 							autoMove(6, P_CHEWY);
 							_G(spieler).R14Translator = true;
-							start_aad_wait(25, -1);
+							startAadWait(25, -1);
 						} else
 							retValue = false;
 						break;
@@ -778,7 +778,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
 
 					case 95:
 						if (_G(spieler).R13Band == true)
-							start_aad_wait(116, -1);
+							startAadWait(116, -1);
 						break;
 
 					case 100:
@@ -827,7 +827,7 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
 					case 11:
 						autoMove(3, P_CHEWY);
 						_G(det)->stop_detail(5);
-						_G(det)->start_detail(6, 2, ANI_FRONT);
+						_G(det)->startDetail(6, 2, ANI_FRONT);
 						Room2::jump_out_r1(9);
 						break;
 
@@ -997,11 +997,11 @@ int16 atsAction(int16 txtNr, int16 txtMode, int16 mode) {
 						break;
 
 					case 505:
-						start_aad_wait(482, -1);
+						startAadWait(482, -1);
 						break;
 
 					case 506:
-						start_aad_wait(483, -1);
+						startAadWait(483, -1);
 						break;
 
 					case 512:
@@ -1198,7 +1198,7 @@ void adsAction(int16 diaNr, int16 blkNr, int16 strEndNr) {
 		case 20:
 			if (blkNr == 0 && strEndNr == 1) {
 				_G(spieler).PersonHide[P_CHEWY] = true;
-				start_detail_wait(28, 3, ANI_FRONT);
+				startSetailWait(28, 3, ANI_FRONT);
 				_G(spieler).PersonHide[P_CHEWY] = false;
 			}
 			break;
@@ -1224,9 +1224,9 @@ void ads_ende(int16 diaNr, int16 blkNr, int16 strEndNr) {
 	case 22:
 		if (strEndNr == 1) {
 			_G(det)->del_static_ani(3);
-			start_detail_wait(5, 1, ANI_FRONT);
+			startSetailWait(5, 1, ANI_FRONT);
 			_G(det)->set_static_ani(3, -1);
-			start_aad_wait(456, -1);
+			startAadWait(456, -1);
 		}
 		break;
 
@@ -1507,7 +1507,7 @@ void atdsStringStart(int16 diaNr, int16 strNr, int16 personNr, int16 mode) {
 
 		case 1:
 			if (mode == AAD_STR_START) {
-				_G(det)->start_detail(5, 255, ANI_FRONT);
+				_G(det)->startDetail(5, 255, ANI_FRONT);
 			} else {
 				_G(det)->stop_detail(5);
 			}
@@ -1561,7 +1561,7 @@ void atdsStringStart(int16 diaNr, int16 strNr, int16 personNr, int16 mode) {
 			}
 			for (int16 i = 0; i < nbr; i++) {
 				if (mode == AAD_STR_START) {
-					_G(det)->start_detail(tmp, 255, ANI_FRONT);
+					_G(det)->startDetail(tmp, 255, ANI_FRONT);
 				} else {
 					_G(det)->stop_detail(tmp);
 				}
@@ -2102,7 +2102,7 @@ void atdsStringStart(int16 diaNr, int16 strNr, int16 personNr, int16 mode) {
 
 	case R61_VERLAG_DIA:
 		if (mode == AAD_STR_START) {
-			_G(det)->start_detail(personNr, 255, ANI_FRONT);
+			_G(det)->startDetail(personNr, 255, ANI_FRONT);
 		} else {
 			_G(det)->stop_detail(personNr);
 		}
@@ -2142,12 +2142,12 @@ void atdsStringStart(int16 diaNr, int16 strNr, int16 personNr, int16 mode) {
 	}
 
 	if (oldFormat) {
-		_G(det)->start_detail(_G(talk_start_ani), 255, ANI_FRONT);
+		_G(det)->startDetail(_G(talk_start_ani), 255, ANI_FRONT);
 		_G(det)->stop_detail(talkStopAni);
 		_G(det)->hideStaticSpr(_G(talk_hide_static));
 		_G(det)->showStaticSpr(talkShowStatic);
 	} else {
-		_G(det)->start_detail(talkAni, 255, ANI_FRONT);
+		_G(det)->startDetail(talkAni, 255, ANI_FRONT);
 		_G(det)->stop_detail(stopAni);
 	}
 }
@@ -2215,7 +2215,7 @@ void calc_inv_use_txt(int16 test_nr) {
 			invent_2_slot(K_KERNE_INV);
 		} else if (_G(spieler).AkInvent == 88) {
 			_G(spieler).flags26_10 = true;
-			start_aad_wait(_G(spieler).PersonRoomNr[P_CHEWY] + 350, -1);
+			startAadWait(_G(spieler).PersonRoomNr[P_CHEWY] + 350, -1);
 		}
 		break;
 
@@ -2255,14 +2255,14 @@ void calc_inv_use_txt(int16 test_nr) {
 		_G(spieler).flags26_10 = true;
 		_G(flags).InventMenu = false;
 		start_spz(CH_TALK6, 255, false, P_CHEWY);
-		start_aad_wait(_G(spieler).PersonRoomNr[P_CHEWY] + 350, -1);
+		startAadWait(_G(spieler).PersonRoomNr[P_CHEWY] + 350, -1);
 		_G(flags).InventMenu = true;
 		_G(atds)->set_ats_str(88, 1, INV_ATS_DATA);
 		break;
 
 	case 88:
 		_G(spieler).flags26_10 = true;
-		start_aad_wait(350, -1);
+		startAadWait(350, -1);
 		_G(atds)->set_ats_str(88, 1, INV_ATS_DATA);
 		break;
 
@@ -2354,9 +2354,9 @@ bool calc_inv_no_use(int16 test_nr, int16 mode) {
 		if (txt_nr != -1) {
 			if (!_G(flags).InventMenu) {
 				if (txt_nr >= 15000) {
-					ret = start_ats_wait(txt_nr - 15000, TXT_MARK_USE, 14, INV_USE_DEF);
+					ret = startAtsWait(txt_nr - 15000, TXT_MARK_USE, 14, INV_USE_DEF);
 				} else {
-					ret = start_ats_wait(txt_nr, TXT_MARK_USE, 14, INV_USE_DATA);
+					ret = startAtsWait(txt_nr, TXT_MARK_USE, 14, INV_USE_DATA);
 				}
 			} else {
 				Dialogs::Inventory::look(-1, INV_USE_ATS_MODE, txt_nr);
@@ -2372,7 +2372,7 @@ bool calc_inv_no_use(int16 test_nr, int16 mode) {
 					calc_inv_get_text(_G(spieler).AkInvent, test_nr);
 					Dialogs::Inventory::look(-1, INV_USE_ATS_MODE, RAND_NO_USE[r_val] + 15000);
 				} else {
-					ret = start_ats_wait(RAND_NO_USE[r_val], TXT_MARK_USE, 14, INV_USE_DEF);
+					ret = startAtsWait(RAND_NO_USE[r_val], TXT_MARK_USE, 14, INV_USE_DEF);
 				}
 			}
 		}
@@ -2753,7 +2753,7 @@ void calc_person_dia(int16 p_nr) {
 				_G(stopAutoMove)[i] = true;
 			}
 
-			start_aad_wait(_G(spieler).PersonDia[p_nr], -1);
+			startAadWait(_G(spieler).PersonDia[p_nr], -1);
 
 			for (int i = 0; i < 3; ++i) {
 				_G(spieler).PersonDiaRoom[i] = tmp[i];
@@ -2776,7 +2776,7 @@ void calc_person_dia(int16 p_nr) {
 				if (_G(spieler).PersonDia[P_NICHELLE] < 10000) {
 					_G(cur_hide_flag) = false;
 					hideCur();
-					start_aad_wait(_G(spieler).PersonDia[P_NICHELLE], -1);
+					startAadWait(_G(spieler).PersonDia[P_NICHELLE], -1);
 					_G(stopAutoMove)[P_NICHELLE] = _G(spieler).PersonDiaRoom[P_NICHELLE];
 					showCur();
 				} else {