HOPKINS: Some more renaming

11 files changed, 93 insertions, 93 deletions

diff --git a/engines/hopkins/computer.cpp b/engines/hopkins/computer.cpp
index 16cae046f6..c3ab69c3ad 100644
--- a/engines/hopkins/computer.cpp
+++ b/engines/hopkins/computer.cpp
@@ -607,9 +607,9 @@ void ComputerManager::displayGamesSubMenu() {
 	_vm->_graphicsManager.min_y = 0;
 	_vm->_graphicsManager.max_x = 320;
 	_vm->_graphicsManager.max_y = 200;
-	_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND37.WAV");
-	_vm->_soundManager.CHARGE_SAMPLE(2, "SOUND38.WAV");
-	_vm->_soundManager.CHARGE_SAMPLE(3, "SOUND39.WAV");
+	_vm->_soundManager.loadSample(1, "SOUND37.WAV");
+	_vm->_soundManager.loadSample(2, "SOUND38.WAV");
+	_vm->_soundManager.loadSample(3, "SOUND39.WAV");
 	_vm->_fileManager.constructFilename(_vm->_globals.HOPSYSTEM, "CASSE.SPR");
 	_breakoutSpr = _vm->_fileManager.loadFile(_vm->_globals.NFICHIER);
 	loadHiscore();
diff --git a/engines/hopkins/font.cpp b/engines/hopkins/font.cpp
index 8c0239db13..c5a580fab0 100644
--- a/engines/hopkins/font.cpp
+++ b/engines/hopkins/font.cpp
@@ -440,7 +440,7 @@ void FontManager::displayTextVesa(int xp, int yp, const Common::String &message,
 			break;
 		if (currChar >= 32) {
 			charIndex = currChar - 32;
-			_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager._vesaBuffer, _vm->_globals.police,
+			_vm->_graphicsManager.displayFont(_vm->_graphicsManager._vesaBuffer, _vm->_globals.police,
 				currentX, yp, currChar - 32, col);
 			currentX += _vm->_objectsManager.getWidth(_vm->_globals.police, charIndex);
 		}
@@ -458,7 +458,7 @@ void FontManager::displayText(int xp, int yp, const Common::String &message, int
 
 		if (currentChar > 31) {
 			int characterIndex = currentChar - 32;
-			_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager._vesaBuffer, _vm->_globals.police,
+			_vm->_graphicsManager.displayFont(_vm->_graphicsManager._vesaBuffer, _vm->_globals.police,
 				xp, yp, characterIndex, col);
 			xp += _vm->_objectsManager.getWidth(_vm->_globals.police, characterIndex);
 		}
@@ -490,7 +490,7 @@ void FontManager::TEXT_COMPUT(int xp, int yp, const Common::String &msg, int col
 			break;
 		if (v7 >= 32) {
 			v5 = v7 - 32;
-			_vm->_graphicsManager.Affiche_Fonte(_vm->_graphicsManager._vesaBuffer, _vm->_globals.police, v9, yp, v7 - 32, fontCol);
+			_vm->_graphicsManager.displayFont(_vm->_graphicsManager._vesaBuffer, _vm->_globals.police, v9, yp, v7 - 32, fontCol);
 			v9 += _vm->_objectsManager.getWidth(_vm->_globals.police, v5);
 			v6 = _vm->_objectsManager.getWidth(_vm->_globals.police, v5);
 			_vm->_graphicsManager.Ajoute_Segment_Vesa(v9 - v6, yp, v9, yp + 12);
diff --git a/engines/hopkins/globals.cpp b/engines/hopkins/globals.cpp
index 2650018c58..b5c2d44d4d 100644
--- a/engines/hopkins/globals.cpp
+++ b/engines/hopkins/globals.cpp
@@ -480,7 +480,7 @@ void Globals::CLEAR_VBOB() {
 }
 
 // Load Object
-void Globals::CHARGE_OBJET() {
+void Globals::loadObjects() {
 	_vm->_fileManager.constructFilename(HOPSYSTEM, "OBJET.DAT");
 	byte *data = _vm->_fileManager.loadFile(NFICHIER);
 	byte *srcP = data;
diff --git a/engines/hopkins/globals.h b/engines/hopkins/globals.h
index 7817eced0b..e00796ea23 100644
--- a/engines/hopkins/globals.h
+++ b/engines/hopkins/globals.h
@@ -481,7 +481,7 @@ public:
 	void INIT_ANIM();
 	void INIT_VBOB();
 	void CLEAR_VBOB();
-	void CHARGE_OBJET();
+	void loadObjects();
 	byte *allocMemory(int count);
 	byte *freeMemory(byte *p);
 
diff --git a/engines/hopkins/graphics.cpp b/engines/hopkins/graphics.cpp
index 638a1a2719..d4ad9cc30b 100644
--- a/engines/hopkins/graphics.cpp
+++ b/engines/hopkins/graphics.cpp
@@ -1882,7 +1882,7 @@ void GraphicsManager::Copy_Mem(const byte *srcSurface, int x1, int y1, unsigned
 }
 
 // Display Font
-void GraphicsManager::Affiche_Fonte(byte *surface, const byte *spriteData, int xp, int yp,
+void GraphicsManager::displayFont(byte *surface, const byte *spriteData, int xp, int yp,
 									int characterIndex, int colour) {
 	const byte *spriteDataP;
 	int i;
diff --git a/engines/hopkins/graphics.h b/engines/hopkins/graphics.h
index cadcd1dce8..2a49604c75 100644
--- a/engines/hopkins/graphics.h
+++ b/engines/hopkins/graphics.h
@@ -168,7 +168,7 @@ public:
 	void AFFICHE_SPEED(const byte *spriteData, int xp, int yp, int spriteIndex);
 	void SCOPY(const byte *surface, int x1, int y1, int width, int height, byte *destSurface, int destX, int destY);
 	void Copy_Mem(const byte *srcSurface, int x1, int y1, unsigned int width, int height, byte *destSurface, int destX, int destY);
-	void Affiche_Fonte(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour);
+	void displayFont(byte *surface, const byte *spriteData, int xp, int yp, int characterIndex, int colour);
 	void INI_ECRAN(const Common::String &file);
 	void INI_ECRAN2(const Common::String &file);
 	void OPTI_INI(const Common::String &file, int mode);
diff --git a/engines/hopkins/hopkins.cpp b/engines/hopkins/hopkins.cpp
index 1d5691200e..ea715001ac 100644
--- a/engines/hopkins/hopkins.cpp
+++ b/engines/hopkins/hopkins.cpp
@@ -131,7 +131,7 @@ Common::Error HopkinsEngine::run() {
 bool HopkinsEngine::runWin95Demo() {
 	_globals.SVGA = 1;
 
-	_globals.CHARGE_OBJET();
+	_globals.loadObjects();
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 
@@ -188,7 +188,7 @@ bool HopkinsEngine::runWin95Demo() {
 	_globals.PASSWORD = true;
 
 	if (getLanguage() != Common::PL_POL)
-		if (!ADULT())
+		if (!displayAdultDisclaimer())
 			return Common::kNoError;
 
 	for (;;) {
@@ -199,7 +199,7 @@ bool HopkinsEngine::runWin95Demo() {
 			_globals.SORTIE = _menuManager.MENU();
 			if (_globals.SORTIE == -1) {
 				_globals.PERSO = _globals.freeMemory(_globals.PERSO);
-				REST_SYSTEM();
+				restoreSystem();
 				return false;
 			}
 		}
@@ -306,7 +306,7 @@ bool HopkinsEngine::runWin95Demo() {
 			if (_globals.SAUVEGARDE->data[svField225])
 			  _objectsManager.PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10);
 			else
-			  BOOM();
+			  bombExplosion();
 			break;
 
 		case 10:
@@ -341,9 +341,9 @@ bool HopkinsEngine::runWin95Demo() {
 					_eventsManager.VBL();
 				while (_eventsManager.getMouseButton() != 1);
 				_graphicsManager.FADE_OUTW();
-				REST_SYSTEM();
+				restoreSystem();
 			}
-			BOOM();
+			bombExplosion();
 			break;
 
 		case 13:
@@ -457,7 +457,7 @@ bool HopkinsEngine::runWin95Demo() {
 }
 
 bool HopkinsEngine::runLinuxDemo() {
-	_globals.CHARGE_OBJET();
+	_globals.loadObjects();
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 
@@ -505,7 +505,7 @@ bool HopkinsEngine::runLinuxDemo() {
 				if (!g_system->getEventManager()->shouldQuit())
 					PUBQUIT();
 				_globals.PERSO = _globals.freeMemory(_globals.PERSO);
-				REST_SYSTEM();
+				restoreSystem();
 			}
 		}
 
@@ -632,7 +632,7 @@ bool HopkinsEngine::runLinuxDemo() {
 			_globals.Max_Perso_Y = 440;
 
 			if (!_globals.SAUVEGARDE->data[svField225])
-				BOOM();
+				bombExplosion();
 
 			_objectsManager.PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10);
 			break;
@@ -662,7 +662,7 @@ bool HopkinsEngine::runLinuxDemo() {
 				_globals.NOSPRECRAN = true;
 				_objectsManager.PERSONAGE2("IM12", "IM12", "ANIM12", "IM12", 1);
 			} else {
-				BOOM();
+				bombExplosion();
 			}
 			break;
 
@@ -723,7 +723,7 @@ bool HopkinsEngine::runLinuxDemo() {
 			break;
 
 		case 35:
-			ENDEMO();
+			displayEndDemo();
 			break;
 
 		case 111:
@@ -829,7 +829,7 @@ bool HopkinsEngine::runLinuxDemo() {
 bool HopkinsEngine::runOS2Full() {
 	_globals.SVGA = 2;
 
-	_globals.CHARGE_OBJET();
+	_globals.loadObjects();
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 	warning("_graphicsManager.loadImage(\"VERSW\");");
@@ -963,7 +963,7 @@ bool HopkinsEngine::runOS2Full() {
 			if (_globals.SAUVEGARDE->data[225])
 				_objectsManager.PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10);
 			else
-				BOOM();
+				bombExplosion();
 			break;
 
 		case 10:
@@ -991,7 +991,7 @@ bool HopkinsEngine::runOS2Full() {
 				_globals.NOSPRECRAN = true;
 				_objectsManager.PERSONAGE2("IM12", "IM12", "ANIM12", "IM12", 1);
 			} else
-				BOOM();
+				bombExplosion();
 			break;
 
 		case 13:
@@ -1236,7 +1236,7 @@ bool HopkinsEngine::runOS2Full() {
 			if (_globals.FORETSPR == g_PTRNUL) {
 				_fileManager.constructFilename(_globals.HOPSYSTEM, "HOPDEG.SPR");
 				_globals.FORETSPR = _objectsManager.loadSprite(_globals.NFICHIER);
-				_soundManager.CHARGE_SAMPLE(1, "SOUND41.WAV");
+				_soundManager.loadSample(1, "SOUND41.WAV");
 			}
 			_objectsManager.PERSONAGE2(im, im, "BANDIT", im, 13);
 			_globals.NOSPRECRAN = false;
@@ -1249,7 +1249,7 @@ bool HopkinsEngine::runOS2Full() {
 			}
 
 		case 50:
-			AVION();
+			displayPlane();
 			_globals.SORTIE = 51;
 			break;
 
@@ -1593,7 +1593,7 @@ bool HopkinsEngine::runOS2Full() {
 			break;
 
 		case 100:
-			JOUE_FIN();
+			playEnding();
 			break;
 
 		case 111:
@@ -1693,7 +1693,7 @@ bool HopkinsEngine::runOS2Full() {
 			_globals.iRegul = 1;
 			// _soundManager.WSOUND_OFF();
 			_soundManager.WSOUND(23);
-			_globals.SORTIE = PWBASE();
+			_globals.SORTIE = handleBaseMap();
 			// _soundManager.WSOUND_OFF();
 			_fileManager.constructFilename(_globals.HOPSYSTEM, "PERSO.SPR");
 			_globals.PERSO = _fileManager.loadFile(_globals.NFICHIER);
@@ -1706,7 +1706,7 @@ bool HopkinsEngine::runOS2Full() {
 	warning("sub_33C70(v18);");
 	warning("sub_39460(v19);");
 	warning("sub_44134();");
-	REST_SYSTEM();
+	restoreSystem();
 	return true;
 }
 
@@ -1714,7 +1714,7 @@ bool HopkinsEngine::runBeOSFull() {
 	_globals.SVGA = 2;
 
 	warning("TODO: Init_Interrupt()");
-	_globals.CHARGE_OBJET();
+	_globals.loadObjects();
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 	_eventsManager.delay(500);
@@ -1751,7 +1751,7 @@ bool HopkinsEngine::runBeOSFull() {
 			_globals.SORTIE = _menuManager.MENU();
 			if (_globals.SORTIE == -1) {
 				_globals.PERSO = _globals.freeMemory(_globals.PERSO);
-				REST_SYSTEM();
+				restoreSystem();
 			}
 		}
 
@@ -1850,7 +1850,7 @@ bool HopkinsEngine::runBeOSFull() {
 			_globals.Max_Propre_Gen = 10;
 			_globals.Max_Perso_Y = 440;
 			if (!_globals.SAUVEGARDE->data[svField225])
-				BOOM();
+				bombExplosion();
 			_objectsManager.PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10);
 			break;
 
@@ -1879,7 +1879,7 @@ bool HopkinsEngine::runBeOSFull() {
 				_globals.NOSPRECRAN = true;
 				_objectsManager.PERSONAGE2("IM12", "IM12", "ANIM12", "IM12", 1);
 			} else {
-				BOOM();
+				bombExplosion();
 			}
 			break;
 
@@ -2124,7 +2124,7 @@ bool HopkinsEngine::runBeOSFull() {
 			if (_globals.FORETSPR == g_PTRNUL) {
 				_fileManager.constructFilename(_globals.HOPSYSTEM, "HOPDEG.SPR");
 				_globals.FORETSPR = _objectsManager.loadSprite(_globals.NFICHIER);
-				_soundManager.CHARGE_SAMPLE(1, "SOUND41.WAV");
+				_soundManager.loadSample(1, "SOUND41.WAV");
 			}
 
 			_objectsManager.PERSONAGE2(im, im, "BANDIT", im, 13);
@@ -2138,7 +2138,7 @@ bool HopkinsEngine::runBeOSFull() {
 			}
 
 		case 50:
-			AVION();
+			displayPlane();
 			_globals.SORTIE = 51;
 			break;
 
@@ -2482,7 +2482,7 @@ bool HopkinsEngine::runBeOSFull() {
 			break;
 
 		case 100:
-			JOUE_FIN();
+			playEnding();
 			break;
 
 		case 111:
@@ -2582,7 +2582,7 @@ bool HopkinsEngine::runBeOSFull() {
 			_globals.iRegul = 1;
 			_soundManager.WSOUND_OFF();
 			_soundManager.WSOUND(23);
-			_globals.SORTIE = PWBASE();
+			_globals.SORTIE = handleBaseMap();
 			_soundManager.WSOUND_OFF();
 			_fileManager.constructFilename(_globals.HOPSYSTEM, "PERSO.SPR");
 			_globals.PERSO = _fileManager.loadFile(_globals.NFICHIER);
@@ -2599,7 +2599,7 @@ bool HopkinsEngine::runWin95full() {
 
 	warning("TODO: Init_Interrupt_()");
 
-	_globals.CHARGE_OBJET();
+	_globals.loadObjects();
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 	_globals.HELICO = 0;
@@ -2637,7 +2637,7 @@ bool HopkinsEngine::runWin95full() {
 			_globals.SORTIE = _menuManager.MENU();
 			if (_globals.SORTIE == -1) {
 				_globals.PERSO = _globals.freeMemory(_globals.PERSO);
-				REST_SYSTEM();
+				restoreSystem();
 				return false;
 			}
 		}
@@ -2743,7 +2743,7 @@ bool HopkinsEngine::runWin95full() {
 			if (_globals.SAUVEGARDE->data[svField225])
 				_objectsManager.PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10);
 			else
-				BOOM();
+				bombExplosion();
 			break;
 
 		case 10:
@@ -2771,7 +2771,7 @@ bool HopkinsEngine::runWin95full() {
 				_globals.NOSPRECRAN = true;
 				_objectsManager.PERSONAGE2("IM12", "IM12", "ANIM12", "IM12", 1);
 			} else {
-				BOOM();
+				bombExplosion();
 			}
 			break;
 
@@ -3010,7 +3010,7 @@ bool HopkinsEngine::runWin95full() {
 				if (_globals.FORETSPR == g_PTRNUL) {
 					_fileManager.constructFilename(_globals.HOPSYSTEM, "HOPDEG.SPR");
 					_globals.FORETSPR = _objectsManager.loadSprite(_globals.NFICHIER);
-					_soundManager.CHARGE_SAMPLE(1, "SOUND41.WAV");
+					_soundManager.loadSample(1, "SOUND41.WAV");
 				}
 				_objectsManager.PERSONAGE2(im, im, "BANDIT", im, 13);
 				_globals.NOSPRECRAN = false;
@@ -3022,7 +3022,7 @@ bool HopkinsEngine::runWin95full() {
 				break;
 				}
 		case 50:
-			AVION();
+			displayPlane();
 			_globals.SORTIE = 51;
 			break;
 
@@ -3362,7 +3362,7 @@ bool HopkinsEngine::runWin95full() {
 			break;
 
 		case 100:
-			JOUE_FIN();
+			playEnding();
 			break;
 
 		case 111:
@@ -3474,7 +3474,7 @@ bool HopkinsEngine::runWin95full() {
 bool HopkinsEngine::runLinuxFull() {
 	_soundManager.WSOUND(16);
 
-	_globals.CHARGE_OBJET();
+	_globals.loadObjects();
 	_objectsManager.changeObject(14);
 	_objectsManager.addObject(14);
 
@@ -3514,7 +3514,7 @@ bool HopkinsEngine::runLinuxFull() {
 			_globals.SORTIE = _menuManager.MENU();
 			if (_globals.SORTIE == -1) {
 				_globals.PERSO = _globals.freeMemory(_globals.PERSO);
-				REST_SYSTEM();
+				restoreSystem();
 				return true;
 			}
 		}
@@ -3620,7 +3620,7 @@ bool HopkinsEngine::runLinuxFull() {
 			_globals.Max_Propre_Gen = 10;
 			_globals.Max_Perso_Y = 440;
 			if (!_globals.SAUVEGARDE->data[svField225])
-				BOOM();
+				bombExplosion();
 			_objectsManager.PERSONAGE2("IM09", "IM09", "ANIM09", "IM09", 10);
 			break;
 
@@ -3649,7 +3649,7 @@ bool HopkinsEngine::runLinuxFull() {
 				_globals.NOSPRECRAN = true;
 				_objectsManager.PERSONAGE2("IM12", "IM12", "ANIM12", "IM12", 1);
 			} else {
-				BOOM();
+				bombExplosion();
 			}
 			break;
 
@@ -3888,7 +3888,7 @@ bool HopkinsEngine::runLinuxFull() {
 			if (_globals.FORETSPR == g_PTRNUL) {
 				_fileManager.constructFilename(_globals.HOPSYSTEM, "HOPDEG.SPR");
 				_globals.FORETSPR = _objectsManager.loadSprite(_globals.NFICHIER);
-				_soundManager.CHARGE_SAMPLE(1, "SOUND41.WAV");
+				_soundManager.loadSample(1, "SOUND41.WAV");
 			}
 			_objectsManager.PERSONAGE2(im, im, "BANDIT", im, 13);
 			_globals.NOSPRECRAN = false;
@@ -3901,7 +3901,7 @@ bool HopkinsEngine::runLinuxFull() {
 			}
 
 		case 50:
-			AVION();
+			displayPlane();
 			_globals.SORTIE = 51;
 			break;
 
@@ -4241,7 +4241,7 @@ bool HopkinsEngine::runLinuxFull() {
 			break;
 
 		case 100:
-			JOUE_FIN();
+			playEnding();
 			break;
 
 		case 111:
@@ -4345,7 +4345,7 @@ bool HopkinsEngine::runLinuxFull() {
 			_globals.PERSO = _globals.freeMemory(_globals.PERSO);
 			_globals.iRegul = 1;
 			_soundManager.WSOUND(23);
-			_globals.SORTIE = PWBASE();
+			_globals.SORTIE = handleBaseMap();
 			_soundManager.WSOUND_OFF();
 			_fileManager.constructFilename(_globals.HOPSYSTEM, "PERSO.SPR");
 			_globals.PERSO = _fileManager.loadFile(_globals.NFICHIER);
@@ -4715,7 +4715,7 @@ void HopkinsEngine::NO_DISPO(int sortie) {
 	_globals.SORTIE = sortie;
 }
 
-void HopkinsEngine::ENDEMO() {
+void HopkinsEngine::displayEndDemo() {
 	_soundManager.WSOUND(28);
 	if (_globals.FR == 1)
 		_graphicsManager.loadImage("endfr");
@@ -4728,7 +4728,7 @@ void HopkinsEngine::ENDEMO() {
 	_globals.SORTIE = 0;
 }
 
-void HopkinsEngine::BOOM() {
+void HopkinsEngine::bombExplosion() {
 	_graphicsManager._lineNbr = SCREEN_WIDTH;
 	_graphicsManager.SCANLINE(SCREEN_WIDTH);
 	_graphicsManager.lockScreen();
@@ -4778,7 +4778,7 @@ void HopkinsEngine::BOOM() {
 	_globals.SORTIE = 151;
 }
 
-void HopkinsEngine::REST_SYSTEM() {
+void HopkinsEngine::restoreSystem() {
 	quitGame();
 	_eventsManager.refreshEvents();
 }
@@ -4960,7 +4960,7 @@ void HopkinsEngine::BASED() {
 	_globals.iRegul = 0;
 }
 
-void HopkinsEngine::JOUE_FIN() {
+void HopkinsEngine::playEnding() {
 	_globals.PERSO = _globals.freeMemory(_globals.PERSO);
 	_dialogsManager._removeInventFl = true;
 	_globals._disableInventFl = true;
@@ -4973,7 +4973,7 @@ void HopkinsEngine::JOUE_FIN() {
 	_globals.SORTIE = 0;
 	_globals.AFFLI = false;
 	_globals.AFFIVBL = false;
-	_soundManager.CHARGE_SAMPLE(1, "SOUND90.WAV");
+	_soundManager.loadSample(1, "SOUND90.WAV");
 	_graphicsManager.loadImage("IM100");
 	_animationManager.loadAnim("ANIM100");
 	_graphicsManager.VISU_ALL();
@@ -5073,7 +5073,7 @@ void HopkinsEngine::JOUE_FIN() {
 		_animationManager.playAnim("FF1a.anm", 9, 18, 18);
 		_animationManager.playAnim("FF1a.anm", 9, 18, 9);
 		_animationManager.playAnim("FF2a.anm", 24, 24, 100);
-		Credits();
+		displayCredits();
 		_globals.iRegul = 0;
 		_globals.SORTIE = 300;
 		_dialogsManager._removeInventFl = false;
@@ -5116,7 +5116,7 @@ void HopkinsEngine::JOUE_FIN() {
 	_globals.iRegul = 0;
 }
 
-void HopkinsEngine::AVION() {
+void HopkinsEngine::displayPlane() {
 	_soundManager.WSOUND(28);
 	_globals.iRegul = 1;
 	_globals.nbrligne = SCREEN_WIDTH;
@@ -5196,7 +5196,7 @@ void HopkinsEngine::AVION() {
 	_animationManager._clearAnimationFl = false;
 }
 
-int HopkinsEngine::PWBASE() {
+int HopkinsEngine::handleBaseMap() {
 	_globals._disableInventFl = true;
 	_graphicsManager.loadImage("PBASE");
 	_graphicsManager.SETCOLOR3(252, 100, 100, 100);
@@ -5283,7 +5283,7 @@ int HopkinsEngine::WBASE() {
 	return 300;
 }
 
-void HopkinsEngine::Charge_Credits() {
+void HopkinsEngine::loadCredits() {
 	_globals.Credit_y = 440;
 	_globals.Credit_l = 10;
 	_globals.Credit_h = 40;
@@ -5345,7 +5345,7 @@ void HopkinsEngine::Charge_Credits() {
 	_globals.freeMemory(bufPtr);
 }
 
-void HopkinsEngine::CREDIT_AFFICHE(int startPosY, byte *buffer, char colour) {
+void HopkinsEngine::displayCredits(int startPosY, byte *buffer, char colour) {
 	byte *bufPtr = buffer;
 	int strWidth = 0;
 	byte curChar;
@@ -5380,14 +5380,14 @@ void HopkinsEngine::CREDIT_AFFICHE(int startPosY, byte *buffer, char colour) {
 		if (!curChar)
 			break;
 		if (curChar > 31) {
-			_graphicsManager.Affiche_Fonte(_graphicsManager._vesaBuffer, _globals.police, startPosX, startPosY, curChar - 32, colour);
+			_graphicsManager.displayFont(_graphicsManager._vesaBuffer, _globals.police, startPosX, startPosY, curChar - 32, colour);
 			startPosX += _objectsManager.getWidth(_globals.police, curChar - 32);
 		}
 	}
 }
 
-void HopkinsEngine::Credits() {
-	Charge_Credits();
+void HopkinsEngine::displayCredits() {
+	loadCredits();
 	_globals.Credit_y = 436;
 	_graphicsManager.loadImage("GENERIC");
 	_graphicsManager.FADE_INW();
@@ -5420,7 +5420,7 @@ void HopkinsEngine::Credits() {
 						break;
 					}
 					if (_globals.Credit[i]._lineSize != -1)
-						CREDIT_AFFICHE(nextY, _globals.Credit[i]._line, col);
+						displayCredits(nextY, _globals.Credit[i]._line, col);
 				}
 			}
 		}
@@ -5749,7 +5749,7 @@ void HopkinsEngine::syncSoundSettings() {
 	_soundManager.syncSoundSettings();
 }
 
-bool HopkinsEngine::ADULT() {
+bool HopkinsEngine::displayAdultDisclaimer() {
 	int xp, yp;
 	int buttonIndex;
 
diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h
index a895054286..7a58777241 100644
--- a/engines/hopkins/hopkins.h
+++ b/engines/hopkins/hopkins.h
@@ -83,20 +83,20 @@ private:
 	void INIT_SYSTEM();
 
 	void PASS();
-	void REST_SYSTEM();
+	void restoreSystem();
 	void PUBQUIT();
-	void ENDEMO();
-	void BOOM();
+	void displayEndDemo();
+	void bombExplosion();
 	void INCENDIE();
 	void BASE();
 	void BASED();
-	void JOUE_FIN();
-	void AVION();
+	void playEnding();
+	void displayPlane();
 
 	/**
 	 * Displays the map screen in the underground base.
 	 */
-	int  PWBASE();
+	int  handleBaseMap();
 
 	/**
 	 * Runs the Wolf3D-like in the underground base.
@@ -106,9 +106,9 @@ private:
 	void BTOCEAN();
 	void OCEAN_HOME();
 	void OCEAN(int16 a1, Common::String a2, Common::String a3, int16 a4, int16 exit1, int16 exit2, int16 exit3, int16 exit4, int16 a9);
-	void Charge_Credits();
-	void CREDIT_AFFICHE(int startPosY, byte *buffer, char colour);
-	void Credits();
+	void loadCredits();
+	void displayCredits(int startPosY, byte *buffer, char colour);
+	void displayCredits();
 	void NO_DISPO(int sortie);
 
 	bool runWin95Demo();
@@ -121,7 +121,7 @@ private:
 	/**
 	 * Show warning screen about the game being adults only.
 	 */
-	bool ADULT();
+	bool displayAdultDisclaimer();
 protected:
 	// Engine APIs
 	virtual Common::Error run();
diff --git a/engines/hopkins/script.cpp b/engines/hopkins/script.cpp
index f6cf8567db..3269ed5c93 100644
--- a/engines/hopkins/script.cpp
+++ b/engines/hopkins/script.cpp
@@ -787,9 +787,9 @@ LABEL_1141:
 			_vm->_graphicsManager.NOFADE = true;
 		}
 		if (v76 == 38) {
-			_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND44.WAV");
-			_vm->_soundManager.CHARGE_SAMPLE(2, "SOUND42.WAV");
-			_vm->_soundManager.CHARGE_SAMPLE(3, "SOUND41.WAV");
+			_vm->_soundManager.loadSample(1, "SOUND44.WAV");
+			_vm->_soundManager.loadSample(2, "SOUND42.WAV");
+			_vm->_soundManager.loadSample(3, "SOUND41.WAV");
 			_vm->_soundManager.SPECIAL_SOUND = 17;
 			_vm->_animationManager.playSequence("grenade.SEQ", 1, 32, 100);
 			_vm->_soundManager.SPECIAL_SOUND = 0;
@@ -838,8 +838,8 @@ LABEL_1141:
 			} while (_vm->_globals.chemin != (int16 *)g_PTRNUL);
 			_vm->_objectsManager.removeSprite(0);
 			_vm->_globals.NOT_VERIF = 1;
-			_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND44.WAV");
-			_vm->_soundManager.CHARGE_SAMPLE(2, "SOUND45.WAV");
+			_vm->_soundManager.loadSample(1, "SOUND44.WAV");
+			_vm->_soundManager.loadSample(2, "SOUND45.WAV");
 			_vm->_objectsManager.OPTI_BOBON(9, 10, -1, 0, 0, 0, 0);
 			int v15 = 0;
 			do {
@@ -917,7 +917,7 @@ LABEL_1141:
 			_vm->_objectsManager.setBobAnimation(7);
 			_vm->_objectsManager.SET_BOBPOSI(7, 0);
 			int v18 = 0;
-			_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND40.WAV");
+			_vm->_soundManager.loadSample(1, "SOUND40.WAV");
 			do {
 				if (_vm->shouldQuit())
 					return -1; // Exiting game
@@ -1142,7 +1142,7 @@ LABEL_1141:
 				_vm->_objectsManager.SET_BOBPOSI(2, 0);
 				_vm->_objectsManager.setBobAnimation(1);
 				_vm->_objectsManager.setBobAnimation(2);
-				_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND40.WAV");
+				_vm->_soundManager.loadSample(1, "SOUND40.WAV");
 				int v25 = 0;
 				do {
 					if (_vm->shouldQuit())
@@ -1184,7 +1184,7 @@ LABEL_1141:
 				_vm->_objectsManager.SET_BOBPOSI(3, 0);
 				_vm->_objectsManager.setBobAnimation(1);
 				_vm->_objectsManager.setBobAnimation(3);
-				_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND40.WAV");
+				_vm->_soundManager.loadSample(1, "SOUND40.WAV");
 				int v26 = 0;
 				do {
 					if (_vm->shouldQuit())
@@ -1305,7 +1305,7 @@ LABEL_1141:
 			} while (_vm->_globals.chemin != (int16 *)g_PTRNUL);
 			_vm->_objectsManager.removeSprite(0);
 			_vm->_objectsManager.setSpriteIndex(0, 60);
-			_vm->_soundManager.CHARGE_SAMPLE(1, "SOUND63.WAV");
+			_vm->_soundManager.loadSample(1, "SOUND63.WAV");
 			if (_vm->_globals.SAUVEGARDE->data[svField253] > 2) {
 				_vm->_objectsManager.setBobAnimation(4);
 				int v33 = 0;
diff --git a/engines/hopkins/sound.cpp b/engines/hopkins/sound.cpp
index 22c4f04f3b..2ed7482084 100644
--- a/engines/hopkins/sound.cpp
+++ b/engines/hopkins/sound.cpp
@@ -126,11 +126,11 @@ void SoundManager::VERIF_SOUND() {
 void SoundManager::LOAD_ANM_SOUND() {
 	switch (SPECIAL_SOUND) {
 	case 2:
-		CHARGE_SAMPLE(5, "mitra1.wav");
-		CHARGE_SAMPLE(1, "tir2.wav");
-		CHARGE_SAMPLE(2, "sound6.wav");
-		CHARGE_SAMPLE(3, "sound5.WAV");
-		CHARGE_SAMPLE(4, "sound4.WAV");
+		loadSample(5, "mitra1.wav");
+		loadSample(1, "tir2.wav");
+		loadSample(2, "sound6.wav");
+		loadSample(3, "sound5.WAV");
+		loadSample(4, "sound4.WAV");
 		break;
 	case 5:
 		LOAD_WAV("CRIE.WAV", 1);
@@ -670,7 +670,7 @@ void SoundManager::MODSetMusicVolume(int volume) {
 	// No implementatoin needed
 }
 
-void SoundManager::CHARGE_SAMPLE(int wavIndex, const Common::String &file) {
+void SoundManager::loadSample(int wavIndex, const Common::String &file) {
 	_vm->_fileManager.constructFilename(_vm->_globals.HOPSOUND, file);
 	LOAD_SAMPLE2_SDL(wavIndex, _vm->_globals.NFICHIER, 0);
 	SOUND[wavIndex]._active = true;
diff --git a/engines/hopkins/sound.h b/engines/hopkins/sound.h
index fe2e52172a..9e2c8cd8e7 100644
--- a/engines/hopkins/sound.h
+++ b/engines/hopkins/sound.h
@@ -160,7 +160,7 @@ public:
 	void MODSetSampleVolume();
 	void MODSetVoiceVolume();
 	void MODSetMusicVolume(int volume);
-	void CHARGE_SAMPLE(int wavIndex, const Common::String &file);
+	void loadSample(int wavIndex, const Common::String &file);
 	void PLAY_SAMPLE(int wavIndex, int voiceMode);
 	void PLAY_SAMPLE2(int idx);
 	void PLAY_WAV(int wavIndex);