Consisteny fixes:

 - Renamed classes *_v1 -> *_LoK
 - Renamed files *_v1.* -> *_lok.*
 - Renamed WSAMovieV1 -> WSAMovie_v1
 - Renamed WSAMovieV2 -> WSAMovie_v2

svn-id: r32042

35 files changed, 1013 insertions, 1013 deletions

diff --git a/engines/kyra/animator_v1.cpp b/engines/kyra/animator_lok.cpp
index 619c6c3d70..1baa78b203 100644
--- a/engines/kyra/animator_v1.cpp
+++ b/engines/kyra/animator_lok.cpp
@@ -25,15 +25,15 @@
 
 #include "common/endian.h"
 
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/screen.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/sprites.h"
 
 #include "common/system.h"
 
 namespace Kyra {
-Animator_v1::Animator_v1(KyraEngine_v1 *vm, OSystem *system) {
+Animator_LoK::Animator_LoK(KyraEngine_LoK *vm, OSystem *system) {
 	_vm = vm;
 	_screen = vm->screen();
 	_initOk = false;
@@ -48,14 +48,14 @@ Animator_v1::Animator_v1(KyraEngine_v1 *vm, OSystem *system) {
 	memset(_actorBkgBackUp[1], 0, _screen->getRectSize(8, 69));
 }
 
-Animator_v1::~Animator_v1() {
+Animator_LoK::~Animator_LoK() {
 	close();
 	delete[] _actorBkgBackUp[0];
 	delete[] _actorBkgBackUp[1];
 }
 
-void Animator_v1::init(int actors_, int items_, int sprites_) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::init(%d, %d, %d)", actors_, items_, sprites_);
+void Animator_LoK::init(int actors_, int items_, int sprites_) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::init(%d, %d, %d)", actors_, items_, sprites_);
 	_screenObjects = new AnimObject[actors_ + items_ + sprites_];
 	assert(_screenObjects);
 	memset(_screenObjects, 0, sizeof(AnimObject) * (actors_ + items_ + sprites_));
@@ -67,8 +67,8 @@ void Animator_v1::init(int actors_, int items_, int sprites_) {
 	_initOk = true;
 }
 
-void Animator_v1::close() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::close()");
+void Animator_LoK::close() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::close()");
 	if (_initOk) {
 		_initOk = false;
 		delete[] _screenObjects;
@@ -76,7 +76,7 @@ void Animator_v1::close() {
 	}
 }
 
-void Animator_v1::initAnimStateList() {
+void Animator_LoK::initAnimStateList() {
 	AnimObject *animStates = _screenObjects;
 	animStates[0].index = 0;
 	animStates[0].active = 1;
@@ -118,8 +118,8 @@ void Animator_v1::initAnimStateList() {
 	}
 }
 
-void Animator_v1::preserveAllBackgrounds() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::preserveAllBackgrounds()");
+void Animator_LoK::preserveAllBackgrounds() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::preserveAllBackgrounds()");
 	uint8 curPage = _screen->_curPage;
 	_screen->_curPage = 2;
 
@@ -134,8 +134,8 @@ void Animator_v1::preserveAllBackgrounds() {
 	_screen->_curPage = curPage;
 }
 
-void Animator_v1::flagAllObjectsForBkgdChange() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::flagAllObjectsForBkgdChange()");
+void Animator_LoK::flagAllObjectsForBkgdChange() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::flagAllObjectsForBkgdChange()");
 	AnimObject *curObject = _objectQueue;
 	while (curObject) {
 		curObject->bkgdChangeFlag = 1;
@@ -143,8 +143,8 @@ void Animator_v1::flagAllObjectsForBkgdChange() {
 	}
 }
 
-void Animator_v1::flagAllObjectsForRefresh() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::flagAllObjectsForRefresh()");
+void Animator_LoK::flagAllObjectsForRefresh() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::flagAllObjectsForRefresh()");
 	AnimObject *curObject = _objectQueue;
 	while (curObject) {
 		curObject->refreshFlag = 1;
@@ -152,8 +152,8 @@ void Animator_v1::flagAllObjectsForRefresh() {
 	}
 }
 
-void Animator_v1::restoreAllObjectBackgrounds() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::restoreAllObjectBackground()");
+void Animator_LoK::restoreAllObjectBackgrounds() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::restoreAllObjectBackground()");
 	AnimObject *curObject = _objectQueue;
 	_screen->_curPage = 2;
 
@@ -169,8 +169,8 @@ void Animator_v1::restoreAllObjectBackgrounds() {
 	_screen->_curPage = 0;
 }
 
-void Animator_v1::preserveAnyChangedBackgrounds() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::preserveAnyChangedBackgrounds()");
+void Animator_LoK::preserveAnyChangedBackgrounds() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::preserveAnyChangedBackgrounds()");
 	AnimObject *curObject = _objectQueue;
 	_screen->_curPage = 2;
 
@@ -185,8 +185,8 @@ void Animator_v1::preserveAnyChangedBackgrounds() {
 	_screen->_curPage = 0;
 }
 
-void Animator_v1::preserveOrRestoreBackground(AnimObject *obj, bool restore) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::preserveOrRestoreBackground(%p, %d)", (const void *)obj, restore);
+void Animator_LoK::preserveOrRestoreBackground(AnimObject *obj, bool restore) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::preserveOrRestoreBackground(%p, %d)", (const void *)obj, restore);
 	int x = 0, y = 0, width = obj->width, height = obj->height;
 
 	if (restore) {
@@ -217,8 +217,8 @@ void Animator_v1::preserveOrRestoreBackground(AnimObject *obj, bool restore) {
 		_screen->copyRegionToBuffer(_screen->_curPage, x << 3, y, width << 3, height, obj->background);
 }
 
-void Animator_v1::prepDrawAllObjects() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::prepDrawAllObjects()");
+void Animator_LoK::prepDrawAllObjects() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::prepDrawAllObjects()");
 	AnimObject *curObject = _objectQueue;
 	int drawPage = 2;
 	int flagUnk1 = 0, flagUnk2 = 0, flagUnk3 = 0;
@@ -363,8 +363,8 @@ void Animator_v1::prepDrawAllObjects() {
 	}
 }
 
-void Animator_v1::copyChangedObjectsForward(int refreshFlag) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::copyChangedObjectsForward(%d)", refreshFlag);
+void Animator_LoK::copyChangedObjectsForward(int refreshFlag) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::copyChangedObjectsForward(%d)", refreshFlag);
 
 	for (AnimObject *curObject = _objectQueue; curObject; curObject = curObject->nextAnimObject) {
 		if (curObject->active) {
@@ -404,16 +404,16 @@ void Animator_v1::copyChangedObjectsForward(int refreshFlag) {
 	}
 }
 
-void Animator_v1::updateAllObjectShapes() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::updateAllObjectShapes()");
+void Animator_LoK::updateAllObjectShapes() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::updateAllObjectShapes()");
 	restoreAllObjectBackgrounds();
 	preserveAnyChangedBackgrounds();
 	prepDrawAllObjects();
 	copyChangedObjectsForward(0);
 }
 
-void Animator_v1::animRemoveGameItem(int index) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::animRemoveGameItem(%d)", index);
+void Animator_LoK::animRemoveGameItem(int index) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::animRemoveGameItem(%d)", index);
 	restoreAllObjectBackgrounds();
 
 	AnimObject *animObj = &_items[index];
@@ -427,8 +427,8 @@ void Animator_v1::animRemoveGameItem(int index) {
 	objectRemoveQueue(_objectQueue, animObj);
 }
 
-void Animator_v1::animAddGameItem(int index, uint16 sceneId) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::animRemoveGameItem(%d, %d)", index, sceneId);
+void Animator_LoK::animAddGameItem(int index, uint16 sceneId) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::animRemoveGameItem(%d, %d)", index, sceneId);
 	restoreAllObjectBackgrounds();
 	assert(sceneId < _vm->_roomTableSize);
 	Room *currentRoom = &_vm->_roomTable[sceneId];
@@ -453,8 +453,8 @@ void Animator_v1::animAddGameItem(int index, uint16 sceneId) {
 	animObj->bkgdChangeFlag = 1;
 }
 
-void Animator_v1::animAddNPC(int character) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::animAddNPC(%d)", character);
+void Animator_LoK::animAddNPC(int character) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::animAddNPC(%d)", character);
 	restoreAllObjectBackgrounds();
 	AnimObject *animObj = &_actors[character];
 	const Character *ch = &_vm->_characterList[character];
@@ -478,8 +478,8 @@ void Animator_v1::animAddNPC(int character) {
 	animObj->bkgdChangeFlag = 1;
 }
 
-Animator_v1::AnimObject *Animator_v1::objectRemoveQueue(AnimObject *queue, AnimObject *rem) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::objectRemoveQueue(%p, %p)", (const void *)queue, (const void *)rem);
+Animator_LoK::AnimObject *Animator_LoK::objectRemoveQueue(AnimObject *queue, AnimObject *rem) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::objectRemoveQueue(%p, %p)", (const void *)queue, (const void *)rem);
 	AnimObject *cur = queue;
 	AnimObject *prev = queue;
 
@@ -512,14 +512,14 @@ Animator_v1::AnimObject *Animator_v1::objectRemoveQueue(AnimObject *queue, AnimO
 	return queue;
 }
 
-Animator_v1::AnimObject *Animator_v1::objectAddHead(AnimObject *queue, AnimObject *head) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::objectAddHead(%p, %p)", (const void *)queue, (const void *)head);
+Animator_LoK::AnimObject *Animator_LoK::objectAddHead(AnimObject *queue, AnimObject *head) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::objectAddHead(%p, %p)", (const void *)queue, (const void *)head);
 	head->nextAnimObject = queue;
 	return head;
 }
 
-Animator_v1::AnimObject *Animator_v1::objectQueue(AnimObject *queue, AnimObject *add) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::objectQueue(%p, %p)", (const void *)queue, (const void *)add);
+Animator_LoK::AnimObject *Animator_LoK::objectQueue(AnimObject *queue, AnimObject *add) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::objectQueue(%p, %p)", (const void *)queue, (const void *)add);
 	if (add->drawY <= queue->drawY || !queue) {
 		add->nextAnimObject = queue;
 		return add;
@@ -544,16 +544,16 @@ Animator_v1::AnimObject *Animator_v1::objectQueue(AnimObject *queue, AnimObject
 	return queue;
 }
 
-void Animator_v1::addObjectToQueue(AnimObject *object) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::addObjectToQueue(%p)", (const void *)object);
+void Animator_LoK::addObjectToQueue(AnimObject *object) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::addObjectToQueue(%p)", (const void *)object);
 	if (!_objectQueue)
 		_objectQueue = objectAddHead(0, object);
 	else
 		_objectQueue = objectQueue(_objectQueue, object);
 }
 
-void Animator_v1::refreshObject(AnimObject *object) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::refreshObject(%p)", (const void *)object);
+void Animator_LoK::refreshObject(AnimObject *object) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::refreshObject(%p)", (const void *)object);
 	_objectQueue = objectRemoveQueue(_objectQueue, object);
 	if (_objectQueue)
 		_objectQueue = objectQueue(_objectQueue, object);
@@ -561,8 +561,8 @@ void Animator_v1::refreshObject(AnimObject *object) {
 		_objectQueue = objectAddHead(0, object);
 }
 
-void Animator_v1::makeBrandonFaceMouse() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::makeBrandonFaceMouse()");
+void Animator_LoK::makeBrandonFaceMouse() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::makeBrandonFaceMouse()");
 	Common::Point mouse = _vm->getMousePos();
 	if (mouse.x >= _vm->_currentCharacter->x1)
 		_vm->_currentCharacter->facing = 3;
@@ -572,22 +572,22 @@ void Animator_v1::makeBrandonFaceMouse() {
 	updateAllObjectShapes();
 }
 
-int16 Animator_v1::fetchAnimWidth(const uint8 *shape, int16 mult) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::fetchAnimWidth(%p, %d)", (const void *)shape, mult);
+int16 Animator_LoK::fetchAnimWidth(const uint8 *shape, int16 mult) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::fetchAnimWidth(%p, %d)", (const void *)shape, mult);
 	if (_vm->gameFlags().useAltShapeHeader)
 		shape += 2;
 	return (((int16)READ_LE_UINT16((shape+3))) * mult) >> 8;
 }
 
-int16 Animator_v1::fetchAnimHeight(const uint8 *shape, int16 mult) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::fetchAnimHeight(%p, %d)", (const void *)shape, mult);
+int16 Animator_LoK::fetchAnimHeight(const uint8 *shape, int16 mult) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::fetchAnimHeight(%p, %d)", (const void *)shape, mult);
 	if (_vm->gameFlags().useAltShapeHeader)
 		shape += 2;
 	return (int16)(((int8)*(shape+2)) * mult) >> 8;
 }
 
-void Animator_v1::setBrandonAnimSeqSize(int width, int height) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::setBrandonAnimSeqSize(%d, %d)", width, height);
+void Animator_LoK::setBrandonAnimSeqSize(int width, int height) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::setBrandonAnimSeqSize(%d, %d)", width, height);
 	restoreAllObjectBackgrounds();
 	_brandonAnimSeqSizeWidth = _actors[0].width;
 	_brandonAnimSeqSizeHeight = _actors[0].height;
@@ -596,16 +596,16 @@ void Animator_v1::setBrandonAnimSeqSize(int width, int height) {
 	preserveAllBackgrounds();
 }
 
-void Animator_v1::resetBrandonAnimSeqSize() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::resetBrandonAnimSeqSize()");
+void Animator_LoK::resetBrandonAnimSeqSize() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::resetBrandonAnimSeqSize()");
 	restoreAllObjectBackgrounds();
 	_actors[0].width = _brandonAnimSeqSizeWidth;
 	_actors[0].height = _brandonAnimSeqSizeHeight;
 	preserveAllBackgrounds();
 }
 
-void Animator_v1::animRefreshNPC(int character) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::animRefreshNPC(%d)", character);
+void Animator_LoK::animRefreshNPC(int character) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::animRefreshNPC(%d)", character);
 	AnimObject *animObj = &_actors[character];
 	Character *ch = &_vm->characterList()[character];
 
@@ -663,8 +663,8 @@ void Animator_v1::animRefreshNPC(int character) {
 	refreshObject(animObj);
 }
 
-void Animator_v1::setCharacterDefaultFrame(int character) {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::setCharacterDefaultFrame()");
+void Animator_LoK::setCharacterDefaultFrame(int character) {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::setCharacterDefaultFrame()");
 	static uint16 initFrameTable[] = {
 		7, 41, 77, 0, 0
 	};
@@ -676,8 +676,8 @@ void Animator_v1::setCharacterDefaultFrame(int character) {
 	// edit->unk6 = 1;
 }
 
-void Animator_v1::setCharactersHeight() {
-	debugC(9, kDebugLevelAnimator, "Animator_v1::setCharactersHeight()");
+void Animator_LoK::setCharactersHeight() {
+	debugC(9, kDebugLevelAnimator, "Animator_LoK::setCharactersHeight()");
 	static int8 initHeightTable[] = {
 		48, 40, 48, 47, 56,
 		44, 42, 47, 38, 35,
diff --git a/engines/kyra/animator_v1.h b/engines/kyra/animator_lok.h
index 3ae0b23da4..c7d564e0c6 100644
--- a/engines/kyra/animator_v1.h
+++ b/engines/kyra/animator_lok.h
@@ -27,10 +27,10 @@
 #define KYRA_ANIMATOR_V1_H
 
 namespace Kyra {
-class KyraEngine_v1;
+class KyraEngine_LoK;
 class Screen;
 
-class Animator_v1 {
+class Animator_LoK {
 public:
 	struct AnimObject {
 		uint8 index;
@@ -53,8 +53,8 @@ public:
 		AnimObject *nextAnimObject;
 	};
 
-	Animator_v1(KyraEngine_v1 *vm, OSystem *system);
-	virtual ~Animator_v1();
+	Animator_LoK(KyraEngine_LoK *vm, OSystem *system);
+	virtual ~Animator_LoK();
 
 	operator bool() const { return _initOk; }
 
@@ -101,7 +101,7 @@ public:
 	int _brandonScaleY;
 
 protected:
-	KyraEngine_v1 *_vm;
+	KyraEngine_LoK *_vm;
 	Screen *_screen;
 	OSystem *_system;
 	bool _initOk;
diff --git a/engines/kyra/debugger.cpp b/engines/kyra/debugger.cpp
index f90cf5a37b..932f5aa7dd 100644
--- a/engines/kyra/debugger.cpp
+++ b/engines/kyra/debugger.cpp
@@ -27,7 +27,7 @@
 #include "common/config-manager.h"
 #include "common/system.h"
 #include "kyra/debugger.h"
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/kyra_v2.h"
 #include "kyra/kyra_hof.h"
 #include "kyra/screen.h"
@@ -190,22 +190,22 @@ bool Debugger::cmd_setTimerCountdown(int argc, const char **argv) {
 
 #pragma mark -
 
-Debugger_v1::Debugger_v1(KyraEngine_v1 *vm)
+Debugger_LoK::Debugger_LoK(KyraEngine_LoK *vm)
 	: Debugger(vm), _vm(vm) {
-	DCmd_Register("rooms",				WRAP_METHOD(Debugger_v1, cmd_listRooms));
-	DCmd_Register("give",				WRAP_METHOD(Debugger_v1, cmd_giveItem));
-	DCmd_Register("birthstones",		WRAP_METHOD(Debugger_v1, cmd_listBirthstones));
+	DCmd_Register("rooms",				WRAP_METHOD(Debugger_LoK, cmd_listRooms));
+	DCmd_Register("give",				WRAP_METHOD(Debugger_LoK, cmd_giveItem));
+	DCmd_Register("birthstones",		WRAP_METHOD(Debugger_LoK, cmd_listBirthstones));
 }
 
-void Debugger_v1::preEnter() {
+void Debugger_LoK::preEnter() {
 	//_vm->midi.pause(1);
 }
 
-void Debugger_v1::postEnter() {
+void Debugger_LoK::postEnter() {
 	//_vm->midi.pause(0);
 }
 
-bool Debugger_v1::cmd_enterRoom(int argc, const char **argv) {
+bool Debugger_LoK::cmd_enterRoom(int argc, const char **argv) {
 	uint direction = 0;
 	if (argc > 1) {
 		int room = atoi(argv[1]);
@@ -244,7 +244,7 @@ bool Debugger_v1::cmd_enterRoom(int argc, const char **argv) {
 	return true;
 }
 
-bool Debugger_v1::cmd_listRooms(int argc, const char **argv) {
+bool Debugger_LoK::cmd_listRooms(int argc, const char **argv) {
 	for (int i = 0; i < _vm->_roomTableSize; i++) {
 		DebugPrintf("%-3i: %-10s", i, _vm->_roomFilenameTable[_vm->_roomTable[i].nameIndex]);
 		if (!(i % 8))
@@ -255,7 +255,7 @@ bool Debugger_v1::cmd_listRooms(int argc, const char **argv) {
 	return true;
 }
 
-bool Debugger_v1::cmd_giveItem(int argc, const char **argv) {
+bool Debugger_LoK::cmd_giveItem(int argc, const char **argv) {
 	if (argc == 2) {
 		int item = atoi(argv[1]);
 
@@ -274,7 +274,7 @@ bool Debugger_v1::cmd_giveItem(int argc, const char **argv) {
 	return true;
 }
 
-bool Debugger_v1::cmd_listBirthstones(int argc, const char **argv) {
+bool Debugger_LoK::cmd_listBirthstones(int argc, const char **argv) {
 	DebugPrintf("Needed Birthstone gems:\n");
 	for (int i = 0; i < ARRAYSIZE(_vm->_birthstoneGemTable); ++i)
 		DebugPrintf("%-2d '%s'\n", _vm->_birthstoneGemTable[i], _vm->_itemList[_vm->_birthstoneGemTable[i]]);
diff --git a/engines/kyra/debugger.h b/engines/kyra/debugger.h
index ab5657bbde..7b1d870daa 100644
--- a/engines/kyra/debugger.h
+++ b/engines/kyra/debugger.h
@@ -31,7 +31,7 @@
 namespace Kyra {
 
 class KyraEngine;
-class KyraEngine_v1;
+class KyraEngine_LoK;
 class KyraEngine_v2;
 class KyraEngine_HoF;
 
@@ -54,13 +54,13 @@ protected:
 	bool cmd_setTimerCountdown(int argc, const char **argv);
 };
 
-class Debugger_v1 : public Debugger {
+class Debugger_LoK : public Debugger {
 public:
-	Debugger_v1(KyraEngine_v1 *vm);
-	virtual ~Debugger_v1() {}  // we need this for __SYMBIAN32__ archaic gcc/UIQ
+	Debugger_LoK(KyraEngine_LoK *vm);
+	virtual ~Debugger_LoK() {}  // we need this for __SYMBIAN32__ archaic gcc/UIQ
 
 protected:
-	KyraEngine_v1 *_vm;
+	KyraEngine_LoK *_vm;
 
 	virtual void preEnter();
 	virtual void postEnter();
diff --git a/engines/kyra/detection.cpp b/engines/kyra/detection.cpp
index b921314e68..2b272fd7d7 100644
--- a/engines/kyra/detection.cpp
+++ b/engines/kyra/detection.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "kyra/kyra.h"
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/kyra_hof.h"
 #include "kyra/kyra_mr.h"
 
@@ -506,7 +506,7 @@ bool KyraMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common
 
 	switch (flags.gameID) {
 	case Kyra::GI_KYRA1:
-		*engine = new Kyra::KyraEngine_v1(syst, flags);
+		*engine = new Kyra::KyraEngine_LoK(syst, flags);
 		break;
 	case Kyra::GI_KYRA2:
 		*engine = new Kyra::KyraEngine_HoF(syst, flags);
diff --git a/engines/kyra/gui_hof.cpp b/engines/kyra/gui_hof.cpp
index 74701f109e..12e4065ec6 100644
--- a/engines/kyra/gui_hof.cpp
+++ b/engines/kyra/gui_hof.cpp
@@ -271,7 +271,7 @@ void KyraEngine_HoF::redrawInventory(int page) {
 }
 
 void KyraEngine_HoF::scrollInventoryWheel() {
-	WSAMovieV2 movie(this, _screen);
+	WSAMovie_v2 movie(this, _screen);
 	movie.open("INVWHEEL.WSA", 0, 0);
 	int frames = movie.opened() ? movie.frames() : 6;
 	memcpy(_screenBuffer, _screen->getCPagePtr(2), 64000);
diff --git a/engines/kyra/gui_v1.cpp b/engines/kyra/gui_lok.cpp
index fab5db0a01..844574c5be 100644
--- a/engines/kyra/gui_v1.cpp
+++ b/engines/kyra/gui_lok.cpp
@@ -23,13 +23,13 @@
  *
  */
 
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/screen.h"
 #include "kyra/script.h"
 #include "kyra/text.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/sound.h"
-#include "kyra/gui_v1.h"
+#include "kyra/gui_lok.h"
 #include "kyra/timer.h"
 
 #include "common/config-manager.h"
@@ -39,13 +39,13 @@
 
 namespace Kyra {
 
-void KyraEngine_v1::initMainButtonList() {
+void KyraEngine_LoK::initMainButtonList() {
 	_buttonList = &_buttonData[0];
 	for (int i = 0; _buttonDataListPtr[i]; ++i)
 		_buttonList = _gui->addButtonToList(_buttonList, _buttonDataListPtr[i]);
 }
 
-int KyraEngine_v1::buttonInventoryCallback(Button *caller) {
+int KyraEngine_LoK::buttonInventoryCallback(Button *caller) {
 	int itemOffset = caller->index - 2;
 	uint8 inventoryItem = _currentCharacter->inventoryItems[itemOffset];
 	if (_itemInHand == -1) {
@@ -89,7 +89,7 @@ int KyraEngine_v1::buttonInventoryCallback(Button *caller) {
 	return 0;
 }
 
-int KyraEngine_v1::buttonAmuletCallback(Button *caller) {
+int KyraEngine_LoK::buttonAmuletCallback(Button *caller) {
 	if (!(_deathHandler & 8))
 		return 1;
 	int jewel = caller->index - 0x14;
@@ -187,18 +187,18 @@ int KyraEngine_v1::buttonAmuletCallback(Button *caller) {
 
 #pragma mark -
 
-GUI_v1::GUI_v1(KyraEngine_v1 *vm, Screen_v1 *screen) : GUI(vm), _vm(vm), _screen(screen) {
+GUI_LoK::GUI_LoK(KyraEngine_LoK *vm, Screen_LoK *screen) : GUI(vm), _vm(vm), _screen(screen) {
 	_menu = 0;
 	initStaticResource();
-	_scrollUpFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::scrollUp);
-	_scrollDownFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::scrollDown);
+	_scrollUpFunctor = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::scrollUp);
+	_scrollDownFunctor = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::scrollDown);
 }
 
-GUI_v1::~GUI_v1() {
+GUI_LoK::~GUI_LoK() {
 	delete[] _menu;
 }
 
-int GUI_v1::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel) {
+int GUI_LoK::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel) {
 	while (list) {
 		if (list->flags & 8) {
 			list = list->nextButton;
@@ -272,7 +272,7 @@ int GUI_v1::processButtonList(Button *list, uint16 inputFlag, int8 mouseWheel) {
 	return 0;
 }
 
-void GUI_v1::processButton(Button *button) {
+void GUI_LoK::processButton(Button *button) {
 	if (!button)
 		return;
 
@@ -316,7 +316,7 @@ void GUI_v1::processButton(Button *button) {
 		(*callback.get())(button);
 }
 
-void GUI_v1::setGUILabels() {
+void GUI_LoK::setGUILabels() {
 	int offset = 0;
 	int offsetOptions = 0;
 	int offsetMainMenu = 0;
@@ -406,7 +406,7 @@ void GUI_v1::setGUILabels() {
 	_onCDString = _vm->_guiStrings[21];
 }
 
-int GUI_v1::buttonMenuCallback(Button *caller) {
+int GUI_LoK::buttonMenuCallback(Button *caller) {
 	PauseTimer pause(*_vm->_timer);
 
 	_displayMenu = true;
@@ -475,7 +475,7 @@ int GUI_v1::buttonMenuCallback(Button *caller) {
 	return 0;
 }
 
-void GUI_v1::getInput() {
+void GUI_LoK::getInput() {
 	Common::Event event;
 	static uint32 lastScreenUpdate = 0;
 	uint32 now = _vm->_system->getMillis();
@@ -518,15 +518,15 @@ void GUI_v1::getInput() {
 	_vm->_system->delayMillis(3);
 }
 
-int GUI_v1::resumeGame(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::resumeGame()");
+int GUI_LoK::resumeGame(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::resumeGame()");
 	updateMenuButton(button);
 	_displayMenu = false;
 
 	return 0;
 }
 
-void GUI_v1::setupSavegames(Menu &menu, int num) {
+void GUI_LoK::setupSavegames(Menu &menu, int num) {
 	Common::InSaveFile *in;
 	static char savenames[5][31];
 	uint8 startSlot;
@@ -556,8 +556,8 @@ void GUI_v1::setupSavegames(Menu &menu, int num) {
 	}
 }
 
-int GUI_v1::saveGameMenu(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::saveGameMenu()");
+int GUI_LoK::saveGameMenu(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::saveGameMenu()");
 	updateSaveList();
 
 	updateMenuButton(button);
@@ -569,7 +569,7 @@ int GUI_v1::saveGameMenu(Button *button) {
 	_menu[2].menuNameString = _vm->_guiStrings[8]; // Select a position to save to:
 	_specialSavegameString = _vm->_guiStrings[9]; // [ EMPTY SLOT ]
 	for (int i = 0; i < 5; i++)
-		_menu[2].item[i].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::saveGame);
+		_menu[2].item[i].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::saveGame);
 
 	_savegameOffset = 0;
 	setupSavegames(_menu[2], 5);
@@ -599,8 +599,8 @@ int GUI_v1::saveGameMenu(Button *button) {
 	return 0;
 }
 
-int GUI_v1::loadGameMenu(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::loadGameMenu()");
+int GUI_LoK::loadGameMenu(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::loadGameMenu()");
 	updateSaveList();
 
 	if (_vm->_menuDirectlyToLoad) {
@@ -616,7 +616,7 @@ int GUI_v1::loadGameMenu(Button *button) {
 	_specialSavegameString = _vm->_newGameString[0]; //[ START A NEW GAME ]
 	_menu[2].menuNameString = _vm->_guiStrings[7]; // Which game would you like to reload?
 	for (int i = 0; i < 5; i++)
-		_menu[2].item[i].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::loadGame);
+		_menu[2].item[i].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::loadGame);
 
 	_savegameOffset = 0;
 	setupSavegames(_menu[2], 5);
@@ -652,7 +652,7 @@ int GUI_v1::loadGameMenu(Button *button) {
 	return 0;
 }
 
-void GUI_v1::redrawTextfield() {
+void GUI_LoK::redrawTextfield() {
 	_screen->fillRect(38, 91, 287, 102, 250);
 	_text->printText(_savegameName, 38, 92, 253, 0, 0);
 
@@ -664,7 +664,7 @@ void GUI_v1::redrawTextfield() {
 	_screen->updateScreen();
 }
 
-void GUI_v1::updateSavegameString() {
+void GUI_LoK::updateSavegameString() {
 	int length;
 
 	if (_keyPressed.keycode) {
@@ -691,8 +691,8 @@ void GUI_v1::updateSavegameString() {
 	_keyPressed.reset();
 }
 
-int GUI_v1::saveGame(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::saveGame()");
+int GUI_LoK::saveGame(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::saveGame()");
 	updateMenuButton(button);
 	_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
 
@@ -740,16 +740,16 @@ int GUI_v1::saveGame(Button *button) {
 	return 0;
 }
 
-int GUI_v1::savegameConfirm(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::savegameConfirm()");
+int GUI_LoK::savegameConfirm(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::savegameConfirm()");
 	updateMenuButton(button);
 	_displaySubMenu = false;
 
 	return 0;
 }
 
-int GUI_v1::loadGame(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::loadGame()");
+int GUI_LoK::loadGame(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::loadGame()");
 	updateMenuButton(button);
 	_displaySubMenu = false;
 	_vm->_gameToLoad = _menu[2].item[button->index-0xC].saveSlot;
@@ -757,8 +757,8 @@ int GUI_v1::loadGame(Button *button) {
 	return 0;
 }
 
-int GUI_v1::cancelSubMenu(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::cancelSubMenu()");
+int GUI_LoK::cancelSubMenu(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::cancelSubMenu()");
 	updateMenuButton(button);
 	_displaySubMenu = false;
 	_cancelSubMenu = true;
@@ -766,8 +766,8 @@ int GUI_v1::cancelSubMenu(Button *button) {
 	return 0;
 }
 
-int GUI_v1::quitPlaying(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::quitPlaying()");
+int GUI_LoK::quitPlaying(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::quitPlaying()");
 	updateMenuButton(button);
 
 	if (quitConfirm(_vm->_guiStrings[14])) { // Are you sure you want to quit playing?
@@ -780,8 +780,8 @@ int GUI_v1::quitPlaying(Button *button) {
 	return 0;
 }
 
-bool GUI_v1::quitConfirm(const char *str) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::quitConfirm()");
+bool GUI_LoK::quitConfirm(const char *str) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::quitConfirm()");
 
 	_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -806,8 +806,8 @@ bool GUI_v1::quitConfirm(const char *str) {
 	return !_cancelSubMenu;
 }
 
-int GUI_v1::quitConfirmYes(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::quitConfirmYes()");
+int GUI_LoK::quitConfirmYes(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::quitConfirmYes()");
 	updateMenuButton(button);
 	_displaySubMenu = false;
 	_cancelSubMenu = false;
@@ -815,8 +815,8 @@ int GUI_v1::quitConfirmYes(Button *button) {
 	return 0;
 }
 
-int GUI_v1::quitConfirmNo(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::quitConfirmNo()");
+int GUI_LoK::quitConfirmNo(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::quitConfirmNo()");
 	updateMenuButton(button);
 	_displaySubMenu = false;
 	_cancelSubMenu = true;
@@ -824,8 +824,8 @@ int GUI_v1::quitConfirmNo(Button *button) {
 	return 0;
 }
 
-int GUI_v1::gameControlsMenu(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::gameControlsMenu()");
+int GUI_LoK::gameControlsMenu(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::gameControlsMenu()");
 
 	_vm->readSettings();
 
@@ -842,14 +842,14 @@ int GUI_v1::gameControlsMenu(Button *button) {
 		}
 
 		_menu[5].item[3].labelString = _voiceTextString; //"Voice / Text "
-		_menu[5].item[3].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::controlsChangeVoice);
+		_menu[5].item[3].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeVoice);
 
 	} else {
 		//_menu[5].height = 136;
 		//_menu[5].item[5].y = 110;
 		_menu[5].item[4].enabled = 0;
 		_menu[5].item[3].labelString = _textSpeedString; // "Text speed "
-		_menu[5].item[3].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::controlsChangeText);
+		_menu[5].item[3].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeText);
 	}
 
 	setupControls(_menu[5]);
@@ -876,8 +876,8 @@ int GUI_v1::gameControlsMenu(Button *button) {
 	return 0;
 }
 
-void GUI_v1::setupControls(Menu &menu) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::setupControls()");
+void GUI_LoK::setupControls(Menu &menu) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::setupControls()");
 
 	switch (_vm->_configMusic) {
 		case 0:
@@ -973,8 +973,8 @@ void GUI_v1::setupControls(Menu &menu) {
 	initMenu(menu);
 }
 
-int GUI_v1::controlsChangeMusic(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::controlsChangeMusic()");
+int GUI_LoK::controlsChangeMusic(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeMusic()");
 	updateMenuButton(button);
 
 	_vm->_configMusic = ++_vm->_configMusic % ((_vm->gameFlags().platform == Common::kPlatformFMTowns || _vm->gameFlags().platform == Common::kPlatformPC98) ? 3 : 2);
@@ -982,8 +982,8 @@ int GUI_v1::controlsChangeMusic(Button *button) {
 	return 0;
 }
 
-int GUI_v1::controlsChangeSounds(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::controlsChangeSounds()");
+int GUI_LoK::controlsChangeSounds(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeSounds()");
 	updateMenuButton(button);
 
 	_vm->_configSounds = !_vm->_configSounds;
@@ -991,8 +991,8 @@ int GUI_v1::controlsChangeSounds(Button *button) {
 	return 0;
 }
 
-int GUI_v1::controlsChangeWalk(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::controlsChangeWalk()");
+int GUI_LoK::controlsChangeWalk(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeWalk()");
 	updateMenuButton(button);
 
 	_vm->_configWalkspeed = ++_vm->_configWalkspeed % 5;
@@ -1001,8 +1001,8 @@ int GUI_v1::controlsChangeWalk(Button *button) {
 	return 0;
 }
 
-int GUI_v1::controlsChangeText(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::controlsChangeText()");
+int GUI_LoK::controlsChangeText(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeText()");
 	updateMenuButton(button);
 
 	_vm->_configTextspeed = ++_vm->_configTextspeed % 4;
@@ -1010,8 +1010,8 @@ int GUI_v1::controlsChangeText(Button *button) {
 	return 0;
 }
 
-int GUI_v1::controlsChangeVoice(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::controlsChangeVoice()");
+int GUI_LoK::controlsChangeVoice(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::controlsChangeVoice()");
 	updateMenuButton(button);
 
 	_vm->_configVoice = ++_vm->_configVoice % 3;
@@ -1019,14 +1019,14 @@ int GUI_v1::controlsChangeVoice(Button *button) {
 	return 0;
 }
 
-int GUI_v1::controlsApply(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::controlsApply()");
+int GUI_LoK::controlsApply(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::controlsApply()");
 	_vm->writeSettings();
 	return cancelSubMenu(button);
 }
 
-int GUI_v1::scrollUp(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::scrollUp()");
+int GUI_LoK::scrollUp(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::scrollUp()");
 	updateMenuButton(button);
 
 	if (_savegameOffset > 0) {
@@ -1037,8 +1037,8 @@ int GUI_v1::scrollUp(Button *button) {
 	return 0;
 }
 
-int GUI_v1::scrollDown(Button *button) {
-	debugC(9, kDebugLevelGUI, "GUI_v1::scrollDown()");
+int GUI_LoK::scrollDown(Button *button) {
+	debugC(9, kDebugLevelGUI, "GUI_LoK::scrollDown()");
 	updateMenuButton(button);
 
 	_savegameOffset++;
@@ -1050,7 +1050,7 @@ int GUI_v1::scrollDown(Button *button) {
 	return 0;
 }
 
-void GUI_v1::fadePalette() {
+void GUI_LoK::fadePalette() {
 	if (_vm->gameFlags().platform == Common::kPlatformAmiga)
 		return;
 
@@ -1070,7 +1070,7 @@ void GUI_v1::fadePalette() {
 	_screen->fadePalette(_screen->_currentPalette, 2);
 }
 
-void GUI_v1::restorePalette() {
+void GUI_LoK::restorePalette() {
 	if (_vm->gameFlags().platform == Common::kPlatformAmiga)
 		return;
 
@@ -1080,8 +1080,8 @@ void GUI_v1::restorePalette() {
 
 #pragma mark -
 
-void KyraEngine_v1::drawAmulet() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::drawAmulet()");
+void KyraEngine_LoK::drawAmulet() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::drawAmulet()");
 	static const int16 amuletTable1[] = {0x167, 0x162, 0x15D, 0x158, 0x153, 0x150, 0x155, 0x15A, 0x15F, 0x164, 0x145, -1};
 	static const int16 amuletTable3[] = {0x167, 0x162, 0x15D, 0x158, 0x153, 0x14F, 0x154, 0x159, 0x15E, 0x163, 0x144, -1};
 	static const int16 amuletTable2[] = {0x167, 0x162, 0x15D, 0x158, 0x153, 0x152, 0x157, 0x15C, 0x161, 0x166, 0x147, -1};
diff --git a/engines/kyra/gui_v1.h b/engines/kyra/gui_lok.h
index 65ccad6eeb..78284e5ec1 100644
--- a/engines/kyra/gui_v1.h
+++ b/engines/kyra/gui_lok.h
@@ -85,13 +85,13 @@ namespace Kyra {
 	item.labelY = t; \
 	item.unk1F = v
 
-class KyraEngine_v1;
+class KyraEngine_LoK;
 
-class GUI_v1 : public GUI {
-	friend class KyraEngine_v1;
+class GUI_LoK : public GUI {
+	friend class KyraEngine_LoK;
 public:
-	GUI_v1(KyraEngine_v1 *vm, Screen_v1 *screen);
-	~GUI_v1();
+	GUI_LoK(KyraEngine_LoK *vm, Screen_LoK *screen);
+	~GUI_LoK();
 
 	void processButton(Button *button);
 	int processButtonList(Button *buttonList, uint16 inputFlags, int8 mouseWheel);
@@ -148,8 +148,8 @@ private:
 	const char *getMenuItemTitle(const MenuItem &menuItem) { return menuItem.itemString; }
 	const char *getMenuItemLabel(const MenuItem &menuItem) { return menuItem.labelString; }
 
-	KyraEngine_v1 *_vm;
-	Screen_v1 *_screen;
+	KyraEngine_LoK *_vm;
+	Screen_LoK *_screen;
 
 	bool _menuRestoreScreen;
 	uint8 _toplevelMenu;
diff --git a/engines/kyra/items_v1.cpp b/engines/kyra/items_lok.cpp
index ae3ba2821a..c468a6e197 100644
--- a/engines/kyra/items_v1.cpp
+++ b/engines/kyra/items_lok.cpp
@@ -23,14 +23,14 @@
  *
  */
 
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/seqplayer.h"
 #include "kyra/screen.h"
 #include "kyra/resource.h"
 #include "kyra/sound.h"
 #include "kyra/sprites.h"
 #include "kyra/wsamovie.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/text.h"
 
 #include "common/system.h"
@@ -38,7 +38,7 @@
 
 namespace Kyra {
 
-int KyraEngine_v1::findDuplicateItemShape(int shape) {
+int KyraEngine_LoK::findDuplicateItemShape(int shape) {
 	static uint8 dupTable[] = {
 		0x48, 0x46, 0x49, 0x47, 0x4a, 0x46, 0x4b, 0x47,
 		0x4c, 0x46, 0x4d, 0x47, 0x5b, 0x5a, 0x5c, 0x5a,
@@ -55,8 +55,8 @@ int KyraEngine_v1::findDuplicateItemShape(int shape) {
 	return -1;
 }
 
-void KyraEngine_v1::addToNoDropRects(int x, int y, int w, int h) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::addToNoDropRects(%d, %d, %d, %d)", x, y, w, h);
+void KyraEngine_LoK::addToNoDropRects(int x, int y, int w, int h) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::addToNoDropRects(%d, %d, %d, %d)", x, y, w, h);
 	for (int rect = 0; rect < 11; ++rect) {
 		if (_noDropRects[rect].x == -1) {
 			_noDropRects[rect].x = x;
@@ -68,13 +68,13 @@ void KyraEngine_v1::addToNoDropRects(int x, int y, int w, int h) {
 	}
 }
 
-void KyraEngine_v1::clearNoDropRects() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::clearNoDropRects()");
+void KyraEngine_LoK::clearNoDropRects() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::clearNoDropRects()");
 	memset(_noDropRects, -1, sizeof(_noDropRects));
 }
 
-byte KyraEngine_v1::findFreeItemInScene(int scene) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::findFreeItemInScene(%d)", scene);
+byte KyraEngine_LoK::findFreeItemInScene(int scene) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::findFreeItemInScene(%d)", scene);
 	assert(scene < _roomTableSize);
 	Room *room = &_roomTable[scene];
 	for (int i = 0; i < 12; ++i) {
@@ -84,8 +84,8 @@ byte KyraEngine_v1::findFreeItemInScene(int scene) {
 	return 0xFF;
 }
 
-byte KyraEngine_v1::findItemAtPos(int x, int y) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::findItemAtPos(%d, %d)", x, y);
+byte KyraEngine_LoK::findItemAtPos(int x, int y) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::findItemAtPos(%d, %d)", x, y);
 	assert(_currentCharacter->sceneId < _roomTableSize);
 	const uint8 *itemsTable = _roomTable[_currentCharacter->sceneId].itemsTable;
 	const uint16 *xposOffset = _roomTable[_currentCharacter->sceneId].itemsXPos;
@@ -120,8 +120,8 @@ byte KyraEngine_v1::findItemAtPos(int x, int y) {
 	return returnValue;
 }
 
-void KyraEngine_v1::placeItemInGenericMapScene(int item, int index) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::placeItemInGenericMapScene(%d, %d)", item, index);
+void KyraEngine_LoK::placeItemInGenericMapScene(int item, int index) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::placeItemInGenericMapScene(%d, %d)", item, index);
 	static const uint16 itemMapSceneMinTable[] = {
 		0x0000, 0x0011, 0x006D, 0x0025, 0x00C7, 0x0000
 	};
@@ -175,32 +175,32 @@ void KyraEngine_v1::placeItemInGenericMapScene(int item, int index) {
 	}
 }
 
-void KyraEngine_v1::createMouseItem(int item) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::createMouseItem(%d)", item);
+void KyraEngine_LoK::createMouseItem(int item) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::createMouseItem(%d)", item);
 	_screen->hideMouse();
 	setMouseItem(item);
 	_itemInHand = item;
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::destroyMouseItem() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::destroyMouseItem()");
+void KyraEngine_LoK::destroyMouseItem() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::destroyMouseItem()");
 	_screen->hideMouse();
 	_screen->setMouseCursor(1, 1, _shapes[0]);
 	_itemInHand = -1;
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::setMouseItem(int item) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setMouseItem(%d)", item);
+void KyraEngine_LoK::setMouseItem(int item) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setMouseItem(%d)", item);
 	if (item == -1)
 		_screen->setMouseCursor(1, 1, _shapes[6]);
 	else
 		_screen->setMouseCursor(8, 15, _shapes[216+item]);
 }
 
-void KyraEngine_v1::wipeDownMouseItem(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::wipeDownMouseItem(%d, %d)", xpos, ypos);
+void KyraEngine_LoK::wipeDownMouseItem(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::wipeDownMouseItem(%d, %d)", xpos, ypos);
 	if (_itemInHand == -1)
 		return;
 	xpos -= 8;
@@ -226,8 +226,8 @@ void KyraEngine_v1::wipeDownMouseItem(int xpos, int ypos) {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::setupSceneItems() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setupSceneItems()");
+void KyraEngine_LoK::setupSceneItems() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setupSceneItems()");
 	uint16 sceneId = _currentCharacter->sceneId;
 	assert(sceneId < _roomTableSize);
 	Room *currentRoom = &_roomTable[sceneId];
@@ -264,8 +264,8 @@ void KyraEngine_v1::setupSceneItems() {
 	}
 }
 
-int KyraEngine_v1::countItemsInScene(uint16 sceneId) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::countItemsInScene(%d)", sceneId);
+int KyraEngine_LoK::countItemsInScene(uint16 sceneId) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::countItemsInScene(%d)", sceneId);
 	assert(sceneId < _roomTableSize);
 	Room *currentRoom = &_roomTable[sceneId];
 
@@ -279,8 +279,8 @@ int KyraEngine_v1::countItemsInScene(uint16 sceneId) {
 	return items;
 }
 
-int KyraEngine_v1::processItemDrop(uint16 sceneId, uint8 item, int x, int y, int unk1, int unk2) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::processItemDrop(%d, %d, %d, %d, %d, %d)", sceneId, item, x, y, unk1, unk2);
+int KyraEngine_LoK::processItemDrop(uint16 sceneId, uint8 item, int x, int y, int unk1, int unk2) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::processItemDrop(%d, %d, %d, %d, %d, %d)", sceneId, item, x, y, unk1, unk2);
 	int freeItem = -1;
 	uint8 itemIndex = findItemAtPos(x, y);
 	if (unk1)
@@ -432,8 +432,8 @@ int KyraEngine_v1::processItemDrop(uint16 sceneId, uint8 item, int x, int y, int
 	return 1;
 }
 
-void KyraEngine_v1::exchangeItemWithMouseItem(uint16 sceneId, int itemIndex) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::exchangeItemWithMouseItem(%d, %d)", sceneId, itemIndex);
+void KyraEngine_LoK::exchangeItemWithMouseItem(uint16 sceneId, int itemIndex) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::exchangeItemWithMouseItem(%d, %d)", sceneId, itemIndex);
 	_screen->hideMouse();
 	_animator->animRemoveGameItem(itemIndex);
 	assert(sceneId < _roomTableSize);
@@ -452,8 +452,8 @@ void KyraEngine_v1::exchangeItemWithMouseItem(uint16 sceneId, int itemIndex) {
 	clickEventHandler2();
 }
 
-void KyraEngine_v1::addItemToRoom(uint16 sceneId, uint8 item, int itemIndex, int x, int y) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::addItemToRoom(%d, %d, %d, %d, %d)", sceneId, item, itemIndex, x, y);
+void KyraEngine_LoK::addItemToRoom(uint16 sceneId, uint8 item, int itemIndex, int x, int y) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::addItemToRoom(%d, %d, %d, %d, %d)", sceneId, item, itemIndex, x, y);
 	assert(sceneId < _roomTableSize);
 	Room *currentRoom = &_roomTable[sceneId];
 	currentRoom->itemsTable[itemIndex] = item;
@@ -462,8 +462,8 @@ void KyraEngine_v1::addItemToRoom(uint16 sceneId, uint8 item, int itemIndex, int
 	currentRoom->needInit[itemIndex] = 1;
 }
 
-int KyraEngine_v1::checkNoDropRects(int x, int y) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::checkNoDropRects(%d, %d)", x, y);
+int KyraEngine_LoK::checkNoDropRects(int x, int y) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::checkNoDropRects(%d, %d)", x, y);
 	if (_lastProcessedItemHeight < 1 || _lastProcessedItemHeight > 16)
 		_lastProcessedItemHeight = 16;
 	if (_noDropRects[0].x == -1)
@@ -492,8 +492,8 @@ int KyraEngine_v1::checkNoDropRects(int x, int y) {
 	return 0;
 }
 
-int KyraEngine_v1::isDropable(int x, int y) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::isDropable(%d, %d)", x, y);
+int KyraEngine_LoK::isDropable(int x, int y) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::isDropable(%d, %d)", x, y);
 	x -= 8;
 	y -= 1;
 
@@ -507,8 +507,8 @@ int KyraEngine_v1::isDropable(int x, int y) {
 	return 1;
 }
 
-void KyraEngine_v1::itemDropDown(int x, int y, int destX, int destY, byte freeItem, int item) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::itemDropDown(%d, %d, %d, %d, %d, %d)", x, y, destX, destY, freeItem, item);
+void KyraEngine_LoK::itemDropDown(int x, int y, int destX, int destY, byte freeItem, int item) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::itemDropDown(%d, %d, %d, %d, %d, %d)", x, y, destX, destY, freeItem, item);
 	assert(_currentCharacter->sceneId < _roomTableSize);
 	Room *currentRoom = &_roomTable[_currentCharacter->sceneId];
 	if (x == destX && y == destY) {
@@ -591,8 +591,8 @@ void KyraEngine_v1::itemDropDown(int x, int y, int destX, int destY, byte freeIt
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::dropItem(int unk1, int item, int x, int y, int unk2) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::dropItem(%d, %d, %d, %d, %d)", unk1, item, x, y, unk2);
+void KyraEngine_LoK::dropItem(int unk1, int item, int x, int y, int unk2) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::dropItem(%d, %d, %d, %d, %d)", unk1, item, x, y, unk2);
 	if (processItemDrop(_currentCharacter->sceneId, item, x, y, unk1, unk2))
 		return;
 	snd_playSoundEffect(54);
@@ -603,16 +603,16 @@ void KyraEngine_v1::dropItem(int unk1, int item, int x, int y, int unk2) {
 		drawSentenceCommand(_noDropList[1], 6);
 }
 
-void KyraEngine_v1::itemSpecialFX(int x, int y, int item) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::itemSpecialFX(%d, %d, %d)", x, y, item);
+void KyraEngine_LoK::itemSpecialFX(int x, int y, int item) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::itemSpecialFX(%d, %d, %d)", x, y, item);
 	if (item == 41)
 		itemSpecialFX1(x, y, item);
 	else
 		itemSpecialFX2(x, y, item);
 }
 
-void KyraEngine_v1::itemSpecialFX1(int x, int y, int item) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::itemSpecialFX1(%d, %d, %d)", x, y, item);
+void KyraEngine_LoK::itemSpecialFX1(int x, int y, int item) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::itemSpecialFX1(%d, %d, %d)", x, y, item);
 	uint8 *shape = _shapes[216+item];
 	x -= 8;
 	int startY = y;
@@ -632,8 +632,8 @@ void KyraEngine_v1::itemSpecialFX1(int x, int y, int item) {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::itemSpecialFX2(int x, int y, int item) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::itemSpecialFX2(%d, %d, %d)", x, y, item);
+void KyraEngine_LoK::itemSpecialFX2(int x, int y, int item) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::itemSpecialFX2(%d, %d, %d)", x, y, item);
 	x -= 8;
 	y -= 15;
 	int yAdd = (int8)(((16 - _itemTable[item].height) >> 1) & 0xFF);
@@ -660,8 +660,8 @@ void KyraEngine_v1::itemSpecialFX2(int x, int y, int item) {
 	restoreItemRect0(x, y);
 }
 
-void KyraEngine_v1::magicOutMouseItem(int animIndex, int itemPos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::magicOutMouseItem(%d, %d)", animIndex, itemPos);
+void KyraEngine_LoK::magicOutMouseItem(int animIndex, int itemPos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::magicOutMouseItem(%d, %d)", animIndex, itemPos);
 	int videoPageBackUp = _screen->_curPage;
 	_screen->_curPage = 0;
 	int x = 0, y = 0;
@@ -744,8 +744,8 @@ void KyraEngine_v1::magicOutMouseItem(int animIndex, int itemPos) {
 	_screen->_curPage = videoPageBackUp;
 }
 
-void KyraEngine_v1::magicInMouseItem(int animIndex, int item, int itemPos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::magicInMouseItem(%d, %d, %d)", animIndex, item, itemPos);
+void KyraEngine_LoK::magicInMouseItem(int animIndex, int item, int itemPos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::magicInMouseItem(%d, %d, %d)", animIndex, item, itemPos);
 	int videoPageBackUp = _screen->_curPage;
 	_screen->_curPage = 0;
 	int x = 0, y = 0;
@@ -817,8 +817,8 @@ void KyraEngine_v1::magicInMouseItem(int animIndex, int item, int itemPos) {
 	_screen->_curPage = videoPageBackUp;
 }
 
-void KyraEngine_v1::specialMouseItemFX(int shape, int x, int y, int animIndex, int tableIndex, int loopStart, int maxLoops) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::specialMouseItemFX(%d, %d, %d, %d, %d, %d, %d)", shape, x, y, animIndex, tableIndex, loopStart, maxLoops);
+void KyraEngine_LoK::specialMouseItemFX(int shape, int x, int y, int animIndex, int tableIndex, int loopStart, int maxLoops) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::specialMouseItemFX(%d, %d, %d, %d, %d, %d, %d)", shape, x, y, animIndex, tableIndex, loopStart, maxLoops);
 	static const uint8 table1[] = {
 		0x23, 0x45, 0x55, 0x72, 0x84, 0xCF, 0x00, 0x00
 	};
@@ -840,8 +840,8 @@ void KyraEngine_v1::specialMouseItemFX(int shape, int x, int y, int animIndex, i
 	processSpecialMouseItemFX(shape, x, y, tableValue, loopStart, maxLoops);
 }
 
-void KyraEngine_v1::processSpecialMouseItemFX(int shape, int x, int y, int tableValue, int loopStart, int maxLoops) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::processSpecialMouseItemFX(%d, %d, %d, %d, %d, %d)", shape, x, y, tableValue, loopStart, maxLoops);
+void KyraEngine_LoK::processSpecialMouseItemFX(int shape, int x, int y, int tableValue, int loopStart, int maxLoops) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::processSpecialMouseItemFX(%d, %d, %d, %d, %d, %d)", shape, x, y, tableValue, loopStart, maxLoops);
 	uint8 shapeColorTable[16];
 	uint8 *shapePtr = _shapes[shape] + 10;
 	if (_flags.useAltShapeHeader)
@@ -859,8 +859,8 @@ void KyraEngine_v1::processSpecialMouseItemFX(int shape, int x, int y, int table
 	_screen->drawShape(0, _shapes[shape], x, y, 0, 0x8000, shapeColorTable);
 }
 
-void KyraEngine_v1::updatePlayerItemsForScene() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::updatePlayerItemsForScene()");
+void KyraEngine_LoK::updatePlayerItemsForScene() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::updatePlayerItemsForScene()");
 	if (_itemInHand >= 29 && _itemInHand < 33) {
 		++_itemInHand;
 		if (_itemInHand > 33)
@@ -900,7 +900,7 @@ void KyraEngine_v1::updatePlayerItemsForScene() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::redrawInventory(int page) {
+void KyraEngine_LoK::redrawInventory(int page) {
 	int videoPageBackUp = _screen->_curPage;
 	_screen->_curPage = page;
 	_screen->hideMouse();
@@ -916,26 +916,26 @@ void KyraEngine_v1::redrawInventory(int page) {
 	_screen->updateScreen();
 }
 
-void KyraEngine_v1::backUpItemRect0(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::backUpItemRect0(%d, %d)", xpos, ypos);
+void KyraEngine_LoK::backUpItemRect0(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::backUpItemRect0(%d, %d)", xpos, ypos);
 	_screen->rectClip(xpos, ypos, 3<<3, 24);
 	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
 }
 
-void KyraEngine_v1::restoreItemRect0(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::restoreItemRect0(%d, %d)", xpos, ypos);
+void KyraEngine_LoK::restoreItemRect0(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::restoreItemRect0(%d, %d)", xpos, ypos);
 	_screen->rectClip(xpos, ypos, 3<<3, 24);
 	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 3<<3, 24, _itemBkgBackUp[0]);
 }
 
-void KyraEngine_v1::backUpItemRect1(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::backUpItemRect1(%d, %d)", xpos, ypos);
+void KyraEngine_LoK::backUpItemRect1(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::backUpItemRect1(%d, %d)", xpos, ypos);
 	_screen->rectClip(xpos, ypos, 4<<3, 32);
 	_screen->copyRegionToBuffer(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
 }
 
-void KyraEngine_v1::restoreItemRect1(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::restoreItemRect1(%d, %d)", xpos, ypos);
+void KyraEngine_LoK::restoreItemRect1(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::restoreItemRect1(%d, %d)", xpos, ypos);
 	_screen->rectClip(xpos, ypos, 4<<3, 32);
 	_screen->copyBlockToPage(_screen->_curPage, xpos, ypos, 4<<3, 32, _itemBkgBackUp[1]);
 }
diff --git a/engines/kyra/kyra_hof.cpp b/engines/kyra/kyra_hof.cpp
index ebe39ee02c..5a2d36d612 100644
--- a/engines/kyra/kyra_hof.cpp
+++ b/engines/kyra/kyra_hof.cpp
@@ -325,10 +325,10 @@ void KyraEngine_HoF::startup() {
 
 	memset(_sceneAnims, 0, sizeof(_sceneAnims));
 	for (int i = 0; i < ARRAYSIZE(_sceneAnimMovie); ++i)
-		_sceneAnimMovie[i] = new WSAMovieV2(this, _screen);
+		_sceneAnimMovie[i] = new WSAMovie_v2(this, _screen);
 	memset(_wsaSlots, 0, sizeof(_wsaSlots));
 	for (int i = 0; i < ARRAYSIZE(_wsaSlots); ++i)
-		_wsaSlots[i] = new WSAMovieV2(this, _screen);
+		_wsaSlots[i] = new WSAMovie_v2(this, _screen);
 
 	_screen->_curPage = 0;
 
@@ -1537,7 +1537,7 @@ void KyraEngine_HoF::loadInvWsa(const char *filename, int run, int delayTime, in
 		wsaFlags |= 2;
 
 	if (!_invWsa.wsa)
-		_invWsa.wsa = new WSAMovieV2(this, _screen);
+		_invWsa.wsa = new WSAMovie_v2(this, _screen);
 
 	if (!_invWsa.wsa->open(filename, wsaFlags, 0))
 		error("Couldn't open inventory WSA file '%s'", filename);
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h
index 5ee13eb261..8b03cbc019 100644
--- a/engines/kyra/kyra_hof.h
+++ b/engines/kyra/kyra_hof.h
@@ -97,17 +97,17 @@ enum kNestedSequencesDemo {
 	kSequenceDemoDig
 };
 
-class WSAMovieV2;
+class WSAMovie_v2;
 class KyraEngine_HoF;
 class TextDisplayer_HoF;
 
 struct TIM;
 
-typedef int (KyraEngine_HoF::*SeqProc)(WSAMovieV2*, int, int, int);
+typedef int (KyraEngine_HoF::*SeqProc)(WSAMovie_v2*, int, int, int);
 
 struct ActiveWSA {
 	int16 flags;
-	WSAMovieV2 *movie;
+	WSAMovie_v2 *movie;
 	uint16 startFrame;
 	uint16 endFrame;
 	uint16 frameDelay;
@@ -193,52 +193,52 @@ protected:
 	// intro/outro
 	void seq_playSequences(int startSeq, int endSeq = -1);
 
-	int seq_introWestwood(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introTitle(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introOverview(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introLibrary(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introHand(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introPoint(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introZanfaun(WSAMovieV2 *wsaObj, int x, int y, int frm);
-
-	int seq_introOver1(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introOver2(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introForest(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introDragon(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introDarm(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introLibrary2(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introMarco(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introHand1a(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introHand1b(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introHand1c(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introHand2(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_introHand3(WSAMovieV2 *wsaObj, int x, int y, int frm);
-
-	int seq_finaleFunters(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_finaleFerb(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_finaleFish(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_finaleFheep(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_finaleFarmer(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_finaleFuards(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_finaleFirates(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_finaleFrash(WSAMovieV2 *wsaObj, int x, int y, int frm);
-
-	int seq_finaleFiggle(WSAMovieV2 *wsaObj, int x, int y, int frm);
-
-	int seq_demoVirgin(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoWestwood(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoTitle(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoHill(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoOuthome(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoWharf(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoDinob(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoFisher(WSAMovieV2 *wsaObj, int x, int y, int frm);
-
-	int seq_demoWharf2(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoDinob2(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoWater(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoBail(WSAMovieV2 *wsaObj, int x, int y, int frm);
-	int seq_demoDig(WSAMovieV2 *wsaObj, int x, int y, int frm);
+	int seq_introWestwood(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introTitle(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introOverview(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introLibrary(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introHand(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introPoint(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introZanfaun(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+
+	int seq_introOver1(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introOver2(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introForest(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introDragon(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introDarm(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introLibrary2(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introMarco(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introHand1a(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introHand1b(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introHand1c(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introHand2(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_introHand3(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+
+	int seq_finaleFunters(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_finaleFerb(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_finaleFish(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_finaleFheep(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_finaleFarmer(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_finaleFuards(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_finaleFirates(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_finaleFrash(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+
+	int seq_finaleFiggle(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+
+	int seq_demoVirgin(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoWestwood(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoTitle(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoHill(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoOuthome(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoWharf(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoDinob(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoFisher(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+
+	int seq_demoWharf2(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoDinob2(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoWater(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoBail(WSAMovie_v2 *wsaObj, int x, int y, int frm);
+	int seq_demoDig(WSAMovie_v2 *wsaObj, int x, int y, int frm);
 
 	void seq_sequenceCommand(int command);
 	void seq_loadNestedSequence(int wsaNum, int seqNum);
@@ -259,7 +259,7 @@ protected:
 	char *seq_preprocessString(const char *str, int width);
 	void seq_printCreditsString(uint16 strIndex, int x, int y, const uint8 *colorMap, uint8 textcolor);
 	void seq_playWsaSyncDialogue(uint16 strIndex, uint16 vocIndex, int textColor, int x, int y, int width,
-		WSAMovieV2 * wsa, int firstframe, int lastframe, int wsaXpos, int wsaYpos);
+		WSAMovie_v2 * wsa, int firstframe, int lastframe, int wsaXpos, int wsaYpos);
 	void seq_finaleActorScreen();
 	void seq_displayScrollText(uint8 *data, const ScreenDim *d, int tempPage1, int tempPage2, int speed, int step, Screen::FontId fid1, Screen::FontId fid2, const uint8 *shapeData = 0, const char *const *specialData = 0);
 	void seq_scrollPage();
@@ -330,7 +330,7 @@ protected:
 
 	uint8 *_sceneShapeTable[50];
 
-	WSAMovieV2 *_wsaSlots[10];
+	WSAMovie_v2 *_wsaSlots[10];
 
 	void freeSceneShapePtrs();
 
@@ -667,7 +667,7 @@ protected:
 		int delay;
 		bool running;
 		uint32 timer;
-		WSAMovieV2 *wsa;
+		WSAMovie_v2 *wsa;
 	} _invWsa;
 
 	// TODO: move inside KyraEngine_HoF::InventoryWsa?
@@ -854,7 +854,7 @@ protected:
 
 	static const uint8 _seqTextColorPresets[];
 	char *_seqProcessedString;
-	WSAMovieV2 *_seqWsa;
+	WSAMovie_v2 *_seqWsa;
 
 	bool _abortIntroFlag;
 	int _menuChoice;
diff --git a/engines/kyra/kyra_v1.cpp b/engines/kyra/kyra_lok.cpp
index 2504719ef5..175a635157 100644
--- a/engines/kyra/kyra_v1.cpp
+++ b/engines/kyra/kyra_lok.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 
 #include "common/file.h"
 #include "common/events.h"
@@ -39,14 +39,14 @@
 #include "kyra/sound.h"
 #include "kyra/sprites.h"
 #include "kyra/wsamovie.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/text.h"
 #include "kyra/debugger.h"
 #include "kyra/timer.h"
 
 namespace Kyra {
 
-KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags)
+KyraEngine_LoK::KyraEngine_LoK(OSystem *system, const GameFlags &flags)
 	: KyraEngine(system, flags) {
 	_skipFlag = false;
 
@@ -95,7 +95,7 @@ KyraEngine_v1::KyraEngine_v1(OSystem *system, const GameFlags &flags)
 	memset(&_itemBkgBackUp, 0, sizeof(_itemBkgBackUp));
 }
 
-KyraEngine_v1::~KyraEngine_v1() {
+KyraEngine_LoK::~KyraEngine_LoK() {
 	for (int i = 0; i < ARRAYSIZE(_movieObjects); ++i) {
 		if (_movieObjects[i])
 			_movieObjects[i]->close();
@@ -151,8 +151,8 @@ KyraEngine_v1::~KyraEngine_v1() {
 		delete[] _sceneAnimTable[i];
 }
 
-int KyraEngine_v1::init() {
-	_screen = new Screen_v1(this, _system);
+int KyraEngine_LoK::init() {
+	_screen = new Screen_LoK(this, _system);
 	assert(_screen);
 	_screen->setResolution();
 
@@ -162,13 +162,13 @@ int KyraEngine_v1::init() {
 	assert(_sprites);
 	_seq = new SeqPlayer(this, _system);
 	assert(_seq);
-	_animator = new Animator_v1(this, _system);
+	_animator = new Animator_LoK(this, _system);
 	assert(_animator);
 	_animator->init(5, 11, 12);
 	assert(*_animator);
 	_text = new TextDisplayer(this, screen());
 	assert(_text);
-	_gui = new GUI_v1(this, _screen);
+	_gui = new GUI_LoK(this, _screen);
 	assert(_gui);
 
 	initStaticResource();
@@ -206,7 +206,7 @@ int KyraEngine_v1::init() {
 	memset(&_scriptMain, 0, sizeof(EMCState));
 	memset(&_scriptClick, 0, sizeof(EMCState));
 
-	_debugger = new Debugger_v1(this);
+	_debugger = new Debugger_LoK(this);
 	assert(_debugger);
 	memset(_shapes, 0, sizeof(_shapes));
 
@@ -284,7 +284,7 @@ int KyraEngine_v1::init() {
 	return 0;
 }
 
-int KyraEngine_v1::go() {
+int KyraEngine_LoK::go() {
 	if (_res->getFileSize("6.FNT"))
 		_screen->loadFont(Screen::FID_6_FNT, "6.FNT");
 	_screen->loadFont(Screen::FID_8_FNT, "8FAT.FNT");
@@ -313,8 +313,8 @@ int KyraEngine_v1::go() {
 }
 
 
-void KyraEngine_v1::startup() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::startup()");
+void KyraEngine_LoK::startup() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::startup()");
 	static const uint8 colorMap[] = { 0, 0, 0, 0, 12, 12, 12, 0, 0, 0, 0, 0 };
 	_screen->setTextColorMap(colorMap);
 	_sound->setSoundList(&_soundData[kMusicIngame]);
@@ -396,8 +396,8 @@ void KyraEngine_v1::startup() {
 	}
 }
 
-void KyraEngine_v1::mainLoop() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::mainLoop()");
+void KyraEngine_LoK::mainLoop() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::mainLoop()");
 
 	while (!_quitFlag) {
 		int32 frameTime = (int32)_system->getMillis();
@@ -443,7 +443,7 @@ void KyraEngine_v1::mainLoop() {
 	}
 }
 
-void KyraEngine_v1::delayUntil(uint32 timestamp, bool updateTimers, bool update, bool isMainLoop) {
+void KyraEngine_LoK::delayUntil(uint32 timestamp, bool updateTimers, bool update, bool isMainLoop) {
 	while (_system->getMillis() < timestamp && !_quitFlag) {
 		if (updateTimers)
 			_timer->update();
@@ -453,7 +453,7 @@ void KyraEngine_v1::delayUntil(uint32 timestamp, bool updateTimers, bool update,
 	}
 }
 
-void KyraEngine_v1::delay(uint32 amount, bool update, bool isMainLoop) {
+void KyraEngine_LoK::delay(uint32 amount, bool update, bool isMainLoop) {
 	Common::Event event;
 
 	uint32 start = _system->getMillis();
@@ -537,7 +537,7 @@ void KyraEngine_v1::delay(uint32 amount, bool update, bool isMainLoop) {
 	} while (!_skipFlag && _system->getMillis() < start + amount && !_quitFlag);
 }
 
-void KyraEngine_v1::waitForEvent() {
+void KyraEngine_LoK::waitForEvent() {
 	bool finished = false;
 	Common::Event event;
 
@@ -566,7 +566,7 @@ void KyraEngine_v1::waitForEvent() {
 	}
 }
 
-void KyraEngine_v1::delayWithTicks(int ticks) {
+void KyraEngine_LoK::delayWithTicks(int ticks) {
 	uint32 nextTime = _system->getMillis() + ticks * _tickLength;
 
 	while (_system->getMillis() < nextTime) {
@@ -590,8 +590,8 @@ void KyraEngine_v1::delayWithTicks(int ticks) {
 #pragma mark - Animation/shape specific code
 #pragma mark -
 
-void KyraEngine_v1::setupShapes123(const Shape *shapeTable, int endShape, int flags) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setupShapes123(%p, %d, %d)", (const void *)shapeTable, endShape, flags);
+void KyraEngine_LoK::setupShapes123(const Shape *shapeTable, int endShape, int flags) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setupShapes123(%p, %d, %d)", (const void *)shapeTable, endShape, flags);
 
 	for (int i = 123; i <= 172; ++i)
 		_shapes[i] = 0;
@@ -619,8 +619,8 @@ void KyraEngine_v1::setupShapes123(const Shape *shapeTable, int endShape, int fl
 	_screen->_curPage = curPageBackUp;
 }
 
-void KyraEngine_v1::freeShapes123() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::freeShapes123()");
+void KyraEngine_LoK::freeShapes123() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::freeShapes123()");
 
 	for (int i = 123; i <= 172; ++i) {
 		delete[] _shapes[i];
@@ -632,15 +632,15 @@ void KyraEngine_v1::freeShapes123() {
 #pragma mark - Misc stuff
 #pragma mark -
 
-Movie *KyraEngine_v1::createWSAMovie() {
+Movie *KyraEngine_LoK::createWSAMovie() {
 	if (_flags.platform == Common::kPlatformAmiga)
 		return new WSAMovieAmiga(this);
 
-	return new WSAMovieV1(this);
+	return new WSAMovie_v1(this);
 }
 
-void KyraEngine_v1::setBrandonPoisonFlags(int reset) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setBrandonPoisonFlags(%d)", reset);
+void KyraEngine_LoK::setBrandonPoisonFlags(int reset) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setBrandonPoisonFlags(%d)", reset);
 	_brandonStatusBit |= 1;
 
 	if (reset)
@@ -656,8 +656,8 @@ void KyraEngine_v1::setBrandonPoisonFlags(int reset) {
 	_brandonPoisonFlagsGFX[0x9D] = 0x2B;
 }
 
-void KyraEngine_v1::resetBrandonPoisonFlags() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::resetBrandonPoisonFlags()");
+void KyraEngine_LoK::resetBrandonPoisonFlags() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::resetBrandonPoisonFlags()");
 	_brandonStatusBit = 0;
 
 	for (int i = 0; i < 0x100; ++i)
@@ -668,12 +668,12 @@ void KyraEngine_v1::resetBrandonPoisonFlags() {
 #pragma mark - Input
 #pragma mark -
 
-void KyraEngine_v1::processInput() {
+void KyraEngine_LoK::processInput() {
 	Common::Point mouse = getMousePos();
 	int xpos = mouse.x;
 	int ypos = mouse.y;
 
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::processInput(%d, %d)", xpos, ypos);
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::processInput(%d, %d)", xpos, ypos);
 	_abortWalkFlag2 = false;
 
 	if (processInputHelper(xpos, ypos))
@@ -732,8 +732,8 @@ void KyraEngine_v1::processInput() {
 	}
 }
 
-int KyraEngine_v1::processInputHelper(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::processInputHelper(%d, %d)", xpos, ypos);
+int KyraEngine_LoK::processInputHelper(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::processInputHelper(%d, %d)", xpos, ypos);
 	uint8 item = findItemAtPos(xpos, ypos);
 	if (item != 0xFF) {
 		if (_itemInHand == -1) {
@@ -759,8 +759,8 @@ int KyraEngine_v1::processInputHelper(int xpos, int ypos) {
 	return 0;
 }
 
-int KyraEngine_v1::clickEventHandler(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::clickEventHandler(%d, %d)", xpos, ypos);
+int KyraEngine_LoK::clickEventHandler(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::clickEventHandler(%d, %d)", xpos, ypos);
 	_emc->init(&_scriptClick, &_scriptClickData);
 	_scriptClick.regs[1] = xpos;
 	_scriptClick.regs[2] = ypos;
@@ -774,7 +774,7 @@ int KyraEngine_v1::clickEventHandler(int xpos, int ypos) {
 	return _scriptClick.regs[3];
 }
 
-void KyraEngine_v1::updateMousePointer(bool forceUpdate) {
+void KyraEngine_LoK::updateMousePointer(bool forceUpdate) {
 	int shape = 0;
 
 	int newMouseState = 0;
@@ -886,8 +886,8 @@ void KyraEngine_v1::updateMousePointer(bool forceUpdate) {
 	}
 }
 
-bool KyraEngine_v1::hasClickedOnExit(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::hasClickedOnExit(%d, %d)", xpos, ypos);
+bool KyraEngine_LoK::hasClickedOnExit(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::hasClickedOnExit(%d, %d)", xpos, ypos);
 	if (xpos < 16 || xpos >= 304)
 		return true;
 
@@ -900,8 +900,8 @@ bool KyraEngine_v1::hasClickedOnExit(int xpos, int ypos) {
 	return true;
 }
 
-void KyraEngine_v1::clickEventHandler2() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::clickEventHandler2()");
+void KyraEngine_LoK::clickEventHandler2() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::clickEventHandler2()");
 
 	Common::Point mouse = getMousePos();
 
@@ -916,8 +916,8 @@ void KyraEngine_v1::clickEventHandler2() {
 		_emc->run(&_scriptClick);
 }
 
-int KyraEngine_v1::checkForNPCScriptRun(int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::checkForNPCScriptRun(%d, %d)", xpos, ypos);
+int KyraEngine_LoK::checkForNPCScriptRun(int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::checkForNPCScriptRun(%d, %d)", xpos, ypos);
 	int returnValue = -1;
 	const Character *currentChar = _currentCharacter;
 	int charLeft = 0, charRight = 0, charTop = 0, charBottom = 0;
@@ -965,8 +965,8 @@ int KyraEngine_v1::checkForNPCScriptRun(int xpos, int ypos) {
 	return returnValue;
 }
 
-void KyraEngine_v1::runNpcScript(int func) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::runNpcScript(%d)", func);
+void KyraEngine_LoK::runNpcScript(int func) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::runNpcScript(%d)", func);
 	_emc->init(&_npcScript, &_npcScriptData);
 	_emc->start(&_npcScript, func);
 	_npcScript.regs[0] = _currentCharacter->sceneId;
@@ -977,8 +977,8 @@ void KyraEngine_v1::runNpcScript(int func) {
 		_emc->run(&_npcScript);
 }
 
-void KyraEngine_v1::checkAmuletAnimFlags() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::checkSpecialAnimFlags()");
+void KyraEngine_LoK::checkAmuletAnimFlags() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::checkSpecialAnimFlags()");
 
 	if (_brandonStatusBit & 2) {
 		seq_makeBrandonNormal2();
@@ -993,7 +993,7 @@ void KyraEngine_v1::checkAmuletAnimFlags() {
 
 #pragma mark -
 
-void KyraEngine_v1::registerDefaultSettings() {
+void KyraEngine_LoK::registerDefaultSettings() {
 	KyraEngine::registerDefaultSettings();
 
 	// Most settings already have sensible defaults. This one, however, is
@@ -1001,7 +1001,7 @@ void KyraEngine_v1::registerDefaultSettings() {
 	ConfMan.registerDefault("walkspeed", 2);
 }
 
-void KyraEngine_v1::readSettings() {
+void KyraEngine_LoK::readSettings() {
 	int talkspeed = ConfMan.getInt("talkspeed");
 
 	// The default talk speed is 60. This should be mapped to "Normal".
@@ -1018,7 +1018,7 @@ void KyraEngine_v1::readSettings() {
 	KyraEngine::readSettings();
 }
 
-void KyraEngine_v1::writeSettings() {
+void KyraEngine_LoK::writeSettings() {
 	int talkspeed;
 
 	switch (_configTextspeed) {
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_lok.h
index 801d3b9189..fe742a1da9 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_lok.h
@@ -28,8 +28,8 @@
 
 #include "kyra/kyra.h"
 #include "kyra/script.h"
-#include "kyra/screen_v1.h"
-#include "kyra/gui_v1.h"
+#include "kyra/screen_lok.h"
+#include "kyra/gui_lok.h"
 
 namespace Kyra {
 
@@ -37,9 +37,9 @@ class Movie;
 class SoundDigital;
 class SeqPlayer;
 class Sprites;
-class Animator_v1;
+class Animator_LoK;
 class TextDisplayer;
-class KyraEngine_v1;
+class KyraEngine_LoK;
 
 struct Character {
 	uint16 sceneId;
@@ -104,17 +104,17 @@ struct BeadState {
 	int16 tableIndex;
 };
 
-class KyraEngine_v1 : public KyraEngine {
+class KyraEngine_LoK : public KyraEngine {
 	friend class MusicPlayer;
-	friend class Debugger_v1;
-	friend class Animator_v1;
-	friend class GUI_v1;
+	friend class Debugger_LoK;
+	friend class Animator_LoK;
+	friend class GUI_LoK;
 public:
-	KyraEngine_v1(OSystem *system, const GameFlags &flags);
-	~KyraEngine_v1();
+	KyraEngine_LoK(OSystem *system, const GameFlags &flags);
+	~KyraEngine_LoK();
 
 	Screen *screen() { return _screen; }
-	Animator_v1 *animator() { return _animator; }
+	Animator_LoK *animator() { return _animator; }
 	virtual Movie *createWSAMovie();
 
 	uint8 **shapes() { return _shapes; }
@@ -128,7 +128,7 @@ public:
 	int _paletteChanged;
 	int16 _northExitHeight;
 
-	typedef void (KyraEngine_v1::*IntroProc)();
+	typedef void (KyraEngine_LoK::*IntroProc)();
 
 	// static data access
 	const char * const*seqWSATable() { return _seq_WSATable; }
@@ -475,10 +475,10 @@ protected:
 
 	uint8 _configTextspeed;
 
-	Animator_v1 *_animator;
+	Animator_LoK *_animator;
 	SeqPlayer *_seq;
 	Sprites *_sprites;
-	Screen_v1 *_screen;
+	Screen_LoK *_screen;
 
 	EMCState _scriptMain;
 
@@ -492,7 +492,7 @@ protected:
 	Character *_currentCharacter;
 
 	Button *_buttonList;
-	GUI_v1 *_gui;
+	GUI_LoK *_gui;
 
 	struct KyragemState {
 		uint16 nextOperation;
diff --git a/engines/kyra/kyra_mr.cpp b/engines/kyra/kyra_mr.cpp
index 2168000dc9..6eca24fe98 100644
--- a/engines/kyra/kyra_mr.cpp
+++ b/engines/kyra/kyra_mr.cpp
@@ -325,7 +325,7 @@ int KyraEngine_MR::go() {
 }
 
 void KyraEngine_MR::initMainMenu() {
-	_menuAnim = new WSAMovieV2(this, _screen);
+	_menuAnim = new WSAMovie_v2(this, _screen);
 	_menuAnim->open("REVENGE.WSA", 1, _screen->getPalette(0));
 	_menuAnim->setX(0);
 	_menuAnim->setY(0);
@@ -550,11 +550,11 @@ void KyraEngine_MR::initMouseShapes() {
 void KyraEngine_MR::startup() {
 	debugC(9, kDebugLevelMain, "KyraEngine_MR::startup()");
 
-	_album.wsa = new WSAMovieV2(this, _screen);
+	_album.wsa = new WSAMovie_v2(this, _screen);
 	assert(_album.wsa);
-	_album.leftPage.wsa = new WSAMovieV2(this, _screen);
+	_album.leftPage.wsa = new WSAMovie_v2(this, _screen);
 	assert(_album.leftPage.wsa);
-	_album.rightPage.wsa = new WSAMovieV2(this, _screen);
+	_album.rightPage.wsa = new WSAMovie_v2(this, _screen);
 	assert(_album.rightPage.wsa);
 	musicUpdate(0);
 
@@ -607,7 +607,7 @@ void KyraEngine_MR::startup() {
 
 	for (int i = 0; i < 16; ++i) {
 		_sceneAnims[i].flags = 0;
-		_sceneAnimMovie[i] = new WSAMovieV2(this, _screen);
+		_sceneAnimMovie[i] = new WSAMovie_v2(this, _screen);
 		assert(_sceneAnimMovie[i]);
 	}
 
@@ -664,7 +664,7 @@ void KyraEngine_MR::startup() {
 	musicUpdate(0);
 	runStartupScript(1, 0);
 	_res->exists("MOODOMTR.WSA", true);
-	_invWsa = new WSAMovieV2(this, _screen);
+	_invWsa = new WSAMovie_v2(this, _screen);
 	assert(_invWsa);
 	_invWsa->open("MOODOMTR.WSA", 1, 0);
 	_invWsaFrame = 6;
diff --git a/engines/kyra/kyra_mr.h b/engines/kyra/kyra_mr.h
index a50fbfd440..4e28d6a5c0 100644
--- a/engines/kyra/kyra_mr.h
+++ b/engines/kyra/kyra_mr.h
@@ -39,7 +39,7 @@ namespace Kyra {
 class SoundDigital;
 class Screen_MR;
 class MainMenu;
-class WSAMovieV2;
+class WSAMovie_v2;
 class TextDisplayer_MR;
 struct Button;
 
@@ -157,7 +157,7 @@ private:
 	void initMainMenu();
 	void uninitMainMenu();
 
-	WSAMovieV2 *_menuAnim;
+	WSAMovie_v2 *_menuAnim;
 
 	// timer
 	void setupTimers();
@@ -262,7 +262,7 @@ private:
 	void clearInventorySlot(int slot, int page);
 	void drawInventorySlot(int page, int item, int slot);
 
-	WSAMovieV2 *_invWsa;
+	WSAMovie_v2 *_invWsa;
 	int _invWsaFrame;
 
 	// localization
@@ -535,11 +535,11 @@ private:
 	struct Album {
 		uint8 *backUpPage;
 		uint8 *file;
-		WSAMovieV2 *wsa;
+		WSAMovie_v2 *wsa;
 		uint8 *backUpRect;
 
 		struct PageMovie {
-			WSAMovieV2 *wsa;
+			WSAMovie_v2 *wsa;
 			int curFrame;
 			int maxFrame;
 			uint32 timer;
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h
index 3b7aac91ba..484e044ac7 100644
--- a/engines/kyra/kyra_v2.h
+++ b/engines/kyra/kyra_v2.h
@@ -230,7 +230,7 @@ protected:
 	};
 
 	SceneAnim _sceneAnims[16];
-	WSAMovieV2 *_sceneAnimMovie[16];
+	WSAMovie_v2 *_sceneAnimMovie[16];
 
 	void freeSceneAnims();
 
diff --git a/engines/kyra/module.mk b/engines/kyra/module.mk
index aec2778def..2a0e2adf41 100644
--- a/engines/kyra/module.mk
+++ b/engines/kyra/module.mk
@@ -1,49 +1,49 @@
 MODULE := engines/kyra
 
 MODULE_OBJS := \
-	animator_v1.o \
+	animator_lok.o \
 	animator_v2.o \
 	animator_hof.o \
 	animator_mr.o \
 	debugger.o \
 	detection.o \
 	gui.o \
-	gui_v1.o \
+	gui_lok.o \
 	gui_v2.o \
 	gui_hof.o \
 	gui_mr.o \
-	items_v1.o \
+	items_lok.o \
 	items_v2.o \
 	items_hof.o \
 	items_mr.o \
 	kyra.o \
-	kyra_v1.o \
+	kyra_lok.o \
 	kyra_v2.o \
 	kyra_hof.o \
 	kyra_mr.o \
 	resource.o \
 	saveload.o \
-	saveload_v1.o \
+	saveload_lok.o \
 	saveload_hof.o \
 	saveload_mr.o \
 	scene.o \
-	scene_v1.o \
+	scene_lok.o \
 	scene_v2.o \
 	scene_hof.o \
 	scene_mr.o \
 	screen.o \
-	screen_v1.o \
+	screen_lok.o \
 	screen_v2.o \
 	screen_hof.o \
 	screen_mr.o \
-	script_v1.o \
+	script_lok.o \
 	script_v2.o \
 	script_hof.o \
 	script_mr.o \
 	script.o \
 	script_tim.o \
 	seqplayer.o \
-	sequences_v1.o \
+	sequences_lok.o \
 	sequences_v2.o \
 	sequences_hof.o \
 	sequences_mr.o \
@@ -51,15 +51,15 @@ MODULE_OBJS := \
 	sound_digital.o \
 	sound_towns.o \
 	sound.o \
-	sound_v1.o \
+	sound_lok.o \
 	sprites.o \
 	staticres.o \
 	text.o \
-	text_v1.o \
+	text_lok.o \
 	text_hof.o \
 	text_mr.o \
 	timer.o \
-	timer_v1.o \
+	timer_lok.o \
 	timer_hof.o \
 	timer_mr.o \
 	vqa.o \
diff --git a/engines/kyra/saveload_v1.cpp b/engines/kyra/saveload_lok.cpp
index 7e871876a0..6f1fc484fd 100644
--- a/engines/kyra/saveload_v1.cpp
+++ b/engines/kyra/saveload_lok.cpp
@@ -27,16 +27,16 @@
 #include "common/savefile.h"
 #include "common/system.h"
 
-#include "kyra/kyra_v1.h"
-#include "kyra/animator_v1.h"
+#include "kyra/kyra_lok.h"
+#include "kyra/animator_lok.h"
 #include "kyra/screen.h"
 #include "kyra/resource.h"
 #include "kyra/sound.h"
 #include "kyra/timer.h"
 
 namespace Kyra {
-void KyraEngine_v1::loadGame(const char *fileName) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::loadGame('%s')", fileName);
+void KyraEngine_LoK::loadGame(const char *fileName) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::loadGame('%s')", fileName);
 
 	SaveHeader header;
 	Common::InSaveFile *in = openSaveForReading(fileName, header);
@@ -218,8 +218,8 @@ void KyraEngine_v1::loadGame(const char *fileName) {
 	delete in;
 }
 
-void KyraEngine_v1::saveGame(const char *fileName, const char *saveName) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::saveGame('%s', '%s')", fileName, saveName);
+void KyraEngine_LoK::saveGame(const char *fileName, const char *saveName) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::saveGame('%s', '%s')", fileName, saveName);
 	
 	if (_quitFlag)
 		return;
diff --git a/engines/kyra/scene_hof.cpp b/engines/kyra/scene_hof.cpp
index b072a76e66..1882386b03 100644
--- a/engines/kyra/scene_hof.cpp
+++ b/engines/kyra/scene_hof.cpp
@@ -98,7 +98,7 @@ void KyraEngine_HoF::enterNewScene(uint16 newScene, int facing, int unk1, int un
 			_emc->run(&_sceneScriptState);
 	}
 
-	Common::for_each(_wsaSlots, _wsaSlots+ARRAYSIZE(_wsaSlots), Common::mem_fun(&WSAMovieV2::close));
+	Common::for_each(_wsaSlots, _wsaSlots+ARRAYSIZE(_wsaSlots), Common::mem_fun(&WSAMovie_v2::close));
 	_specialExitCount = 0;
 	memset(_specialExitTable, -1, sizeof(_specialExitTable));
 
diff --git a/engines/kyra/scene_v1.cpp b/engines/kyra/scene_lok.cpp
index c5d1de82a9..36535eba60 100644
--- a/engines/kyra/scene_v1.cpp
+++ b/engines/kyra/scene_lok.cpp
@@ -23,14 +23,14 @@
  *
  */
 
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/seqplayer.h"
 #include "kyra/screen.h"
 #include "kyra/resource.h"
 #include "kyra/sound.h"
 #include "kyra/sprites.h"
 #include "kyra/wsamovie.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/text.h"
 #include "kyra/script.h"
 #include "kyra/timer.h"
@@ -40,8 +40,8 @@
 
 namespace Kyra {
 
-void KyraEngine_v1::enterNewScene(int sceneId, int facing, int unk1, int unk2, int brandonAlive) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::enterNewScene(%d, %d, %d, %d, %d)", sceneId, facing, unk1, unk2, brandonAlive);
+void KyraEngine_LoK::enterNewScene(int sceneId, int facing, int unk1, int unk2, int brandonAlive) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::enterNewScene(%d, %d, %d, %d, %d)", sceneId, facing, unk1, unk2, brandonAlive);
 	int unkVar1 = 1;
 	_screen->hideMouse();
 	_handleInput = false;
@@ -192,8 +192,8 @@ void KyraEngine_v1::enterNewScene(int sceneId, int facing, int unk1, int unk2, i
 	_changedScene = true;
 }
 
-void KyraEngine_v1::transcendScenes(int roomIndex, int roomName) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::transcendScenes(%d, %d)", roomIndex, roomName);
+void KyraEngine_LoK::transcendScenes(int roomIndex, int roomName) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::transcendScenes(%d, %d)", roomIndex, roomName);
 	assert(roomIndex < _roomTableSize);
 
 	if (_flags.isTalkie) {
@@ -218,14 +218,14 @@ void KyraEngine_v1::transcendScenes(int roomIndex, int roomName) {
 	_unkScreenVar3 = 0;
 }
 
-void KyraEngine_v1::setSceneFile(int roomIndex, int roomName) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setSceneFile(%d, %d)", roomIndex, roomName);
+void KyraEngine_LoK::setSceneFile(int roomIndex, int roomName) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setSceneFile(%d, %d)", roomIndex, roomName);
 	assert(roomIndex < _roomTableSize);
 	_roomTable[roomIndex].nameIndex = roomName;
 }
 
-void KyraEngine_v1::moveCharacterToPos(int character, int facing, int xpos, int ypos) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::moveCharacterToPos(%d, %d, %d, %d)", character, facing, xpos, ypos);
+void KyraEngine_LoK::moveCharacterToPos(int character, int facing, int xpos, int ypos) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::moveCharacterToPos(%d, %d, %d, %d)", character, facing, xpos, ypos);
 	Character *ch = &_characterList[character];
 	ch->facing = facing;
 	_screen->hideMouse();
@@ -279,8 +279,8 @@ void KyraEngine_v1::moveCharacterToPos(int character, int facing, int xpos, int
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::setCharacterPositionWithUpdate(int character) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setCharacterPositionWithUpdate(%d)", character);
+void KyraEngine_LoK::setCharacterPositionWithUpdate(int character) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setCharacterPositionWithUpdate(%d)", character);
 	setCharacterPosition(character, 0);
 	_sprites->updateSceneAnims();
 	_timer->update();
@@ -291,8 +291,8 @@ void KyraEngine_v1::setCharacterPositionWithUpdate(int character) {
 		updateKyragemFading();
 }
 
-int KyraEngine_v1::setCharacterPosition(int character, int *facingTable) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setCharacterPosition(%d, %p)", character, (const void *)facingTable);
+int KyraEngine_LoK::setCharacterPosition(int character, int *facingTable) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setCharacterPosition(%d, %p)", character, (const void *)facingTable);
 
 	if (character == 0) {
 		_currentCharacter->x1 += _charXPosTable[_currentCharacter->facing];
@@ -308,8 +308,8 @@ int KyraEngine_v1::setCharacterPosition(int character, int *facingTable) {
 	return 0;
 }
 
-void KyraEngine_v1::setCharacterPositionHelper(int character, int *facingTable) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setCharacterPositionHelper(%d, %p)", character, (const void *)facingTable);
+void KyraEngine_LoK::setCharacterPositionHelper(int character, int *facingTable) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setCharacterPositionHelper(%d, %p)", character, (const void *)facingTable);
 	Character *ch = &_characterList[character];
 	++ch->currentAnimFrame;
 	int facing = ch->facing;
@@ -392,7 +392,7 @@ void KyraEngine_v1::setCharacterPositionHelper(int character, int *facingTable)
 	_animator->animRefreshNPC(character);
 }
 
-void KyraEngine_v1::loadSceneMsc() {
+void KyraEngine_LoK::loadSceneMsc() {
 	assert(_currentCharacter->sceneId < _roomTableSize);
 	int tableId = _roomTable[_currentCharacter->sceneId].nameIndex;
 	assert(tableId < _roomFilenameTableSize);
@@ -404,8 +404,8 @@ void KyraEngine_v1::loadSceneMsc() {
 	_screen->loadBitmap(fileNameBuffer, 3, 5, 0);
 }
 
-void KyraEngine_v1::startSceneScript(int brandonAlive) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::startSceneScript(%d)", brandonAlive);
+void KyraEngine_LoK::startSceneScript(int brandonAlive) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::startSceneScript(%d)", brandonAlive);
 	assert(_currentCharacter->sceneId < _roomTableSize);
 	int tableId = _roomTable[_currentCharacter->sceneId].nameIndex;
 	assert(tableId < _roomFilenameTableSize);
@@ -438,8 +438,8 @@ void KyraEngine_v1::startSceneScript(int brandonAlive) {
 		_emc->run(&_scriptClick);
 }
 
-void KyraEngine_v1::initSceneData(int facing, int unk1, int brandonAlive) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::initSceneData(%d, %d, %d)", facing, unk1, brandonAlive);
+void KyraEngine_LoK::initSceneData(int facing, int unk1, int brandonAlive) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::initSceneData(%d, %d, %d)", facing, unk1, brandonAlive);
 
 	int16 xpos2 = 0;
 	int setFacing = 1;
@@ -608,14 +608,14 @@ void KyraEngine_v1::initSceneData(int facing, int unk1, int brandonAlive) {
 		_emc->run(&_scriptClick);
 }
 
-void KyraEngine_v1::initSceneObjectList(int brandonAlive) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::initSceneObjectList(%d)", brandonAlive);
+void KyraEngine_LoK::initSceneObjectList(int brandonAlive) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::initSceneObjectList(%d)", brandonAlive);
 	for (int i = 0; i < 28; ++i)
 		_animator->actors()[i].active = 0;
 
 	int startAnimFrame = 0;
 
-	Animator_v1::AnimObject *curAnimState = _animator->actors();
+	Animator_LoK::AnimObject *curAnimState = _animator->actors();
 	curAnimState->active = 1;
 	curAnimState->drawY = _currentCharacter->y1;
 	curAnimState->sceneAnimPtr = _shapes[_currentCharacter->currentAnimFrame];
@@ -779,7 +779,7 @@ void KyraEngine_v1::initSceneObjectList(int brandonAlive) {
 	_animator->copyChangedObjectsForward(0);
 }
 
-void KyraEngine_v1::initSceneScreen(int brandonAlive) {
+void KyraEngine_LoK::initSceneScreen(int brandonAlive) {
 	if (_flags.platform == Common::kPlatformAmiga) {
 		if (_unkScreenVar1 && !queryGameFlag(0xF0)) {
 			memset(_screen->getPalette(2), 0, 32*3);
@@ -849,8 +849,8 @@ void KyraEngine_v1::initSceneScreen(int brandonAlive) {
 	}
 }
 
-int KyraEngine_v1::handleSceneChange(int xpos, int ypos, int unk1, int frameReset) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::handleSceneChange(%d, %d, %d, %d)", xpos, ypos, unk1, frameReset);
+int KyraEngine_LoK::handleSceneChange(int xpos, int ypos, int unk1, int frameReset) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::handleSceneChange(%d, %d, %d, %d)", xpos, ypos, unk1, frameReset);
 	if (queryGameFlag(0xEF))
 		unk1 = 0;
 
@@ -909,8 +909,8 @@ int KyraEngine_v1::handleSceneChange(int xpos, int ypos, int unk1, int frameRese
 	return processSceneChange(_movFacingTable, unk1, frameReset);
 }
 
-int KyraEngine_v1::processSceneChange(int *table, int unk1, int frameReset) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::processSceneChange(%p, %d, %d)", (const void *)table, unk1, frameReset);
+int KyraEngine_LoK::processSceneChange(int *table, int unk1, int frameReset) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::processSceneChange(%p, %d, %d)", (const void *)table, unk1, frameReset);
 	if (queryGameFlag(0xEF))
 		unk1 = 0;
 
@@ -1002,8 +1002,8 @@ int KyraEngine_v1::processSceneChange(int *table, int unk1, int frameReset) {
 	return returnValue;
 }
 
-int KyraEngine_v1::changeScene(int facing) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::changeScene(%d)", facing);
+int KyraEngine_LoK::changeScene(int facing) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::changeScene(%d)", facing);
 	if (queryGameFlag(0xEF)) {
 		if (_currentCharacter->sceneId == 5)
 			return 0;
@@ -1120,7 +1120,7 @@ int KyraEngine_v1::changeScene(int facing) {
 	return returnValue;
 }
 
-void KyraEngine_v1::setCharactersInDefaultScene() {
+void KyraEngine_LoK::setCharactersInDefaultScene() {
 	static const uint32 defaultSceneTable[][4] = {
 		{ 0xFFFF, 0x0004, 0x0003, 0xFFFF },
 		{ 0xFFFF, 0x0022, 0xFFFF, 0x0000 },
@@ -1143,7 +1143,7 @@ void KyraEngine_v1::setCharactersInDefaultScene() {
 	}
 }
 
-void KyraEngine_v1::setCharactersPositions(int character) {
+void KyraEngine_LoK::setCharactersPositions(int character) {
 	static uint16 initXPosTable[] = {
 		0x3200, 0x0024, 0x2230, 0x2F00, 0x0020, 0x002B,
 		0x00CA, 0x00F0, 0x0082, 0x00A2, 0x0042
@@ -1164,16 +1164,16 @@ void KyraEngine_v1::setCharactersPositions(int character) {
 #pragma mark - Pathfinder
 #pragma mark -
 
-int KyraEngine_v1::findWay(int x, int y, int toX, int toY, int *moveTable, int moveTableSize) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::findWay(%d, %d, %d, %d, %p, %d)", x, y, toX, toY, (const void *)moveTable, moveTableSize);
+int KyraEngine_LoK::findWay(int x, int y, int toX, int toY, int *moveTable, int moveTableSize) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::findWay(%d, %d, %d, %d, %p, %d)", x, y, toX, toY, (const void *)moveTable, moveTableSize);
 	int ret = KyraEngine::findWay(x, y, toX, toY, moveTable, moveTableSize);
 	if (ret == 0x7D00)
 		return 0;
 	return getMoveTableSize(moveTable);
 }
 
-bool KyraEngine_v1::lineIsPassable(int x, int y) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::lineIsPassable(%d, %d)", x, y);
+bool KyraEngine_LoK::lineIsPassable(int x, int y) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::lineIsPassable(%d, %d)", x, y);
 	if (queryGameFlag(0xEF)) {
 		if (_currentCharacter->sceneId == 5)
 			return true;
@@ -1233,8 +1233,8 @@ bool KyraEngine_v1::lineIsPassable(int x, int y) {
 
 #pragma mark -
 
-void KyraEngine_v1::setupSceneResource(int sceneId) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setupSceneResource(%d)", sceneId);
+void KyraEngine_LoK::setupSceneResource(int sceneId) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setupSceneResource(%d)", sceneId);
 	if (!_flags.isTalkie)
 		return;
 
diff --git a/engines/kyra/screen_v1.cpp b/engines/kyra/screen_lok.cpp
index 7af01358e5..011c90dde9 100644
--- a/engines/kyra/screen_v1.cpp
+++ b/engines/kyra/screen_lok.cpp
@@ -23,19 +23,19 @@
  *
  */
 
-#include "kyra/kyra_v1.h"
-#include "kyra/screen_v1.h"
+#include "kyra/kyra_lok.h"
+#include "kyra/screen_lok.h"
 
 namespace Kyra {
 
 #define BITBLIT_RECTS 10
 
-Screen_v1::Screen_v1(KyraEngine_v1 *vm, OSystem *system)
+Screen_LoK::Screen_LoK(KyraEngine_LoK *vm, OSystem *system)
 	: Screen(vm, system) {
 	_vm = vm;
 }
 
-Screen_v1::~Screen_v1() {
+Screen_LoK::~Screen_LoK() {
 	delete[] _bitBlitRects;
 
 	for (int i = 0; i < ARRAYSIZE(_saveLoadPage); ++i) {
@@ -52,7 +52,7 @@ Screen_v1::~Screen_v1() {
 	delete[] _unkPtr2;
 }
 
-bool Screen_v1::init() {
+bool Screen_LoK::init() {
 	if (!Screen::init())
 		return false;
 
@@ -73,20 +73,20 @@ bool Screen_v1::init() {
 	return true;
 }
 
-void Screen_v1::setScreenDim(int dim) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::setScreenDim(%d)", dim);
+void Screen_LoK::setScreenDim(int dim) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::setScreenDim(%d)", dim);
 	assert(dim < _screenDimTableCount);
 	_curDim = &_screenDimTable[dim];
 }
 
-const ScreenDim *Screen_v1::getScreenDim(int dim) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::getScreenDim(%d)", dim);
+const ScreenDim *Screen_LoK::getScreenDim(int dim) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::getScreenDim(%d)", dim);
 	assert(dim < _screenDimTableCount);
 	return &_screenDimTable[dim];
 }
 
-void Screen_v1::fadeSpecialPalette(int palIndex, int startIndex, int size, int fadeTime) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::fadeSpecialPalette(%d, %d, %d, %d)", palIndex, startIndex, size, fadeTime);
+void Screen_LoK::fadeSpecialPalette(int palIndex, int startIndex, int size, int fadeTime) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::fadeSpecialPalette(%d, %d, %d, %d)", palIndex, startIndex, size, fadeTime);
 
 	assert(_vm->palTable1()[palIndex]);
 	assert(_currentPalette);
@@ -99,8 +99,8 @@ void Screen_v1::fadeSpecialPalette(int palIndex, int startIndex, int size, int f
 	_system->updateScreen();
 }
 
-void Screen_v1::addBitBlitRect(int x, int y, int w, int h) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::addBitBlitRects(%d, %d, %d, %d)", x, y, w, h);
+void Screen_LoK::addBitBlitRect(int x, int y, int w, int h) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::addBitBlitRects(%d, %d, %d, %d)", x, y, w, h);
 	if (_bitBlitNum >= BITBLIT_RECTS)
 		error("too many bit blit rects");
 
@@ -111,8 +111,8 @@ void Screen_v1::addBitBlitRect(int x, int y, int w, int h) {
 	++_bitBlitNum;
 }
 
-void Screen_v1::bitBlitRects() {
-	debugC(9, kDebugLevelScreen, "Screen_v1::bitBlitRects()");
+void Screen_LoK::bitBlitRects() {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::bitBlitRects()");
 	Rect *cur = _bitBlitRects;
 	while (_bitBlitNum) {
 		_bitBlitNum--;
@@ -121,8 +121,8 @@ void Screen_v1::bitBlitRects() {
 	}
 }
 
-void Screen_v1::savePageToDisk(const char *file, int page) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::savePageToDisk('%s', %d)", file, page);
+void Screen_LoK::savePageToDisk(const char *file, int page) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::savePageToDisk('%s', %d)", file, page);
 	if (!_saveLoadPage[page/2]) {
 		_saveLoadPage[page/2] = new uint8[SCREEN_W * SCREEN_H];
 		assert(_saveLoadPage[page/2]);
@@ -145,8 +145,8 @@ void Screen_v1::savePageToDisk(const char *file, int page) {
 	}
 }
 
-void Screen_v1::loadPageFromDisk(const char *file, int page) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::loadPageFromDisk('%s', %d)", file, page);
+void Screen_LoK::loadPageFromDisk(const char *file, int page) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::loadPageFromDisk('%s', %d)", file, page);
 	copyBlockToPage(page, 0, 0, SCREEN_W, SCREEN_H, _saveLoadPage[page/2]);
 	delete[] _saveLoadPage[page/2];
 
@@ -163,8 +163,8 @@ void Screen_v1::loadPageFromDisk(const char *file, int page) {
 	}	_saveLoadPage[page/2] = 0;
 }
 
-void Screen_v1::deletePageFromDisk(int page) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::deletePageFromDisk(%d)", page);
+void Screen_LoK::deletePageFromDisk(int page) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::deletePageFromDisk(%d)", page);
 	delete[] _saveLoadPage[page/2];
 	_saveLoadPage[page/2] = 0;
 
@@ -174,8 +174,8 @@ void Screen_v1::deletePageFromDisk(int page) {
 	}
 }
 
-void Screen_v1::copyBackgroundBlock(int x, int page, int flag) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::copyBackgroundBlock(%d, %d, %d)", x, page, flag);
+void Screen_LoK::copyBackgroundBlock(int x, int page, int flag) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::copyBackgroundBlock(%d, %d, %d)", x, page, flag);
 
 	if (x < 1)
 		return;
@@ -216,17 +216,17 @@ void Screen_v1::copyBackgroundBlock(int x, int page, int flag) {
 	_curPage = oldVideoPage;
 }
 
-void Screen_v1::copyBackgroundBlock2(int x) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::copyBackgroundBlock2(%d)", x);
+void Screen_LoK::copyBackgroundBlock2(int x) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::copyBackgroundBlock2(%d)", x);
 	copyBackgroundBlock(x, 4, 1);
 }
 
-void Screen_v1::setTextColorMap(const uint8 *cmap) {
-	debugC(9, kDebugLevelScreen, "Screen_v1::setTextColorMap(%p)", (const void *)cmap);
+void Screen_LoK::setTextColorMap(const uint8 *cmap) {
+	debugC(9, kDebugLevelScreen, "Screen_LoK::setTextColorMap(%p)", (const void *)cmap);
 	setTextColor(cmap, 0, 11);
 }
 
-int Screen_v1::getRectSize(int x, int y) {
+int Screen_LoK::getRectSize(int x, int y) {
 	if (x < 1)
 		x = 1;
 	else if (x > 40)
diff --git a/engines/kyra/screen_v1.h b/engines/kyra/screen_lok.h
index 10219ae6b5..74df23a543 100644
--- a/engines/kyra/screen_v1.h
+++ b/engines/kyra/screen_lok.h
@@ -23,19 +23,19 @@
  *
  */
 
-#ifndef KYRA_SCREEN_V1_H
-#define KYRA_SCREEN_V1_H
+#ifndef KYRA_SCREEN_LOK_H
+#define KYRA_SCREEN_LOK_H
 
 #include "kyra/screen.h"
 
 namespace Kyra {
 
-class KyraEngine_v1;
+class KyraEngine_LoK;
 
-class Screen_v1 : public Screen {
+class Screen_LoK : public Screen {
 public:
-	Screen_v1(KyraEngine_v1 *vm, OSystem *system);
-	virtual ~Screen_v1();
+	Screen_LoK(KyraEngine_LoK *vm, OSystem *system);
+	virtual ~Screen_LoK();
 
 	bool init();
 
@@ -59,7 +59,7 @@ public:
 	void bitBlitRects();
 
 protected:
-	KyraEngine_v1 *_vm;
+	KyraEngine_LoK *_vm;
 
 	static const ScreenDim _screenDimTable[];
 	static const int _screenDimTableCount;
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_lok.cpp
index 6eb02c7511..3f578d9e0f 100644
--- a/engines/kyra/script_v1.cpp
+++ b/engines/kyra/script_lok.cpp
@@ -27,29 +27,29 @@
 #include "common/endian.h"
 #include "common/system.h"
 
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/script.h"
 #include "kyra/screen.h"
 #include "kyra/sprites.h"
 #include "kyra/wsamovie.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/text.h"
 #include "kyra/timer.h"
 
 namespace Kyra {
-int KyraEngine_v1::o1_magicInMouseItem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_magicInMouseItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_magicInMouseItem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_magicInMouseItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	magicInMouseItem(stackPos(0), stackPos(1), -1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_characterSays(EMCState *script) {
+int KyraEngine_LoK::o1_characterSays(EMCState *script) {
 	_skipFlag = false;
 	if (_flags.isTalkie) {
-		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_characterSays(%p) (%d, '%s', %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
+		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_characterSays(%p) (%d, '%s', %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
 		characterSays(stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
 	} else {
-		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2));
+		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2));
 		const char *string = stackPosString(0);
 
 		if ((_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) && _flags.lang == Common::JA_JPN) {
@@ -74,8 +74,8 @@ int KyraEngine_v1::o1_characterSays(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_pauseTicks(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_pauseTicks(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_pauseTicks(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseTicks(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	if (stackPos(1)) {
 		warning("STUB: special o1_pauseTicks");
 		// delete this after correct implementing
@@ -86,34 +86,34 @@ int KyraEngine_v1::o1_pauseTicks(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_drawSceneAnimShape(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_drawSceneAnimShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine_LoK::o1_drawSceneAnimShape(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_drawSceneAnimShape(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	_screen->drawShape(stackPos(4), _sprites->_sceneShapes[stackPos(0)], stackPos(1), stackPos(2), 0, (stackPos(3) != 0) ? 1 : 0);
 	return 0;
 }
 
-int KyraEngine_v1::o1_queryGameFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_queryGameFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_queryGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
 	return queryGameFlag(stackPos(0));
 }
 
-int KyraEngine_v1::o1_setGameFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setGameFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
 	return setGameFlag(stackPos(0));
 }
 
-int KyraEngine_v1::o1_resetGameFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_resetGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_resetGameFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_resetGameFlag(%p) (0x%X)", (const void *)script, stackPos(0));
 	return resetGameFlag(stackPos(0));
 }
 
-int KyraEngine_v1::o1_runNPCScript(EMCState *script) {
+int KyraEngine_LoK::o1_runNPCScript(EMCState *script) {
 	warning("STUB: o1_runNPCScript");
 	return 0;
 }
 
-int KyraEngine_v1::o1_setSpecialExitList(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setSpecialExitList(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9));
+int KyraEngine_LoK::o1_setSpecialExitList(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setSpecialExitList(%p) (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6), stackPos(7), stackPos(8), stackPos(9));
 
 	for (int i = 0; i < 10; ++i)
 		_exitList[i] = stackPos(i);
@@ -122,20 +122,20 @@ int KyraEngine_v1::o1_setSpecialExitList(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_blockInWalkableRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_blockInWalkableRegion(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_blockInWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_screen->blockInRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_blockOutWalkableRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_blockOutWalkableRegion(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_blockOutWalkableRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_screen->blockOutRegion(stackPos(0), stackPos(1), stackPos(2)-stackPos(0)+1, stackPos(3)-stackPos(1)+1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_walkPlayerToPoint(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_walkPlayerToPoint(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_walkPlayerToPoint(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_walkPlayerToPoint(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 
 	int normalTimers = stackPos(2);
 	if (!normalTimers) {
@@ -162,8 +162,8 @@ int KyraEngine_v1::o1_walkPlayerToPoint(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_dropItemInScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_dropItemInScene(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_dropItemInScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_dropItemInScene(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	int item = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -187,8 +187,8 @@ int KyraEngine_v1::o1_dropItemInScene(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_drawAnimShapeIntoScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_drawAnimShapeIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_drawAnimShapeIntoScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_drawAnimShapeIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	_screen->hideMouse();
 	_animator->restoreAllObjectBackgrounds();
 	int shape = stackPos(0);
@@ -205,50 +205,50 @@ int KyraEngine_v1::o1_drawAnimShapeIntoScene(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_createMouseItem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_createMouseItem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_createMouseItem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_createMouseItem(%p) (%d)", (const void *)script, stackPos(0));
 	createMouseItem(stackPos(0));
 	return 0;
 }
 
-int KyraEngine_v1::o1_savePageToDisk(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_savePageToDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
+int KyraEngine_LoK::o1_savePageToDisk(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_savePageToDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
 	_screen->savePageToDisk(stackPosString(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine_v1::o1_sceneAnimOn(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_sceneAnimOn(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_sceneAnimOn(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_sceneAnimOn(%p) (%d)", (const void *)script, stackPos(0));
 	_sprites->_anims[stackPos(0)].play = true;
 	return 0;
 }
 
-int KyraEngine_v1::o1_sceneAnimOff(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_sceneAnimOff(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_sceneAnimOff(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_sceneAnimOff(%p) (%d)", (const void *)script, stackPos(0));
 	_sprites->_anims[stackPos(0)].play = false;
 	return 0;
 }
 
-int KyraEngine_v1::o1_getElapsedSeconds(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getElapsedSeconds(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_getElapsedSeconds(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getElapsedSeconds(%p) ()", (const void *)script);
 	return _system->getMillis() / 1000;
 }
 
-int KyraEngine_v1::o1_mouseIsPointer(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_mouseIsPointer(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_mouseIsPointer(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_mouseIsPointer(%p) ()", (const void *)script);
 	if (_itemInHand == -1)
 		return 1;
 	return 0;
 }
 
-int KyraEngine_v1::o1_destroyMouseItem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_destroyMouseItem(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_destroyMouseItem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_destroyMouseItem(%p) ()", (const void *)script);
 	destroyMouseItem();
 	return 0;
 }
 
-int KyraEngine_v1::o1_runSceneAnimUntilDone(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_runSceneAnimUntilDone(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_runSceneAnimUntilDone(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_runSceneAnimUntilDone(%p) (%d)", (const void *)script, stackPos(0));
 	_screen->hideMouse();
 	_animator->restoreAllObjectBackgrounds();
 	_sprites->_anims[stackPos(0)].play = true;
@@ -265,61 +265,61 @@ int KyraEngine_v1::o1_runSceneAnimUntilDone(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_fadeSpecialPalette(EMCState *script) {
+int KyraEngine_LoK::o1_fadeSpecialPalette(EMCState *script) {
 	if (_flags.platform == Common::kPlatformAmiga) {
-		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fadeSpecialPalette(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_fadeSpecialPalette(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 		if (_currentCharacter->sceneId != 45) {
 			if (stackPos(0) == 13) {
 				memcpy(_screen->getPalette(0), _screen->getPalette(0) + 384*3, 32*3);
 				_screen->setScreenPalette(_screen->getPalette(0));
 			}
 		} else {
-			warning("KyraEngine_v1::o1_fadeSpecialPalette not implemented");
+			warning("KyraEngine_LoK::o1_fadeSpecialPalette not implemented");
 		}
 	} else {
-		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fadeSpecialPalette(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_fadeSpecialPalette(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 		_screen->fadeSpecialPalette(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	}
 	return 0;
 }
 
-int KyraEngine_v1::o1_playAdlibSound(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playAdlibSound(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_playAdlibSound(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_playAdlibSound(%p) (%d)", (const void *)script, stackPos(0));
 	snd_playSoundEffect(stackPos(0));
 	return 0;
 }
 
-int KyraEngine_v1::o1_playAdlibScore(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playAdlibScore(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_playAdlibScore(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_playAdlibScore(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	snd_playWanderScoreViaMap(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine_v1::o1_phaseInSameScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_phaseInSameScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_phaseInSameScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_phaseInSameScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	transcendScenes(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine_v1::o1_setScenePhasingFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setScenePhasingFlag(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_setScenePhasingFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setScenePhasingFlag(%p) ()", (const void *)script);
 	_scenePhasingFlag = 1;
 	return 1;
 }
 
-int KyraEngine_v1::o1_resetScenePhasingFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_resetScenePhasingFlag(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_resetScenePhasingFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_resetScenePhasingFlag(%p) ()", (const void *)script);
 	_scenePhasingFlag = 0;
 	return 0;
 }
 
-int KyraEngine_v1::o1_queryScenePhasingFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryScenePhasingFlag(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_queryScenePhasingFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_queryScenePhasingFlag(%p) ()", (const void *)script);
 	return _scenePhasingFlag;
 }
 
-int KyraEngine_v1::o1_sceneToDirection(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_sceneToDirection(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_sceneToDirection(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_sceneToDirection(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < _roomTableSize);
 	Room *curRoom = &_roomTable[stackPos(0)];
 	uint16 returnValue = 0xFFFF;
@@ -348,8 +348,8 @@ int KyraEngine_v1::o1_sceneToDirection(EMCState *script) {
 	return returnValue;
 }
 
-int KyraEngine_v1::o1_setBirthstoneGem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setBirthstoneGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setBirthstoneGem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setBirthstoneGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	int index = stackPos(0);
 	if (index < 4 && index >= 0) {
 		_birthstoneGemTable[index] = stackPos(1);
@@ -358,62 +358,62 @@ int KyraEngine_v1::o1_setBirthstoneGem(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_placeItemInGenericMapScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_placeItemInGenericMapScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_placeItemInGenericMapScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_placeItemInGenericMapScene(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	placeItemInGenericMapScene(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine_v1::o1_setBrandonStatusBit(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setBrandonStatusBit(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));
 	_brandonStatusBit |= stackPos(0);
 	return 0;
 }
 
-int KyraEngine_v1::o1_pauseSeconds(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_pauseSeconds(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_pauseSeconds(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseSeconds(%p) (%d)", (const void *)script, stackPos(0));
 	if (stackPos(0) > 0 && !_skipFlag)
 		delay(stackPos(0)*1000, true);
 	_skipFlag = false;
 	return 0;
 }
 
-int KyraEngine_v1::o1_getCharactersLocation(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharactersLocation(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getCharactersLocation(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharactersLocation(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].sceneId;
 }
 
-int KyraEngine_v1::o1_runNPCSubscript(EMCState *script) {
+int KyraEngine_LoK::o1_runNPCSubscript(EMCState *script) {
 	warning("STUB: o1_runNPCSubscript");
 	return 0;
 }
 
-int KyraEngine_v1::o1_magicOutMouseItem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_magicOutMouseItem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_magicOutMouseItem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_magicOutMouseItem(%p) (%d)", (const void *)script, stackPos(0));
 	magicOutMouseItem(stackPos(0), -1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_internalAnimOn(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_internalAnimOn(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_internalAnimOn(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_internalAnimOn(%p) (%d)", (const void *)script, stackPos(0));
 	_animator->sprites()[stackPos(0)].active = 1;
 	return 0;
 }
 
-int KyraEngine_v1::o1_forceBrandonToNormal(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_forceBrandonToNormal(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_forceBrandonToNormal(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_forceBrandonToNormal(%p) ()", (const void *)script);
 	checkAmuletAnimFlags();
 	return 0;
 }
 
-int KyraEngine_v1::o1_poisonDeathNow(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_poisonDeathNow(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_poisonDeathNow(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_poisonDeathNow(%p) ()", (const void *)script);
 	seq_poisonDeathNow(1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_setScaleMode(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setScaleMode(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_setScaleMode(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setScaleMode(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int len = stackPos(0);
 	int setValue1 = stackPos(1);
 	int start2 = stackPos(2);
@@ -430,8 +430,8 @@ int KyraEngine_v1::o1_setScaleMode(EMCState *script) {
 	return _scaleMode;
 }
 
-int KyraEngine_v1::o1_openWSAFile(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_openWSAFile(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_openWSAFile(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_openWSAFile(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3));
 
 	const char *filename = stackPosString(0);
 	int wsaIndex = stackPos(1);
@@ -442,8 +442,8 @@ int KyraEngine_v1::o1_openWSAFile(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_closeWSAFile(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_closeWSAFile(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_closeWSAFile(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_closeWSAFile(%p) (%d)", (const void *)script, stackPos(0));
 
 	int wsaIndex = stackPos(0);
 	if (_movieObjects[wsaIndex])
@@ -452,8 +452,8 @@ int KyraEngine_v1::o1_closeWSAFile(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_runWSAFromBeginningToEnd(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_runWSAFromBeginningToEnd(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine_LoK::o1_runWSAFromBeginningToEnd(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_runWSAFromBeginningToEnd(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 
 	_screen->hideMouse();
 
@@ -493,8 +493,8 @@ int KyraEngine_v1::o1_runWSAFromBeginningToEnd(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_displayWSAFrame(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_displayWSAFrame(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine_LoK::o1_displayWSAFrame(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_displayWSAFrame(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int frame = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -520,14 +520,14 @@ int KyraEngine_v1::o1_displayWSAFrame(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_enterNewScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_enterNewScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine_LoK::o1_enterNewScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_enterNewScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	enterNewScene(stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	return 0;
 }
 
-int KyraEngine_v1::o1_setSpecialEnterXAndY(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setSpecialEnterXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setSpecialEnterXAndY(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setSpecialEnterXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_brandonPosX = stackPos(0);
 	_brandonPosY = stackPos(1);
 	if (_brandonPosX + 1 == 0 && _brandonPosY + 1 == 0)
@@ -535,8 +535,8 @@ int KyraEngine_v1::o1_setSpecialEnterXAndY(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_runWSAFrames(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_runWSAFrames(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine_LoK::o1_runWSAFrames(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_runWSAFrames(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	int xpos = stackPos(0);
 	int ypos = stackPos(1);
 	int delayTime = stackPos(2);
@@ -562,8 +562,8 @@ int KyraEngine_v1::o1_runWSAFrames(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_popBrandonIntoScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_popBrandonIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_popBrandonIntoScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_popBrandonIntoScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int changeScaleMode = stackPos(3);
 	int xpos = (int16)(stackPos(0) & 0xFFFC);
 	int ypos = (int16)(stackPos(1) & 0xFFFE);
@@ -576,7 +576,7 @@ int KyraEngine_v1::o1_popBrandonIntoScene(EMCState *script) {
 	int yOffset = _defaultShapeTable[0].yOffset;
 	int width = _defaultShapeTable[0].w << 3;
 	int height = _defaultShapeTable[0].h;
-	Animator_v1::AnimObject *curAnim = _animator->actors();
+	Animator_LoK::AnimObject *curAnim = _animator->actors();
 
 	if (changeScaleMode) {
 		curAnim->x1 = _currentCharacter->x1;
@@ -611,8 +611,8 @@ int KyraEngine_v1::o1_popBrandonIntoScene(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_restoreAllObjectBackgrounds(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreAllObjectBackgrounds(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_restoreAllObjectBackgrounds(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_restoreAllObjectBackgrounds(%p) (%d)", (const void *)script, stackPos(0));
 	int disable = stackPos(0);
 	int activeBackup = 0;
 	if (disable) {
@@ -625,22 +625,22 @@ int KyraEngine_v1::o1_restoreAllObjectBackgrounds(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_setCustomPaletteRange(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCustomPaletteRange(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_setCustomPaletteRange(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCustomPaletteRange(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	memcpy(_screen->getPalette(1) + stackPos(1)*3, _specialPalettes[stackPos(0)], stackPos(2)*3);
 	return 0;
 }
 
-int KyraEngine_v1::o1_loadPageFromDisk(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_loadPageFromDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
+int KyraEngine_LoK::o1_loadPageFromDisk(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_loadPageFromDisk(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
 	_screen->loadPageFromDisk(stackPosString(0), stackPos(1));
 	_animator->_updateScreen = true;
 	return 0;
 }
 
-int KyraEngine_v1::o1_customPrintTalkString(EMCState *script) {
+int KyraEngine_LoK::o1_customPrintTalkString(EMCState *script) {
 	if (_flags.isTalkie) {
-		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_customPrintTalkString(%p) (%d, '%s', %d, %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF);
+		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_customPrintTalkString(%p) (%d, '%s', %d, %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF);
 
 		if (speechEnabled()) {
 			snd_voiceWaitForFinish();
@@ -651,7 +651,7 @@ int KyraEngine_v1::o1_customPrintTalkString(EMCState *script) {
 		if (textEnabled())
 			_text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2);
 	} else {
-		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_customPrintTalkString(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF);
+		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_customPrintTalkString(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF);
 		_skipFlag = false;
 		_text->printTalkTextMessage(stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF, 0, 2);
 	}
@@ -659,36 +659,36 @@ int KyraEngine_v1::o1_customPrintTalkString(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_restoreCustomPrintBackground(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreCustomPrintBackground(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_restoreCustomPrintBackground(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_restoreCustomPrintBackground(%p) ()", (const void *)script);
 	_text->restoreTalkTextMessageBkgd(2, 0);
 	return 0;
 }
 
-int KyraEngine_v1::o1_hideMouse(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_hideMouse(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_hideMouse(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_hideMouse(%p) ()", (const void *)script);
 	_screen->hideMouse();
 	return 0;
 }
 
-int KyraEngine_v1::o1_showMouse(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_showMouse(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_showMouse(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_showMouse(%p) ()", (const void *)script);
 	_screen->showMouse();
 	return 0;
 }
 
-int KyraEngine_v1::o1_getCharacterX(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharacterX(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getCharacterX(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharacterX(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].x1;
 }
 
-int KyraEngine_v1::o1_getCharacterY(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharacterY(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getCharacterY(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharacterY(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].y1;
 }
 
-int KyraEngine_v1::o1_changeCharactersFacing(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_changeCharactersFacing(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_changeCharactersFacing(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_changeCharactersFacing(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	int character = stackPos(0);
 	int facing = stackPos(1);
 	int newAnimFrame = stackPos(2);
@@ -705,8 +705,8 @@ int KyraEngine_v1::o1_changeCharactersFacing(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_copyWSARegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_copyWSARegion(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine_LoK::o1_copyWSARegion(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_copyWSARegion(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	int xpos = stackPos(0);
 	int ypos = stackPos(1);
 	int width = stackPos(2);
@@ -718,8 +718,8 @@ int KyraEngine_v1::o1_copyWSARegion(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_printText(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_printText(%p) ('%s', %d, %d, 0x%X, 0x%X)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine_LoK::o1_printText(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_printText(%p) ('%s', %d, %d, 0x%X, 0x%X)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	if (_flags.lang == Common::JA_JPN && stackPos(3) == 7)
 		_screen->printText(stackPosString(0), stackPos(1), stackPos(2), 0, 0x80);
 	else
@@ -728,19 +728,19 @@ int KyraEngine_v1::o1_printText(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_random(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_random(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_random(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_random(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < stackPos(1));
 	return _rnd.getRandomNumberRng(stackPos(0), stackPos(1));
 }
 
-int KyraEngine_v1::o1_loadSoundFile(EMCState *script) {
+int KyraEngine_LoK::o1_loadSoundFile(EMCState *script) {
 	warning("STUB: o1_loadSoundFile");
 	return 0;
 }
 
-int KyraEngine_v1::o1_displayWSAFrameOnHidPage(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_displayWSAFrameOnHidPage(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine_LoK::o1_displayWSAFrameOnHidPage(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_displayWSAFrameOnHidPage(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int frame = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -768,8 +768,8 @@ int KyraEngine_v1::o1_displayWSAFrameOnHidPage(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_displayWSASequentialFrames(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_displayWSASequentialFrames(%p) (%d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6));
+int KyraEngine_LoK::o1_displayWSASequentialFrames(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_displayWSASequentialFrames(%p) (%d, %d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5), stackPos(6));
 	int startFrame = stackPos(0);
 	int endFrame = stackPos(1);
 	int xpos = stackPos(2);
@@ -844,8 +844,8 @@ int KyraEngine_v1::o1_displayWSASequentialFrames(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_drawCharacterStanding(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_drawCharacterStanding(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_drawCharacterStanding(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_drawCharacterStanding(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int character = stackPos(0);
 	int animFrame = stackPos(1);
 	int newFacing = stackPos(2);
@@ -859,14 +859,14 @@ int KyraEngine_v1::o1_drawCharacterStanding(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_internalAnimOff(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_internalAnimOff(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_internalAnimOff(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_internalAnimOff(%p) (%d)", (const void *)script, stackPos(0));
 	_animator->sprites()[stackPos(0)].active = 0;
 	return 0;
 }
 
-int KyraEngine_v1::o1_changeCharactersXAndY(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_changeCharactersXAndY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_changeCharactersXAndY(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_changeCharactersXAndY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	Character *ch = &_characterList[stackPos(0)];
 	int16 x = stackPos(1);
 	int16 y = stackPos(2);
@@ -881,26 +881,26 @@ int KyraEngine_v1::o1_changeCharactersXAndY(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_clearSceneAnimatorBeacon(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_clearSceneAnimatorBeacon(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_clearSceneAnimatorBeacon(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_clearSceneAnimatorBeacon(%p) ()", (const void *)script);
 	_sprites->_sceneAnimatorBeaconFlag = 0;
 	return 0;
 }
 
-int KyraEngine_v1::o1_querySceneAnimatorBeacon(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_querySceneAnimatorBeacon(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_querySceneAnimatorBeacon(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_querySceneAnimatorBeacon(%p) ()", (const void *)script);
 	return _sprites->_sceneAnimatorBeaconFlag;
 }
 
-int KyraEngine_v1::o1_refreshSceneAnimator(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_refreshSceneAnimator(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_refreshSceneAnimator(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_refreshSceneAnimator(%p) ()", (const void *)script);
 	_sprites->updateSceneAnims();
 	_animator->updateAllObjectShapes();
 	return 0;
 }
 
-int KyraEngine_v1::o1_placeItemInOffScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_placeItemInOffScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_placeItemInOffScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_placeItemInOffScene(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	int item = stackPos(0);
 	int xpos = stackPos(1);
 	int ypos = stackPos(2);
@@ -918,8 +918,8 @@ int KyraEngine_v1::o1_placeItemInOffScene(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_wipeDownMouseItem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_wipeDownMouseItem(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_wipeDownMouseItem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_wipeDownMouseItem(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	_screen->hideMouse();
 	wipeDownMouseItem(stackPos(1), stackPos(2));
 	destroyMouseItem();
@@ -927,8 +927,8 @@ int KyraEngine_v1::o1_wipeDownMouseItem(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_placeCharacterInOtherScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_placeCharacterInOtherScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine_LoK::o1_placeCharacterInOtherScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_placeCharacterInOtherScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	int id = stackPos(0);
 	int sceneId = stackPos(1);
 	int xpos = (int16)(stackPos(2) & 0xFFFC);
@@ -944,19 +944,19 @@ int KyraEngine_v1::o1_placeCharacterInOtherScene(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_getKey(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getKey(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_getKey(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getKey(%p) ()", (const void *)script);
 	waitForEvent();
 	return 0;
 }
 
-int KyraEngine_v1::o1_specificItemInInventory(EMCState *script) {
+int KyraEngine_LoK::o1_specificItemInInventory(EMCState *script) {
 	warning("STUB: o1_specificItemInInventory");
 	return 0;
 }
 
-int KyraEngine_v1::o1_popMobileNPCIntoScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_popMobileNPCIntoScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), (int16)(stackPos(4) & 0xFFFC), (int8)(stackPos(5) & 0xFE));
+int KyraEngine_LoK::o1_popMobileNPCIntoScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_popMobileNPCIntoScene(%p) (%d, %d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), (int16)(stackPos(4) & 0xFFFC), (int8)(stackPos(5) & 0xFE));
 	int character = stackPos(0);
 	int sceneId = stackPos(1);
 	int animFrame = stackPos(2);
@@ -976,25 +976,25 @@ int KyraEngine_v1::o1_popMobileNPCIntoScene(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_mobileCharacterInScene(EMCState *script) {
+int KyraEngine_LoK::o1_mobileCharacterInScene(EMCState *script) {
 	warning("STUB: o1_mobileCharacterInScene");
 	return 0;
 }
 
-int KyraEngine_v1::o1_hideMobileCharacter(EMCState *script) {
+int KyraEngine_LoK::o1_hideMobileCharacter(EMCState *script) {
 	warning("STUB: o1_hideMobileCharacter");
 	return 0;
 }
 
-int KyraEngine_v1::o1_unhideMobileCharacter(EMCState *script) {
+int KyraEngine_LoK::o1_unhideMobileCharacter(EMCState *script) {
 	warning("STUB: o1_unhideMobileCharacter");
 	return 0;
 }
 
-int KyraEngine_v1::o1_setCharactersLocation(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCharactersLocation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setCharactersLocation(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharactersLocation(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	Character *ch = &_characterList[stackPos(0)];
-	Animator_v1::AnimObject *animObj = &_animator->actors()[stackPos(0)];
+	Animator_LoK::AnimObject *animObj = &_animator->actors()[stackPos(0)];
 	int newScene = stackPos(1);
 	if (_currentCharacter->sceneId == ch->sceneId) {
 		if (_currentCharacter->sceneId != newScene)
@@ -1008,8 +1008,8 @@ int KyraEngine_v1::o1_setCharactersLocation(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_walkCharacterToPoint(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_walkCharacterToPoint(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_walkCharacterToPoint(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_walkCharacterToPoint(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	int character = stackPos(0);
 	int toX = stackPos(1);
 	int toY = stackPos(2);
@@ -1090,8 +1090,8 @@ int KyraEngine_v1::o1_walkCharacterToPoint(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_specialEventDisplayBrynnsNote(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_specialEventDisplayBrynnsNote(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_specialEventDisplayBrynnsNote(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_specialEventDisplayBrynnsNote(%p) ()", (const void *)script);
 	_screen->hideMouse();
 	_screen->savePageToDisk("HIDPAGE.TMP", 2);
 	_screen->savePageToDisk("SEENPAGE.TMP", 0);
@@ -1112,8 +1112,8 @@ int KyraEngine_v1::o1_specialEventDisplayBrynnsNote(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_specialEventRemoveBrynnsNote(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_specialEventRemoveBrynnsNote(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_specialEventRemoveBrynnsNote(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_specialEventRemoveBrynnsNote(%p) ()", (const void *)script);
 	_screen->hideMouse();
 	_screen->loadPageFromDisk("SEENPAGE.TMP", 0);
 	_screen->loadPageFromDisk("HIDPAGE.TMP", 2);
@@ -1123,14 +1123,14 @@ int KyraEngine_v1::o1_specialEventRemoveBrynnsNote(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_setLogicPage(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setLogicPage(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setLogicPage(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setLogicPage(%p) (%d)", (const void *)script, stackPos(0));
 	_screen->_curPage = stackPos(0);
 	return stackPos(0);
 }
 
-int KyraEngine_v1::o1_fatPrint(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fatPrint(%p) ('%s', %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine_LoK::o1_fatPrint(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_fatPrint(%p) ('%s', %d, %d, %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 
 	// Workaround for bug #1582672 ("KYRA1: Text crippled and drawn wrong")
 	// I'm not sure how the original handles this, since it seems to call
@@ -1142,14 +1142,14 @@ int KyraEngine_v1::o1_fatPrint(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_preserveAllObjectBackgrounds(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_preserveAllObjectBackgrounds(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_preserveAllObjectBackgrounds(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_preserveAllObjectBackgrounds(%p) ()", (const void *)script);
 	_animator->preserveAllBackgrounds();
 	return 0;
 }
 
-int KyraEngine_v1::o1_updateSceneAnimations(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_updateSceneAnimations(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_updateSceneAnimations(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_updateSceneAnimations(%p) (%d)", (const void *)script, stackPos(0));
 	int times = stackPos(0);
 	while (times--) {
 		_sprites->updateSceneAnims();
@@ -1158,24 +1158,24 @@ int KyraEngine_v1::o1_updateSceneAnimations(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_sceneAnimationActive(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_sceneAnimationActive(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_sceneAnimationActive(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_sceneAnimationActive(%p) (%d)", (const void *)script, stackPos(0));
 	return _sprites->_anims[stackPos(0)].play;
 }
 
-int KyraEngine_v1::o1_setCharactersMovementDelay(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCharactersMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setCharactersMovementDelay(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharactersMovementDelay(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_timer->setDelay(stackPos(0)+5, stackPos(1));
 	return 0;
 }
 
-int KyraEngine_v1::o1_getCharactersFacing(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharactersFacing(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getCharactersFacing(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharactersFacing(%p) (%d)", (const void *)script, stackPos(0));
 	return _characterList[stackPos(0)].facing;
 }
 
-int KyraEngine_v1::o1_bkgdScrollSceneAndMasksRight(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_bkgdScrollSceneAndMasksRight(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_bkgdScrollSceneAndMasksRight(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_bkgdScrollSceneAndMasksRight(%p) (%d)", (const void *)script, stackPos(0));
 	_screen->copyBackgroundBlock(stackPos(0), 2, 0);
 	_screen->copyBackgroundBlock2(stackPos(0));
 	// update the whole screen
@@ -1188,14 +1188,14 @@ int KyraEngine_v1::o1_bkgdScrollSceneAndMasksRight(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_dispelMagicAnimation(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_dispelMagicAnimation(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_dispelMagicAnimation(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_dispelMagicAnimation(%p) ()", (const void *)script);
 	seq_dispelMagicAnimation();
 	return 0;
 }
 
-int KyraEngine_v1::o1_findBrightestFireberry(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_findBrightestFireberry(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_findBrightestFireberry(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_findBrightestFireberry(%p) ()", (const void *)script);
 	if (_currentCharacter->sceneId >= 187 && _currentCharacter->sceneId <= 198)
 		return 29;
 
@@ -1238,8 +1238,8 @@ int KyraEngine_v1::o1_findBrightestFireberry(EMCState *script) {
 	return brightestFireberry;
 }
 
-int KyraEngine_v1::o1_setFireberryGlowPalette(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setFireberryGlowPalette(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setFireberryGlowPalette(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setFireberryGlowPalette(%p) (%d)", (const void *)script, stackPos(0));
 	int palIndex = 0;
 	switch (stackPos(0)) {
 	case 0x1E:
@@ -1275,21 +1275,21 @@ int KyraEngine_v1::o1_setFireberryGlowPalette(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_setDeathHandlerFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setDeathHandlerFlag(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setDeathHandlerFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setDeathHandlerFlag(%p) (%d)", (const void *)script, stackPos(0));
 	_deathHandler = stackPos(0);
 	return 0;
 }
 
-int KyraEngine_v1::o1_drinkPotionAnimation(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_drinkPotionAnimation(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_drinkPotionAnimation(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_drinkPotionAnimation(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	seq_playDrinkPotionAnim(stackPos(0), stackPos(1), stackPos(2));
 	return 0;
 }
 
-int KyraEngine_v1::o1_makeAmuletAppear(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_makeAmuletAppear(%p) ()", (const void *)script);
-	WSAMovieV1 amulet(this);
+int KyraEngine_LoK::o1_makeAmuletAppear(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_makeAmuletAppear(%p) ()", (const void *)script);
+	WSAMovie_v1 amulet(this);
 	amulet.open("AMULET.WSA", 1, 0);
 	amulet.setX(224);
 	amulet.setY(152);
@@ -1328,8 +1328,8 @@ int KyraEngine_v1::o1_makeAmuletAppear(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_drawItemShapeIntoScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_drawItemShapeIntoScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine_LoK::o1_drawItemShapeIntoScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_drawItemShapeIntoScene(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	int item = stackPos(0);
 	int x = stackPos(1);
 	int y = stackPos(2);
@@ -1355,14 +1355,14 @@ int KyraEngine_v1::o1_drawItemShapeIntoScene(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_setCharactersCurrentFrame(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCharactersCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setCharactersCurrentFrame(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCharactersCurrentFrame(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_characterList[stackPos(0)].currentAnimFrame = stackPos(1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_waitForConfirmationMouseClick(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_waitForConfirmationMouseClick(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_waitForConfirmationMouseClick(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_waitForConfirmationMouseClick(%p) ()", (const void *)script);
 	// if (mouseEnabled) {
 	while (!_mousePressFlag) {
 		updateMousePointer();
@@ -1386,40 +1386,40 @@ int KyraEngine_v1::o1_waitForConfirmationMouseClick(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_pageFlip(EMCState *script) {
+int KyraEngine_LoK::o1_pageFlip(EMCState *script) {
 	warning("STUB: o1_pageFlip");
 	return 0;
 }
 
-int KyraEngine_v1::o1_setSceneFile(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setSceneFile(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setSceneFile(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setSceneFile(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	setSceneFile(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine_v1::o1_getItemInMarbleVase(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getItemInMarbleVase(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_getItemInMarbleVase(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getItemInMarbleVase(%p) ()", (const void *)script);
 	return _marbleVaseItem;
 }
 
-int KyraEngine_v1::o1_setItemInMarbleVase(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setItemInMarbleVase(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setItemInMarbleVase(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setItemInMarbleVase(%p) (%d)", (const void *)script, stackPos(0));
 	_marbleVaseItem = stackPos(0);
 	return 0;
 }
 
-int KyraEngine_v1::o1_addItemToInventory(EMCState *script) {
+int KyraEngine_LoK::o1_addItemToInventory(EMCState *script) {
 	warning("STUB: o1_addItemToInventory");
 	return 0;
 }
 
-int KyraEngine_v1::o1_intPrint(EMCState *script) {
+int KyraEngine_LoK::o1_intPrint(EMCState *script) {
 	warning("STUB: o1_intPrint");
 	return 0;
 }
 
-int KyraEngine_v1::o1_shakeScreen(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_shakeScreen(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_shakeScreen(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_shakeScreen(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	int waitTicks = stackPos(1);
 	int times = stackPos(0);
 
@@ -1431,58 +1431,58 @@ int KyraEngine_v1::o1_shakeScreen(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_createAmuletJewel(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_createAmuletJewel(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_createAmuletJewel(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_createAmuletJewel(%p) (%d)", (const void *)script, stackPos(0));
 	seq_createAmuletJewel(stackPos(0), 0, 0, 0);
 	return 0;
 }
 
-int KyraEngine_v1::o1_setSceneAnimCurrXY(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setSceneAnimCurrXY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_setSceneAnimCurrXY(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setSceneAnimCurrXY(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	_sprites->_anims[stackPos(0)].x = stackPos(1);
 	_sprites->_anims[stackPos(0)].y = stackPos(2);
 	return 0;
 }
 
-int KyraEngine_v1::o1_poisonBrandonAndRemaps(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_poisonBrandonAndRemaps(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_poisonBrandonAndRemaps(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_poisonBrandonAndRemaps(%p) ()", (const void *)script);
 	setBrandonPoisonFlags(1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_fillFlaskWithWater(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fillFlaskWithWater(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_fillFlaskWithWater(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_fillFlaskWithWater(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	seq_fillFlaskWithWater(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine_v1::o1_getCharactersMovementDelay(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getCharactersMovementDelay(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getCharactersMovementDelay(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getCharactersMovementDelay(%p) (%d)", (const void *)script, stackPos(0));
 	return _timer->getDelay(stackPos(0)+5);
 }
 
-int KyraEngine_v1::o1_getBirthstoneGem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getBirthstoneGem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getBirthstoneGem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getBirthstoneGem(%p) (%d)", (const void *)script, stackPos(0));
 	if (stackPos(0) < 4)
 		return _birthstoneGemTable[stackPos(0)];
 	return 0;
 }
 
-int KyraEngine_v1::o1_queryBrandonStatusBit(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_queryBrandonStatusBit(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_queryBrandonStatusBit(%p) (%d)", (const void *)script, stackPos(0));
 	if (_brandonStatusBit & stackPos(0))
 		return 1;
 	return 0;
 }
 
-int KyraEngine_v1::o1_playFluteAnimation(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playFluteAnimation(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_playFluteAnimation(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_playFluteAnimation(%p) ()", (const void *)script);
 	seq_playFluteAnimation();
 	return 0;
 }
 
-int KyraEngine_v1::o1_playWinterScrollSequence(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_playWinterScrollSequence(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_playWinterScrollSequence(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_playWinterScrollSequence(%p) (%d)", (const void *)script, stackPos(0));
 	if (!stackPos(0))
 		seq_winterScroll2();
 	else
@@ -1490,41 +1490,41 @@ int KyraEngine_v1::o1_playWinterScrollSequence(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_getIdolGem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getIdolGem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getIdolGem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getIdolGem(%p) (%d)", (const void *)script, stackPos(0));
 	return _idolGemsTable[stackPos(0)];
 }
 
-int KyraEngine_v1::o1_setIdolGem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setIdolGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setIdolGem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setIdolGem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_idolGemsTable[stackPos(0)] = stackPos(1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_totalItemsInScene(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_totalItemsInScene(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_totalItemsInScene(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_totalItemsInScene(%p) (%d)", (const void *)script, stackPos(0));
 	return countItemsInScene(stackPos(0));
 }
 
-int KyraEngine_v1::o1_restoreBrandonsMovementDelay(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_restoreBrandonsMovementDelay(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_restoreBrandonsMovementDelay(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_restoreBrandonsMovementDelay(%p) ()", (const void *)script);
 	setWalkspeed(_configWalkspeed);
 	return 0;
 }
 
-int KyraEngine_v1::o1_setMousePos(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setMousePos(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setMousePos(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_system->warpMouse(stackPos(0), stackPos(1));
 	return 0;
 }
 
-int KyraEngine_v1::o1_getMouseState(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getMouseState(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_getMouseState(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getMouseState(%p) ()", (const void *)script);
 	return _mouseState;
 }
 
-int KyraEngine_v1::o1_setEntranceMouseCursorTrack(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setEntranceMouseCursorTrack(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
+int KyraEngine_LoK::o1_setEntranceMouseCursorTrack(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setEntranceMouseCursorTrack(%p) (%d, %d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4));
 	_entranceMouseCursorTracks[0] = stackPos(0);
 	_entranceMouseCursorTracks[1] = stackPos(1);
 	_entranceMouseCursorTracks[2] = stackPos(0) + stackPos(2) - 1;
@@ -1533,20 +1533,20 @@ int KyraEngine_v1::o1_setEntranceMouseCursorTrack(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_itemAppearsOnGround(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_itemAppearsOnGround(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
+int KyraEngine_LoK::o1_itemAppearsOnGround(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_itemAppearsOnGround(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
 	processItemDrop(_currentCharacter->sceneId, stackPos(0), stackPos(1), stackPos(2), 2, 0);
 	return 0;
 }
 
-int KyraEngine_v1::o1_setNoDrawShapesFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setNoDrawShapesFlag(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setNoDrawShapesFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setNoDrawShapesFlag(%p) (%d)", (const void *)script, stackPos(0));
 	_animator->_noDrawShapesFlag = stackPos(0);
 	return 0;
 }
 
-int KyraEngine_v1::o1_fadeEntirePalette(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fadeEntirePalette(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_fadeEntirePalette(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_fadeEntirePalette(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	int cmd = stackPos(0);
 	uint8 *fadePal = 0;
 
@@ -1585,8 +1585,8 @@ int KyraEngine_v1::o1_fadeEntirePalette(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_itemOnGroundHere(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_itemOnGroundHere(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_itemOnGroundHere(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_itemOnGroundHere(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < _roomTableSize);
 	Room *curRoom = &_roomTable[stackPos(0)];
 	for (int i = 0; i < 12; ++i) {
@@ -1596,19 +1596,19 @@ int KyraEngine_v1::o1_itemOnGroundHere(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_queryCauldronState(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryCauldronState(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_queryCauldronState(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_queryCauldronState(%p) ()", (const void *)script);
 	return _cauldronState;
 }
 
-int KyraEngine_v1::o1_setCauldronState(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCauldronState(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setCauldronState(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCauldronState(%p) (%d)", (const void *)script, stackPos(0));
 	_cauldronState = stackPos(0);
 	return _cauldronState;
 }
 
-int KyraEngine_v1::o1_queryCrystalState(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_queryCrystalState(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_queryCrystalState(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_queryCrystalState(%p) (%d)", (const void *)script, stackPos(0));
 	if (!stackPos(0))
 		return _crystalState[0];
 	else if (stackPos(0) == 1)
@@ -1616,8 +1616,8 @@ int KyraEngine_v1::o1_queryCrystalState(EMCState *script) {
 	return -1;
 }
 
-int KyraEngine_v1::o1_setCrystalState(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setCrystalState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setCrystalState(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setCrystalState(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	if (!stackPos(0))
 		_crystalState[0] = stackPos(1);
 	else if (stackPos(0) == 1)
@@ -1625,13 +1625,13 @@ int KyraEngine_v1::o1_setCrystalState(EMCState *script) {
 	return stackPos(1);
 }
 
-int KyraEngine_v1::o1_setPaletteRange(EMCState *script) {
+int KyraEngine_LoK::o1_setPaletteRange(EMCState *script) {
 	warning("STUB: o1_setPaletteRange");
 	return 0;
 }
 
-int KyraEngine_v1::o1_shrinkBrandonDown(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_shrinkBrandonDown(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_shrinkBrandonDown(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_shrinkBrandonDown(%p) (%d)", (const void *)script, stackPos(0));
 	int delayTime = stackPos(0);
 	checkAmuletAnimFlags();
 	int scaleValue = _scaleTable[_currentCharacter->y1];
@@ -1656,8 +1656,8 @@ int KyraEngine_v1::o1_shrinkBrandonDown(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_growBrandonUp(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_growBrandonUp(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_growBrandonUp(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_growBrandonUp(%p) ()", (const void *)script);
 	int scaleValue = _scaleTable[_currentCharacter->y1];
 	int scale = 0;
 	if (_scaleMode)
@@ -1677,123 +1677,123 @@ int KyraEngine_v1::o1_growBrandonUp(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_setBrandonScaleXAndY(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setBrandonScaleXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setBrandonScaleXAndY(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setBrandonScaleXAndY(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	_animator->_brandonScaleX = stackPos(0);
 	_animator->_brandonScaleY = stackPos(1);
 	return 0;
 }
 
-int KyraEngine_v1::o1_resetScaleMode(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_resetScaleMode(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_resetScaleMode(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_resetScaleMode(%p) ()", (const void *)script);
 	_scaleMode = 0;
 	return 0;
 }
 
-int KyraEngine_v1::o1_getScaleDepthTableValue(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getScaleDepthTableValue(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getScaleDepthTableValue(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getScaleDepthTableValue(%p) (%d)", (const void *)script, stackPos(0));
 	assert(stackPos(0) < ARRAYSIZE(_scaleTable));
 	return _scaleTable[stackPos(0)];
 }
 
-int KyraEngine_v1::o1_setScaleDepthTableValue(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setScaleDepthTableValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setScaleDepthTableValue(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setScaleDepthTableValue(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < ARRAYSIZE(_scaleTable));
 	_scaleTable[stackPos(0)] = stackPos(1);
 	return stackPos(1);
 }
 
-int KyraEngine_v1::o1_message(EMCState *script) {
+int KyraEngine_LoK::o1_message(EMCState *script) {
 	if (_flags.isTalkie) {
-		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_message(%p) (%d, '%s', %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2));
+		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_message(%p) (%d, '%s', %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2));
 		drawSentenceCommand(stackPosString(1), stackPos(2));
 	} else {
-		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_message(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
+		debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_message(%p) ('%s', %d)", (const void *)script, stackPosString(0), stackPos(1));
 		drawSentenceCommand(stackPosString(0), stackPos(1));
 	}
 
 	return 0;
 }
 
-int KyraEngine_v1::o1_checkClickOnNPC(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_checkClickOnNPC(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_checkClickOnNPC(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_checkClickOnNPC(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	return checkForNPCScriptRun(stackPos(0), stackPos(1));
 }
 
-int KyraEngine_v1::o1_getFoyerItem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_getFoyerItem(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_getFoyerItem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_getFoyerItem(%p) (%d)", (const void *)script, stackPos(0));
 	assert(stackPos(0) < ARRAYSIZE(_foyerItemTable));
 	return _foyerItemTable[stackPos(0)];
 }
 
-int KyraEngine_v1::o1_setFoyerItem(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setFoyerItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
+int KyraEngine_LoK::o1_setFoyerItem(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setFoyerItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1));
 	assert(stackPos(0) < ARRAYSIZE(_foyerItemTable));
 	_foyerItemTable[stackPos(0)] = stackPos(1);
 	return stackPos(1);
 }
 
-int KyraEngine_v1::o1_setNoItemDropRegion(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setNoItemDropRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
+int KyraEngine_LoK::o1_setNoItemDropRegion(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setNoItemDropRegion(%p) (%d, %d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	addToNoDropRects(stackPos(0), stackPos(1), stackPos(2), stackPos(3));
 	return 0;
 }
 
-int KyraEngine_v1::o1_walkMalcolmOn(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_walkMalcolmOn(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_walkMalcolmOn(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_walkMalcolmOn(%p) ()", (const void *)script);
 	if (!_malcolmFlag)
 		_malcolmFlag = 1;
 	return 0;
 }
 
-int KyraEngine_v1::o1_passiveProtection(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_passiveProtection(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_passiveProtection(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_passiveProtection(%p) ()", (const void *)script);
 	return 1;
 }
 
-int KyraEngine_v1::o1_setPlayingLoop(EMCState *script) {
+int KyraEngine_LoK::o1_setPlayingLoop(EMCState *script) {
 	warning("STUB: o1_setPlayingLoop");
 	return 0;
 }
 
-int KyraEngine_v1::o1_brandonToStoneSequence(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_brandonToStoneSequence(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_brandonToStoneSequence(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_brandonToStoneSequence(%p) ()", (const void *)script);
 	seq_brandonToStone();
 	return 0;
 }
 
-int KyraEngine_v1::o1_brandonHealingSequence(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_brandonHealingSequence(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_brandonHealingSequence(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_brandonHealingSequence(%p) ()", (const void *)script);
 	seq_brandonHealing();
 	return 0;
 }
 
-int KyraEngine_v1::o1_protectCommandLine(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_protectCommandLine(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_protectCommandLine(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_protectCommandLine(%p) (%d)", (const void *)script, stackPos(0));
 	return stackPos(0);
 }
 
-int KyraEngine_v1::o1_pauseMusicSeconds(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_pauseMusicSeconds(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_pauseMusicSeconds(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_pauseMusicSeconds(%p) ()", (const void *)script);
 	// if music disabled
 	//     return
 	o1_pauseSeconds(script);
 	return 0;
 }
 
-int KyraEngine_v1::o1_resetMaskRegion(EMCState *script) {
+int KyraEngine_LoK::o1_resetMaskRegion(EMCState *script) {
 	warning("STUB: o1_resetMaskRegion");
 	return 0;
 }
 
-int KyraEngine_v1::o1_setPaletteChangeFlag(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_setPaletteChangeFlag(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_setPaletteChangeFlag(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_setPaletteChangeFlag(%p) (%d)", (const void *)script, stackPos(0));
 	_paletteChanged = stackPos(0);
 	return _paletteChanged;
 }
 
-int KyraEngine_v1::o1_fillRect(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_fillRect(%p) (%d, %d, %d, %d, %d, 0x%X)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
+int KyraEngine_LoK::o1_fillRect(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_fillRect(%p) (%d, %d, %d, %d, %d, 0x%X)", (const void *)script, stackPos(0), stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
 	int videoPageBackup = _screen->_curPage;
 	_screen->_curPage = stackPos(0);
 	_screen->fillRect(stackPos(1), stackPos(2), stackPos(3), stackPos(4), stackPos(5));
@@ -1801,29 +1801,29 @@ int KyraEngine_v1::o1_fillRect(EMCState *script) {
 	return 0;
 }
 
-int KyraEngine_v1::o1_vocUnload(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_vocUnload(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_vocUnload(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_vocUnload(%p) ()", (const void *)script);
 	// this should unload all voc files (not needed)
 	return 0;
 }
 
-int KyraEngine_v1::o1_vocLoad(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_vocLoad(%p) (%d)", (const void *)script, stackPos(0));
+int KyraEngine_LoK::o1_vocLoad(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_vocLoad(%p) (%d)", (const void *)script, stackPos(0));
 	// this should load the specified voc file (not needed)
 	return 0;
 }
 
-int KyraEngine_v1::o1_dummy(EMCState *script) {
-	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_v1::o1_dummy(%p) ()", (const void *)script);
+int KyraEngine_LoK::o1_dummy(EMCState *script) {
+	debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_dummy(%p) ()", (const void *)script);
 	return 0;
 }
 
 #pragma mark -
 
-typedef Common::Functor1Mem<EMCState*, int, KyraEngine_v1> OpcodeV1;
+typedef Common::Functor1Mem<EMCState*, int, KyraEngine_LoK> OpcodeV1;
 #define SetOpcodeTable(x) table = &x;
-#define Opcode(x) table->push_back(new OpcodeV1(this, &KyraEngine_v1::x))
-void KyraEngine_v1::setupOpcodeTable() {
+#define Opcode(x) table->push_back(new OpcodeV1(this, &KyraEngine_LoK::x))
+void KyraEngine_LoK::setupOpcodeTable() {
 	Common::Array<const Opcode *> *table = 0;
 
 	SetOpcodeTable(_opcodes);
diff --git a/engines/kyra/seqplayer.cpp b/engines/kyra/seqplayer.cpp
index 9a670ce85f..73d69ef10c 100644
--- a/engines/kyra/seqplayer.cpp
+++ b/engines/kyra/seqplayer.cpp
@@ -40,7 +40,7 @@
 
 namespace Kyra {
 
-SeqPlayer::SeqPlayer(KyraEngine_v1 *vm, OSystem *system) {
+SeqPlayer::SeqPlayer(KyraEngine_LoK *vm, OSystem *system) {
 	_vm = vm;
 	_system = system;
 
diff --git a/engines/kyra/seqplayer.h b/engines/kyra/seqplayer.h
index ce7f4648df..7e1b06d955 100644
--- a/engines/kyra/seqplayer.h
+++ b/engines/kyra/seqplayer.h
@@ -26,13 +26,13 @@
 #ifndef KYRA_SEQPLAYER_H
 #define KYRA_SEQPLAYER_H
 
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 
 namespace Kyra {
 
 class SeqPlayer {
 public:
-	SeqPlayer(KyraEngine_v1 *vm, OSystem *system);
+	SeqPlayer(KyraEngine_LoK *vm, OSystem *system);
 	~SeqPlayer();
 
 	void setCopyViewOffs(bool offs) {
@@ -46,7 +46,7 @@ public:
 
 	uint8 *setPanPages(int pageNum, int shape);
 protected:
-	KyraEngine_v1 *_vm;
+	KyraEngine_LoK *_vm;
 	OSystem *_system;
 	Screen *_screen;
 	Sound *_sound;
diff --git a/engines/kyra/sequences_hof.cpp b/engines/kyra/sequences_hof.cpp
index bed94b2ae0..fc0959f444 100644
--- a/engines/kyra/sequences_hof.cpp
+++ b/engines/kyra/sequences_hof.cpp
@@ -333,7 +333,7 @@ void KyraEngine_HoF::seq_playSequences(int startSeq, int endSeq) {
 	seq_uninit();
 }
 
-int KyraEngine_HoF::seq_introWestwood(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introWestwood(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	debugC(9, kDebugLevelMain, "KyraEngine_HoF::seq_introWestwood(%p, %i, %i, %i)", (const void*)wsaObj, x, y, frm);
 
 	if (frm == -2) {
@@ -346,7 +346,7 @@ int KyraEngine_HoF::seq_introWestwood(WSAMovieV2 *wsaObj, int x, int y, int frm)
 	return 0;
 }
 
-int KyraEngine_HoF::seq_introTitle(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introTitle(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	debugC(9, kDebugLevelMain, "KyraEngine_HoF::seq_introTitle(%p, %i, %i, %i)", (const void*)wsaObj, x, y, frm);
 
 	if (frm == 1) {
@@ -368,7 +368,7 @@ int KyraEngine_HoF::seq_introTitle(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_introOverview(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introOverview(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	debugC(9, kDebugLevelMain, "KyraEngine_HoF::seq_introOverview(%p, %i, %i, %i)", (const void*)wsaObj, x, y, frm);
 
 	uint8 *tmpPal = &(_screen->getPalette(3)[0x101]);
@@ -468,7 +468,7 @@ int KyraEngine_HoF::seq_introOverview(WSAMovieV2 *wsaObj, int x, int y, int frm)
 	return 0;
 }
 
-int KyraEngine_HoF::seq_introLibrary(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introLibrary(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	debugC(9, kDebugLevelMain, "KyraEngine_HoF::seq_introLibrary(%p, %i, %i, %i)", (const void*)wsaObj, x, y, frm);
 
 	switch (_seqFrameCounter) {
@@ -544,7 +544,7 @@ int KyraEngine_HoF::seq_introLibrary(WSAMovieV2 *wsaObj, int x, int y, int frm)
 }
 
 
-int KyraEngine_HoF::seq_introHand(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introHand(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	debugC(9, kDebugLevelMain, "KyraEngine_HoF::seq_introHand(%p, %i, %i, %i)", (const void*)wsaObj, x, y, frm);
 
 	switch (_seqFrameCounter) {
@@ -628,7 +628,7 @@ int KyraEngine_HoF::seq_introHand(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_introPoint(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introPoint(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == -2) {
 		seq_waitForTextsTimeout();
 		_seqEndTime = 0;
@@ -661,7 +661,7 @@ int KyraEngine_HoF::seq_introPoint(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_introZanfaun(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introZanfaun(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == -2) {
 		seq_waitForTextsTimeout();
 		_seqEndTime = 0;
@@ -750,7 +750,7 @@ int KyraEngine_HoF::seq_introZanfaun(WSAMovieV2 *wsaObj, int x, int y, int frm)
 	return 0;
 }
 
-int KyraEngine_HoF::seq_introOver1(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introOver1(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 2)
 		seq_waitForTextsTimeout();
 	else if (frm == 3)
@@ -759,13 +759,13 @@ int KyraEngine_HoF::seq_introOver1(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 }
 
 
-int KyraEngine_HoF::seq_introOver2(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introOver2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 1)
 		seq_playTalkText(12);
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introForest(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introForest(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 11)
 		seq_waitForTextsTimeout();
 	else if (frm == 12)
@@ -774,7 +774,7 @@ int KyraEngine_HoF::seq_introForest(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introDragon(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introDragon(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 11)
 		seq_waitForTextsTimeout();
 	else if (frm == 3)
@@ -782,17 +782,17 @@ int KyraEngine_HoF::seq_introDragon(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introDarm(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introDarm(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	//NULLSUB (at least in fm-towns version)
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introLibrary2(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introLibrary2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	//NULLSUB (at least in fm-towns version)
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introMarco(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introMarco(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 36) {
 		seq_waitForTextsTimeout();
 		_seqEndTime = 0;
@@ -800,34 +800,34 @@ int KyraEngine_HoF::seq_introMarco(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introHand1a(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introHand1a(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	//NULLSUB (at least in fm-towns version)
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introHand1b(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introHand1b(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 15)
 		frm = 12;
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introHand1c(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introHand1c(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 8)
 		frm = 4;
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introHand2(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introHand2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	//NULLSUB (at least in fm-towns version)
 	return frm;
 }
 
-int KyraEngine_HoF::seq_introHand3(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_introHand3(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	//NULLSUB (at least in fm-towns version)
 	return frm;
 }
 
-int KyraEngine_HoF::seq_finaleFunters(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFunters(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	uint32 endtime = 0;
 	int chatX = 0;
 	int chatY = 0;
@@ -911,7 +911,7 @@ int KyraEngine_HoF::seq_finaleFunters(WSAMovieV2 *wsaObj, int x, int y, int frm)
 	return 0;
 }
 
-int KyraEngine_HoF::seq_finaleFerb(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFerb(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	uint32 endtime = 0;
 	int chatX = 0;
 	int chatY = 0;
@@ -995,7 +995,7 @@ int KyraEngine_HoF::seq_finaleFerb(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_finaleFish(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFish(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	uint32 endtime = 0;
 	int chatX = 0;
 	int chatY = 0;
@@ -1072,7 +1072,7 @@ int KyraEngine_HoF::seq_finaleFish(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_finaleFheep(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFheep(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	uint32 endtime = 0;
 	int chatX = 0;
 	int chatY = 0;
@@ -1154,7 +1154,7 @@ int KyraEngine_HoF::seq_finaleFheep(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_finaleFarmer(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFarmer(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	uint32 endtime = 0;
 	int chatX = 0;
 	int chatY = 0;
@@ -1224,7 +1224,7 @@ int KyraEngine_HoF::seq_finaleFarmer(WSAMovieV2 *wsaObj, int x, int y, int frm)
 	return 0;
 }
 
-int KyraEngine_HoF::seq_finaleFuards(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFuards(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	uint32 endtime = 0;
 	int chatX = 0;
 	int chatY = 0;
@@ -1324,7 +1324,7 @@ int KyraEngine_HoF::seq_finaleFuards(WSAMovieV2 *wsaObj, int x, int y, int frm)
 	return 0;
 }
 
-int KyraEngine_HoF::seq_finaleFirates(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFirates(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	uint32 endtime = 0;
 	int chatX = 0;
 	int chatY = 0;
@@ -1416,7 +1416,7 @@ int KyraEngine_HoF::seq_finaleFirates(WSAMovieV2 *wsaObj, int x, int y, int frm)
 	return 0;
 }
 
-int KyraEngine_HoF::seq_finaleFrash(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFrash(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	int tmp = 0;
 
 	switch (frm) {
@@ -1544,7 +1544,7 @@ void KyraEngine_HoF::seq_finaleActorScreen() {
 	_sound->loadSoundFile(0);
 }
 
-int KyraEngine_HoF::seq_finaleFiggle(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_finaleFiggle(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (_seqFrameCounter == 10)
 		_seqEndTime = 0;
 	if (_seqFrameCounter == 10 || _seqFrameCounter == 5 || _seqFrameCounter == 7)
@@ -1554,18 +1554,18 @@ int KyraEngine_HoF::seq_finaleFiggle(WSAMovieV2 *wsaObj, int x, int y, int frm)
 	return frm;
 }
 
-int KyraEngine_HoF::seq_demoVirgin(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoVirgin(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (!frm)
 		delay(50 * _tickLength);
 	return 0;
 }
 
-int KyraEngine_HoF::seq_demoWestwood(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoWestwood(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (!frm)
 		_sound->playTrack(2);
 	return 0;
 }
-int KyraEngine_HoF::seq_demoTitle(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoTitle(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (!frm) {
 		_sound->playTrack(3);
 	} else if (frm == 25) {
@@ -1576,7 +1576,7 @@ int KyraEngine_HoF::seq_demoTitle(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_demoHill(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoHill(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (!frm) {
 		_sound->playTrack(4);
 	} else if (frm == 25) {
@@ -1596,7 +1596,7 @@ int KyraEngine_HoF::seq_demoHill(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_demoOuthome(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoOuthome(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	switch (frm) {
 	case 12:
 		seq_playTalkText(4);
@@ -1637,7 +1637,7 @@ int KyraEngine_HoF::seq_demoOuthome(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_demoWharf(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoWharf(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (!_seqFrameCounter)
 		seq_loadNestedSequence(0, kSequenceDemoWharf2);
 
@@ -1678,7 +1678,7 @@ int KyraEngine_HoF::seq_demoWharf(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_demoDinob(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoDinob(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 0) {
 		if (!(_seqFrameCounter/8)) {
 			seq_loadNestedSequence(0, kSequenceDemoDinob2);
@@ -1699,7 +1699,7 @@ int KyraEngine_HoF::seq_demoDinob(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_demoFisher(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoFisher(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (((_system->getMillis() - _seqStartTime) / (5 * _tickLength)) > 0) {
 		_seqStartTime = _system->getMillis();
 		if (!_seqFrameCounter) {
@@ -1741,14 +1741,14 @@ int KyraEngine_HoF::seq_demoFisher(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return 0;
 }
 
-int KyraEngine_HoF::seq_demoWharf2(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoWharf2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 69)
 		_seqWsaCurrentFrame = 8;
 
 	return frm;
 }
 
-int KyraEngine_HoF::seq_demoDinob2(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoDinob2(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	switch (frm) {
 	case 19:
 		seq_playTalkText(13);
@@ -1778,17 +1778,17 @@ int KyraEngine_HoF::seq_demoDinob2(WSAMovieV2 *wsaObj, int x, int y, int frm) {
 	return frm;
 }
 
-int KyraEngine_HoF::seq_demoWater(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoWater(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	if (frm == 1)
 		seq_playTalkText(11);
 	return frm;
 }
 
-int KyraEngine_HoF::seq_demoBail(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoBail(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	return frm;
 }
 
-int KyraEngine_HoF::seq_demoDig(WSAMovieV2 *wsaObj, int x, int y, int frm) {
+int KyraEngine_HoF::seq_demoDig(WSAMovie_v2 *wsaObj, int x, int y, int frm) {
 	return frm;
 }
 
@@ -2048,7 +2048,7 @@ void KyraEngine_HoF::seq_loadNestedSequence(int wsaNum, int seqNum) {
 	NestedSequence s = _sequences->seqn[seqNum];
 
 	if (!_activeWSA[wsaNum].movie) {
-		_activeWSA[wsaNum].movie = new WSAMovieV2(this, _screen);
+		_activeWSA[wsaNum].movie = new WSAMovie_v2(this, _screen);
 		assert(_activeWSA[wsaNum].movie);
 	}
 
@@ -2328,7 +2328,7 @@ void KyraEngine_HoF::seq_printCreditsString(uint16 strIndex, int x, int y, const
 	_seqTextColor[0] = seqTextColor0;
 }
 
-void KyraEngine_HoF::seq_playWsaSyncDialogue(uint16 strIndex, uint16 vocIndex, int textColor, int x, int y, int width, WSAMovieV2 *wsa, int firstframe, int lastframe, int wsaXpos, int wsaYpos) {
+void KyraEngine_HoF::seq_playWsaSyncDialogue(uint16 strIndex, uint16 vocIndex, int textColor, int x, int y, int width, WSAMovie_v2 *wsa, int firstframe, int lastframe, int wsaXpos, int wsaYpos) {
 	int dur = int(strlen(_sequenceStrings[strIndex])) * (_flags.isTalkie ? 7 : 15);
 	int entry = textEnabled() ? seq_setTextEntry(strIndex, x, y, dur, width) : strIndex;
 	_activeText[entry].textcolor = textColor;
@@ -2574,7 +2574,7 @@ void KyraEngine_HoF::seq_scrollPage() {
 }
 
 void KyraEngine_HoF::seq_showStarcraftLogo() {
-	WSAMovieV2 *ci = new WSAMovieV2(this, _screen);
+	WSAMovie_v2 *ci = new WSAMovie_v2(this, _screen);
 	assert(ci);
 	_screen->clearPage(2);
 	_res->loadPakFile("INTROGEN.PAK");
@@ -2616,7 +2616,7 @@ void KyraEngine_HoF::seq_showStarcraftLogo() {
 
 void KyraEngine_HoF::seq_init() {
 	_seqProcessedString = new char[200];
-	_seqWsa = new WSAMovieV2(this, _screen);
+	_seqWsa = new WSAMovie_v2(this, _screen);
 	_activeWSA = new ActiveWSA[8];
 	_activeText = new ActiveText[10];
 
diff --git a/engines/kyra/sequences_v1.cpp b/engines/kyra/sequences_lok.cpp
index 607def3583..904eae9d48 100644
--- a/engines/kyra/sequences_v1.cpp
+++ b/engines/kyra/sequences_lok.cpp
@@ -23,14 +23,14 @@
  *
  */
 
-#include "kyra/kyra.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/seqplayer.h"
-#include "kyra/screen_v1.h"
+#include "kyra/screen_lok.h"
 #include "kyra/resource.h"
 #include "kyra/sound.h"
 #include "kyra/sprites.h"
 #include "kyra/wsamovie.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/text.h"
 #include "kyra/timer.h"
 
@@ -40,8 +40,8 @@
 
 namespace Kyra {
 
-void KyraEngine_v1::seq_demo() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_demo()");
+void KyraEngine_LoK::seq_demo() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_demo()");
 
 	snd_playTheme(0, 2);
 
@@ -90,18 +90,18 @@ void KyraEngine_v1::seq_demo() {
 	_sound->haltTrack();
 }
 
-void KyraEngine_v1::seq_intro() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_intro()");
+void KyraEngine_LoK::seq_intro() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_intro()");
 
 	if (_flags.isTalkie)
 		_res->loadPakFile("INTRO.VRM");
 
 	static const IntroProc introProcTable[] = {
-		&KyraEngine_v1::seq_introLogos,
-		&KyraEngine_v1::seq_introStory,
-		&KyraEngine_v1::seq_introMalcolmTree,
-		&KyraEngine_v1::seq_introKallakWriting,
-		&KyraEngine_v1::seq_introKallakMalcolm
+		&KyraEngine_LoK::seq_introLogos,
+		&KyraEngine_LoK::seq_introStory,
+		&KyraEngine_LoK::seq_introMalcolmTree,
+		&KyraEngine_LoK::seq_introKallakWriting,
+		&KyraEngine_LoK::seq_introKallakMalcolm
 	};
 
 	Common::InSaveFile *in;
@@ -130,8 +130,8 @@ void KyraEngine_v1::seq_intro() {
 		_res->unloadPakFile("INTRO.VRM");
 }
 
-void KyraEngine_v1::seq_introLogos() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_introLogos()");
+void KyraEngine_LoK::seq_introLogos() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_introLogos()");
 
 	if (_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) {
 		_screen->loadBitmap("LOGO.CPS", 3, 3, _screen->_currentPalette);
@@ -232,8 +232,8 @@ void KyraEngine_v1::seq_introLogos() {
 	_seq->playSequence(_seq_Forest, true);
 }
 
-void KyraEngine_v1::seq_introStory() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_introStory()");
+void KyraEngine_LoK::seq_introStory() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_introStory()");
 	_screen->clearPage(3);
 	_screen->clearPage(0);
 
@@ -279,15 +279,15 @@ void KyraEngine_v1::seq_introStory() {
 	delay(360 * _tickLength);
 }
 
-void KyraEngine_v1::seq_introMalcolmTree() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_introMalcolmTree()");
+void KyraEngine_LoK::seq_introMalcolmTree() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_introMalcolmTree()");
 	_screen->_curPage = 0;
 	_screen->clearPage(3);
 	_seq->playSequence(_seq_MalcolmTree, true);
 }
 
-void KyraEngine_v1::seq_introKallakWriting() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_introKallakWriting()");
+void KyraEngine_LoK::seq_introKallakWriting() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_introKallakWriting()");
 	_seq->makeHandShapes();
 	_screen->setAnimBlockPtr(5060);
 	_screen->_charWidth = -2;
@@ -295,13 +295,13 @@ void KyraEngine_v1::seq_introKallakWriting() {
 	_seq->playSequence(_seq_KallakWriting, true);
 }
 
-void KyraEngine_v1::seq_introKallakMalcolm() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_introKallakMalcolm()");
+void KyraEngine_LoK::seq_introKallakMalcolm() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_introKallakMalcolm()");
 	_screen->clearPage(3);
 	_seq->playSequence(_seq_KallakMalcolm, true);
 }
 
-void KyraEngine_v1::seq_createAmuletJewel(int jewel, int page, int noSound, int drawOnly) {
+void KyraEngine_LoK::seq_createAmuletJewel(int jewel, int page, int noSound, int drawOnly) {
 	debugC(9, kDebugLevelMain, "seq_createAmuletJewel(%d, %d, %d, %d)", jewel, page, noSound, drawOnly);
 	static const uint16 specialJewelTable[] = {
 		0x167, 0x162, 0x15D, 0x158, 0x153, 0xFFFF
@@ -361,7 +361,7 @@ void KyraEngine_v1::seq_createAmuletJewel(int jewel, int page, int noSound, int
 	setGameFlag(0x55+jewel);
 }
 
-void KyraEngine_v1::seq_brandonHealing() {
+void KyraEngine_LoK::seq_brandonHealing() {
 	debugC(9, kDebugLevelMain, "seq_brandonHealing()");
 	if (!(_deathHandler & 8))
 		return;
@@ -392,7 +392,7 @@ void KyraEngine_v1::seq_brandonHealing() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_brandonHealing2() {
+void KyraEngine_LoK::seq_brandonHealing2() {
 	debugC(9, kDebugLevelMain, "seq_brandonHealing2()");
 	_screen->hideMouse();
 	checkAmuletAnimFlags();
@@ -416,7 +416,7 @@ void KyraEngine_v1::seq_brandonHealing2() {
 	characterSays(2011, _poisonGone[1], 0, -2);
 }
 
-void KyraEngine_v1::seq_poisonDeathNow(int now) {
+void KyraEngine_LoK::seq_poisonDeathNow(int now) {
 	debugC(9, kDebugLevelMain, "seq_poisonDeathNow(%d)", now);
 	if (!(_brandonStatusBit & 1))
 		return;
@@ -437,7 +437,7 @@ void KyraEngine_v1::seq_poisonDeathNow(int now) {
 	}
 }
 
-void KyraEngine_v1::seq_poisonDeathNowAnim() {
+void KyraEngine_LoK::seq_poisonDeathNowAnim() {
 	debugC(9, kDebugLevelMain, "seq_poisonDeathNowAnim()");
 	_screen->hideMouse();
 	checkAmuletAnimFlags();
@@ -478,7 +478,7 @@ void KyraEngine_v1::seq_poisonDeathNowAnim() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_playFluteAnimation() {
+void KyraEngine_LoK::seq_playFluteAnimation() {
 	debugC(9, kDebugLevelMain, "seq_playFluteAnimation()");
 	_screen->hideMouse();
 	checkAmuletAnimFlags();
@@ -532,7 +532,7 @@ void KyraEngine_v1::seq_playFluteAnimation() {
 	}
 }
 
-void KyraEngine_v1::seq_winterScroll1() {
+void KyraEngine_LoK::seq_winterScroll1() {
 	debugC(9, kDebugLevelMain, "seq_winterScroll1()");
 	_screen->hideMouse();
 	checkAmuletAnimFlags();
@@ -613,7 +613,7 @@ void KyraEngine_v1::seq_winterScroll1() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_winterScroll2() {
+void KyraEngine_LoK::seq_winterScroll2() {
 	debugC(9, kDebugLevelMain, "seq_winterScroll2()");
 	_screen->hideMouse();
 	checkAmuletAnimFlags();
@@ -642,7 +642,7 @@ void KyraEngine_v1::seq_winterScroll2() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_makeBrandonInv() {
+void KyraEngine_LoK::seq_makeBrandonInv() {
 	debugC(9, kDebugLevelMain, "seq_makeBrandonInv()");
 	if (_deathHandler == 8)
 		return;
@@ -668,7 +668,7 @@ void KyraEngine_v1::seq_makeBrandonInv() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_makeBrandonNormal() {
+void KyraEngine_LoK::seq_makeBrandonNormal() {
 	debugC(9, kDebugLevelMain, "seq_makeBrandonNormal()");
 	_screen->hideMouse();
 	_brandonStatusBit |= 0x40;
@@ -684,7 +684,7 @@ void KyraEngine_v1::seq_makeBrandonNormal() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_makeBrandonNormal2() {
+void KyraEngine_LoK::seq_makeBrandonNormal2() {
 	debugC(9, kDebugLevelMain, "seq_makeBrandonNormal2()");
 	_screen->hideMouse();
 	assert(_brandonToWispTable);
@@ -710,7 +710,7 @@ void KyraEngine_v1::seq_makeBrandonNormal2() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_makeBrandonWisp() {
+void KyraEngine_LoK::seq_makeBrandonWisp() {
 	debugC(9, kDebugLevelMain, "seq_makeBrandonWisp()");
 	if (_deathHandler == 8)
 		return;
@@ -752,7 +752,7 @@ void KyraEngine_v1::seq_makeBrandonWisp() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_dispelMagicAnimation() {
+void KyraEngine_LoK::seq_dispelMagicAnimation() {
 	debugC(9, kDebugLevelMain, "seq_dispelMagicAnimation()");
 	if (_deathHandler == 8)
 		return;
@@ -794,7 +794,7 @@ void KyraEngine_v1::seq_dispelMagicAnimation() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_fillFlaskWithWater(int item, int type) {
+void KyraEngine_LoK::seq_fillFlaskWithWater(int item, int type) {
 	debugC(9, kDebugLevelMain, "seq_fillFlaskWithWater(%d, %d)", item, type);
 	int newItem = -1;
 	static const uint8 flaskTable1[] = { 0x46, 0x48, 0x4A, 0x4C };
@@ -827,8 +827,8 @@ void KyraEngine_v1::seq_fillFlaskWithWater(int item, int type) {
 	characterSays(voiceEntries[type], _fullFlask[type], 0, -2);
 }
 
-void KyraEngine_v1::seq_playDrinkPotionAnim(int item, int unk2, int flags) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_playDrinkPotionAnim(%d, %d, %d)", item, unk2, flags);
+void KyraEngine_LoK::seq_playDrinkPotionAnim(int item, int unk2, int flags) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_playDrinkPotionAnim(%d, %d, %d)", item, unk2, flags);
 	uint8 red, green, blue;
 
 	switch (item) {
@@ -919,8 +919,8 @@ void KyraEngine_v1::seq_playDrinkPotionAnim(int item, int unk2, int flags) {
 	_screen->showMouse();
 }
 
-int KyraEngine_v1::seq_playEnd() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_playEnd()");
+int KyraEngine_LoK::seq_playEnd() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_playEnd()");
 	if (_endSequenceSkipFlag)
 		return 0;
 
@@ -931,13 +931,13 @@ int KyraEngine_v1::seq_playEnd() {
 	if (_endSequenceNeedLoading) {
 		snd_playWanderScoreViaMap(50, 1);
 		setupPanPages();
-		_finalA = new WSAMovieV1(this);
+		_finalA = new WSAMovie_v1(this);
 		assert(_finalA);
 		_finalA->open("finala.wsa", 1, 0);
-		_finalB = new WSAMovieV1(this);
+		_finalB = new WSAMovie_v1(this);
 		assert(_finalB);
 		_finalB->open("finalb.wsa", 1, 0);
-		_finalC = new WSAMovieV1(this);
+		_finalC = new WSAMovie_v1(this);
 		assert(_finalC);
 		_endSequenceNeedLoading = 0;
 		_finalC->open("finalc.wsa", 1, 0);
@@ -981,7 +981,7 @@ int KyraEngine_v1::seq_playEnd() {
 			_screen->setScreenPalette(_screen->_currentPalette);
 			_screen->shuffleScreen(8, 8, 304, 128, 2, 0, 1, 0);
 			uint32 nextTime = _system->getMillis() + 120 * _tickLength;
-			_finalA = new WSAMovieV1(this);
+			_finalA = new WSAMovie_v1(this);
 			assert(_finalA);
 			_finalA->open("finald.wsa", 1, 0);
 			_finalA->setX(8); _finalA->setY(8);
@@ -1012,8 +1012,8 @@ int KyraEngine_v1::seq_playEnd() {
 	return 0;
 }
 
-void KyraEngine_v1::seq_brandonToStone() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_brandonToStone()");
+void KyraEngine_LoK::seq_brandonToStone() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_brandonToStone()");
 	_screen->hideMouse();
 	assert(_brandonStoneTable);
 	setupShapes123(_brandonStoneTable, 14, 0);
@@ -1028,8 +1028,8 @@ void KyraEngine_v1::seq_brandonToStone() {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::seq_playEnding() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_playEnding()");
+void KyraEngine_LoK::seq_playEnding() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_playEnding()");
 	if (_quitFlag)
 		return;
 	_screen->hideMouse();
@@ -1052,8 +1052,8 @@ void KyraEngine_v1::seq_playEnding() {
 	seq_playCredits();
 }
 
-void KyraEngine_v1::seq_playCredits() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_playCredits()");
+void KyraEngine_LoK::seq_playCredits() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_playCredits()");
 	static const uint8 colorMap[] = { 0, 0, 0xC, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	static const char stringTerms[] = { 0x5, 0xd, 0x0};
 	static const int numStrings = 250;
@@ -1209,13 +1209,13 @@ void KyraEngine_v1::seq_playCredits() {
 	_screen->showMouse();
 }
 
-bool KyraEngine_v1::seq_skipSequence() const {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::seq_skipSequence()");
+bool KyraEngine_LoK::seq_skipSequence() const {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::seq_skipSequence()");
 	return _quitFlag || _abortIntroFlag;
 }
 
-int KyraEngine_v1::handleMalcolmFlag() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::handleMalcolmFlag()");
+int KyraEngine_LoK::handleMalcolmFlag() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::handleMalcolmFlag()");
 	static uint16 frame = 0;
 	static uint32 timer1 = 0;
 	static uint32 timer2 = 0;
@@ -1383,8 +1383,8 @@ int KyraEngine_v1::handleMalcolmFlag() {
 	return 0;
 }
 
-int KyraEngine_v1::handleBeadState() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::handleBeadState()");
+int KyraEngine_LoK::handleBeadState() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::handleBeadState()");
 	static uint32 timer1 = 0;
 	static uint32 timer2 = 0;
 	static BeadState beadState1 = { -1, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
@@ -1603,8 +1603,8 @@ int KyraEngine_v1::handleBeadState() {
 	return 0;
 }
 
-void KyraEngine_v1::initBeadState(int x, int y, int x2, int y2, int unk, BeadState *ptr) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::initBeadState(%d, %d, %d, %d, %d, %p)", x, y, x2, y2, unk, (const void *)ptr);
+void KyraEngine_LoK::initBeadState(int x, int y, int x2, int y2, int unk, BeadState *ptr) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::initBeadState(%d, %d, %d, %d, %d, %p)", x, y, x2, y2, unk, (const void *)ptr);
 	ptr->unk9 = unk;
 	int xDiff = x2 - x;
 	int yDiff = y2 - y;
@@ -1637,8 +1637,8 @@ void KyraEngine_v1::initBeadState(int x, int y, int x2, int y2, int unk, BeadSta
 	ptr->unk8 = unk2;
 }
 
-int KyraEngine_v1::processBead(int x, int y, int &x2, int &y2, BeadState *ptr) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::processBead(%d, %d, %p, %p, %p)", x, y, (const void *)&x2, (const void *)&y2, (const void *)ptr);
+int KyraEngine_LoK::processBead(int x, int y, int &x2, int &y2, BeadState *ptr) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::processBead(%d, %d, %p, %p, %p)", x, y, (const void *)&x2, (const void *)&y2, (const void *)ptr);
 	if (x == ptr->dstX && y == ptr->dstY)
 		return 1;
 
@@ -1674,8 +1674,8 @@ int KyraEngine_v1::processBead(int x, int y, int &x2, int &y2, BeadState *ptr) {
 	return 0;
 }
 
-void KyraEngine_v1::setupPanPages() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::setupPanPages()");
+void KyraEngine_LoK::setupPanPages() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::setupPanPages()");
 	_screen->savePageToDisk("BKGD.PG", 2);
 	_screen->loadBitmap("BEAD.CPS", 3, 3, 0);
 	if (_flags.platform == Common::kPlatformMacintosh || _flags.platform == Common::kPlatformAmiga) {
@@ -1705,8 +1705,8 @@ void KyraEngine_v1::setupPanPages() {
 	_screen->loadPageFromDisk("BKGD.PG", 2);
 }
 
-void KyraEngine_v1::freePanPages() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::freePanPages()");
+void KyraEngine_LoK::freePanPages() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::freePanPages()");
 	delete _endSequenceBackUpRect;
 	_endSequenceBackUpRect = 0;
 	for (int i = 0; i <= 19; ++i) {
@@ -1715,8 +1715,8 @@ void KyraEngine_v1::freePanPages() {
 	}
 }
 
-void KyraEngine_v1::closeFinalWsa() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::closeFinalWsa()");
+void KyraEngine_LoK::closeFinalWsa() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::closeFinalWsa()");
 	delete _finalA;
 	_finalA = 0;
 	delete _finalB;
@@ -1727,7 +1727,7 @@ void KyraEngine_v1::closeFinalWsa() {
 	_endSequenceNeedLoading = 1;
 }
 
-void KyraEngine_v1::updateKyragemFading() {
+void KyraEngine_LoK::updateKyragemFading() {
 	static const uint8 kyraGemPalette[0x28] = {
 		0x3F, 0x3B, 0x38, 0x34, 0x32, 0x2F, 0x2C, 0x29, 0x25, 0x22,
 		0x1F, 0x1C, 0x19, 0x16, 0x12, 0x0F, 0x0C, 0x0A, 0x06, 0x03,
@@ -1797,8 +1797,8 @@ void KyraEngine_v1::updateKyragemFading() {
 	_kyragemFadingState.timerCount = _system->getMillis() + 120 * _tickLength;
 }
 
-void KyraEngine_v1::drawJewelPress(int jewel, int drawSpecial) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::drawJewelPress(%d, %d)", jewel, drawSpecial);
+void KyraEngine_LoK::drawJewelPress(int jewel, int drawSpecial) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::drawJewelPress(%d, %d)", jewel, drawSpecial);
 	_screen->hideMouse();
 	int shape = 0;
 
@@ -1822,8 +1822,8 @@ void KyraEngine_v1::drawJewelPress(int jewel, int drawSpecial) {
 	_screen->showMouse();
 }
 
-void KyraEngine_v1::drawJewelsFadeOutStart() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::drawJewelsFadeOutStart()");
+void KyraEngine_LoK::drawJewelsFadeOutStart() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::drawJewelsFadeOutStart()");
 	static const uint16 jewelTable1[] = { 0x164, 0x15F, 0x15A, 0x155, 0x150, 0xFFFF };
 	static const uint16 jewelTable2[] = { 0x163, 0x15E, 0x159, 0x154, 0x14F, 0xFFFF };
 	static const uint16 jewelTable3[] = { 0x166, 0x160, 0x15C, 0x157, 0x152, 0xFFFF };
@@ -1842,8 +1842,8 @@ void KyraEngine_v1::drawJewelsFadeOutStart() {
 	}
 }
 
-void KyraEngine_v1::drawJewelsFadeOutEnd(int jewel) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::drawJewelsFadeOutEnd(%d)", jewel);
+void KyraEngine_LoK::drawJewelsFadeOutEnd(int jewel) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::drawJewelsFadeOutEnd(%d)", jewel);
 	static const uint16 jewelTable[] = { 0x153, 0x158, 0x15D, 0x162, 0x148, 0xFFFF };
 	int newDelay = 0;
 
diff --git a/engines/kyra/sound_v1.cpp b/engines/kyra/sound_lok.cpp
index 8293eb7508..398ac085c4 100644
--- a/engines/kyra/sound_v1.cpp
+++ b/engines/kyra/sound_lok.cpp
@@ -24,12 +24,12 @@
  */
 
 #include "kyra/sound.h"
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 
 namespace Kyra {
 
-void KyraEngine_v1::snd_playSoundEffect(int track, int volume) {
-	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_v1::snd_playSoundEffect(%d, %d)", track, volume);
+void KyraEngine_LoK::snd_playSoundEffect(int track, int volume) {
+	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_LoK::snd_playSoundEffect(%d, %d)", track, volume);
 	if ((_flags.platform == Common::kPlatformFMTowns || _flags.platform == Common::kPlatformPC98) && track == 49) {
 		snd_playWanderScoreViaMap(56, 1);
 		return;
@@ -38,8 +38,8 @@ void KyraEngine_v1::snd_playSoundEffect(int track, int volume) {
 	KyraEngine::snd_playSoundEffect(track);
 }
 
-void KyraEngine_v1::snd_playWanderScoreViaMap(int command, int restart) {
-	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_v1::snd_playWanderScoreViaMap(%d, %d)", command, restart);
+void KyraEngine_LoK::snd_playWanderScoreViaMap(int command, int restart) {
+	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_LoK::snd_playWanderScoreViaMap(%d, %d)", command, restart);
 	if (restart)
 		_lastMusicCommand = -1;
 
@@ -61,8 +61,8 @@ void KyraEngine_v1::snd_playWanderScoreViaMap(int command, int restart) {
 	}
 }
 
-void KyraEngine_v1::snd_playVoiceFile(int id) {
-	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_v1::snd_playVoiceFile(%d)", id);
+void KyraEngine_LoK::snd_playVoiceFile(int id) {
+	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_LoK::snd_playVoiceFile(%d)", id);
 	char vocFile[9];
 	assert(id >= 0 && id < 9999);
 	sprintf(vocFile, "%03d", id);
@@ -70,8 +70,8 @@ void KyraEngine_v1::snd_playVoiceFile(int id) {
 	_sound->voicePlay(vocFile);
 }
 
-void KyraEngine_v1::snd_voiceWaitForFinish(bool ingame) {
-	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_v1::snd_voiceWaitForFinish(%d)", ingame);
+void KyraEngine_LoK::snd_voiceWaitForFinish(bool ingame) {
+	debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine_LoK::snd_voiceWaitForFinish(%d)", ingame);
 	while (_sound->voiceIsPlaying() && !_skipFlag) {
 		if (ingame)
 			delay(10, true);
diff --git a/engines/kyra/sprites.cpp b/engines/kyra/sprites.cpp
index 0ba9f456bf..34c2986f25 100644
--- a/engines/kyra/sprites.cpp
+++ b/engines/kyra/sprites.cpp
@@ -30,14 +30,14 @@
 #include "common/system.h"
 #include "common/events.h"
 #include "kyra/screen.h"
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/sprites.h"
 #include "kyra/resource.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 
 namespace Kyra {
 
-Sprites::Sprites(KyraEngine_v1 *vm, OSystem *system) {
+Sprites::Sprites(KyraEngine_LoK *vm, OSystem *system) {
 	_vm = vm;
 	_res = vm->resource();
 	_screen = vm->screen();
@@ -554,7 +554,7 @@ void Sprites::loadSceneShapes() {
 
 void Sprites::refreshSceneAnimObject(uint8 animNum, uint8 shapeNum, uint16 x, uint16 y, bool flipX, bool unkFlag) {
 	debugC(9, kDebugLevelSprites,  "Sprites::refreshSceneAnimObject(%i, %i, %i, %i, %i, %i", animNum, shapeNum, x, y, flipX, unkFlag);
-	Animator_v1::AnimObject &anim = _vm->animator()->sprites()[animNum];
+	Animator_LoK::AnimObject &anim = _vm->animator()->sprites()[animNum];
 	anim.refreshFlag = 1;
 	anim.bkgdChangeFlag = 1;
 
diff --git a/engines/kyra/sprites.h b/engines/kyra/sprites.h
index 3304458fda..212bfc7428 100644
--- a/engines/kyra/sprites.h
+++ b/engines/kyra/sprites.h
@@ -26,7 +26,7 @@
 #ifndef KYRA_SPRITES_H
 #define KYRA_SPRITES_H
 
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 
 namespace Kyra {
 
@@ -63,11 +63,11 @@ struct Anim {
 	bool disable;
 };
 
-class KyraEngine_v1;
+class KyraEngine_LoK;
 
 class Sprites {
 public:
-	Sprites(KyraEngine_v1 *vm, OSystem *system);
+	Sprites(KyraEngine_LoK *vm, OSystem *system);
 	~Sprites();
 
 	void updateSceneAnims();
@@ -86,7 +86,7 @@ public:
 protected:
 	void freeSceneShapes();
 
-	KyraEngine_v1 *_vm;
+	KyraEngine_LoK *_vm;
 	Resource *_res;
 	OSystem *_system;
 	Screen *_screen;
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp
index b81a5838ce..dbe181b84f 100644
--- a/engines/kyra/staticres.cpp
+++ b/engines/kyra/staticres.cpp
@@ -27,16 +27,16 @@
 #include "common/endian.h"
 #include "common/md5.h"
 #include "kyra/kyra.h"
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/kyra_v2.h"
 #include "kyra/kyra_hof.h"
 #include "kyra/kyra_mr.h"
 #include "kyra/screen.h"
-#include "kyra/screen_v1.h"
+#include "kyra/screen_lok.h"
 #include "kyra/screen_hof.h"
 #include "kyra/screen_mr.h"
 #include "kyra/resource.h"
-#include "kyra/gui_v1.h"
+#include "kyra/gui_lok.h"
 #include "kyra/gui_hof.h"
 #include "kyra/gui_mr.h"
 
@@ -932,7 +932,7 @@ uint8 *StaticResource::getFile(const char *name, int &size) {
 
 #pragma mark -
 
-void KyraEngine_v1::initStaticResource() {
+void KyraEngine_LoK::initStaticResource() {
 	int temp = 0;
 	_seq_Forest = _staticres->loadRawData(kForestSeq, temp);
 	_seq_KallakWriting = _staticres->loadRawData(kKallakWritingSeq, temp);
@@ -1041,7 +1041,7 @@ void KyraEngine_v1::initStaticResource() {
 	_soundData = (_flags.platform == Common::kPlatformPC) ? soundData_PC : soundData_TOWNS;
 }
 
-void KyraEngine_v1::loadMouseShapes() {
+void KyraEngine_LoK::loadMouseShapes() {
 	_screen->loadBitmap("MOUSE.CPS", 3, 3, 0);
 	_screen->_curPage = 2;
 	_shapes[0] = _screen->encodeShape(0, 0, 8, 10, 0);
@@ -1057,7 +1057,7 @@ void KyraEngine_v1::loadMouseShapes() {
 	_screen->setShapePages(5, 3);
 }
 
-void KyraEngine_v1::loadCharacterShapes() {
+void KyraEngine_LoK::loadCharacterShapes() {
 	int curImage = 0xFF;
 	int videoPage = _screen->_curPage;
 	_screen->_curPage = 2;
@@ -1078,7 +1078,7 @@ void KyraEngine_v1::loadCharacterShapes() {
 	_screen->_curPage = videoPage;
 }
 
-void KyraEngine_v1::loadSpecialEffectShapes() {
+void KyraEngine_LoK::loadSpecialEffectShapes() {
 	_screen->loadBitmap("EFFECTS.CPS", 3, 3, 0);
 	_screen->_curPage = 2;
 
@@ -1096,7 +1096,7 @@ void KyraEngine_v1::loadSpecialEffectShapes() {
 		_shapes[currShape] = _screen->encodeShape((currShape-201) * 16, 106, 16, 16, 1);
 }
 
-void KyraEngine_v1::loadItems() {
+void KyraEngine_LoK::loadItems() {
 	int shape;
 
 	_screen->loadBitmap("JEWELS3.CPS", 3, 3, 0);
@@ -1150,7 +1150,7 @@ void KyraEngine_v1::loadItems() {
 	delete[] fileData;
 }
 
-void KyraEngine_v1::loadButtonShapes() {
+void KyraEngine_LoK::loadButtonShapes() {
 	_screen->loadBitmap("BUTTONS2.CPS", 3, 3, 0);
 	_screen->_curPage = 2;
 	_gui->_scrollUpButton.data0ShapePtr = _screen->encodeShape(0, 0, 24, 14, 1);
@@ -1162,7 +1162,7 @@ void KyraEngine_v1::loadButtonShapes() {
 	_screen->_curPage = 0;
 }
 
-void KyraEngine_v1::loadMainScreen(int page) {
+void KyraEngine_LoK::loadMainScreen(int page) {
 	_screen->clearPage(page);
 
 	if (_flags.lang == Common::EN_ANY && !_flags.isTalkie && (_flags.platform == Common::kPlatformPC || _flags.platform == Common::kPlatformAmiga))
@@ -1296,7 +1296,7 @@ void KyraEngine_HoF::initStaticResource() {
 	_callbackN = (_flags.isDemo && !_flags.isTalkie) ? hofDemoNestedSequenceCallbacks : hofNestedSequenceCallbacks;
 }
 
-const ScreenDim Screen_v1::_screenDimTable[] = {
+const ScreenDim Screen_LoK::_screenDimTable[] = {
 	{ 0x00, 0x00, 0x28, 0xC8, 0x0F, 0x0C, 0x00, 0x00 },
 	{ 0x08, 0x48, 0x18, 0x38, 0x0F, 0x0C, 0x00, 0x00 },
 	{ 0x01, 0x08, 0x26, 0x80, 0x0F, 0x0C, 0x00, 0x00 },
@@ -1310,7 +1310,7 @@ const ScreenDim Screen_v1::_screenDimTable[] = {
 	{ 0x03, 0x28, 0x22, 0x46, 0x0F, 0x0D, 0x00, 0x00 }
 };
 
-const int Screen_v1::_screenDimTableCount = ARRAYSIZE(Screen_v1::_screenDimTable);
+const int Screen_LoK::_screenDimTableCount = ARRAYSIZE(Screen_LoK::_screenDimTable);
 
 const ScreenDim Screen_HoF::_screenDimTable[] = {
 	{ 0x00, 0x00, 0x28, 0xC8, 0xC7, 0xCF, 0x00, 0x00 },
@@ -1346,23 +1346,23 @@ const int8 KyraEngine::_addYPosTable[] = {
 	 0, -2, -2, -2,  0,  2,  2,  2
 };
 
-const int8 KyraEngine_v1::_charXPosTable[] = {
+const int8 KyraEngine_LoK::_charXPosTable[] = {
 	 0,  4,  4,  4,  0, -4, -4, -4
 };
 
-const int8 KyraEngine_v1::_charYPosTable[] = {
+const int8 KyraEngine_LoK::_charYPosTable[] = {
 	-2, -2,  0,  2,  2,  2,  0, -2
 };
 
-const uint16 KyraEngine_v1::_itemPosX[] = {
+const uint16 KyraEngine_LoK::_itemPosX[] = {
 	95, 115, 135, 155, 175, 95, 115, 135, 155, 175
 };
 
-const uint8 KyraEngine_v1::_itemPosY[] = {
+const uint8 KyraEngine_LoK::_itemPosY[] = {
 	160, 160, 160, 160, 160, 181, 181, 181, 181, 181
 };
 
-void GUI_v1::initStaticResource() {
+void GUI_LoK::initStaticResource() {
 	GUI_V1_BUTTON(_scrollUpButton, 0x12, 1, 1, 1, 0x483, 0, 0, 0, 0x18, 0x0f, 0);
 	GUI_V1_BUTTON(_scrollDownButton, 0x13, 1, 1, 1, 0x483, 0, 0, 0, 0x18, 0x0f, 0);
 
@@ -1377,9 +1377,9 @@ void GUI_v1::initStaticResource() {
 	_menu = new Menu[6];
 	assert(_menu);
 
-	Button::Callback quitPlayingFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::quitPlaying);
-	Button::Callback loadGameMenuFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::loadGameMenu);
-	Button::Callback cancelSubMenuFunctor = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::cancelSubMenu);
+	Button::Callback quitPlayingFunctor = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::quitPlaying);
+	Button::Callback loadGameMenuFunctor = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::loadGameMenu);
+	Button::Callback cancelSubMenuFunctor = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::cancelSubMenu);
 
 	GUI_V1_MENU(_menu[0], -1, -1, 0x100, 0x8B, 248, 249, 250, 0, 251, -1, 8, 0, 5, -1, -1, -1, -1);
 	GUI_V1_MENU_ITEM(_menu[0].item[0], 1, 0, 0, 0, -1, -1, 0x1E, 0xDC, 0x0F, 252, 253, -1, 0, 248, 249, 250, -1, 0, 0, 0, 0, 0);
@@ -1388,16 +1388,16 @@ void GUI_v1::initStaticResource() {
 	GUI_V1_MENU_ITEM(_menu[0].item[3], 1, 0, 0, 0, -1, -1, 0x51, 0xDC, 0x0F, 252, 253, -1, 0, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[0].item[4], 1, 0, 0, 0, -1,  0, 0x6E, 0xDC, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	_menu[0].item[0].callback = loadGameMenuFunctor;
-	_menu[0].item[1].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::saveGameMenu);
-	_menu[0].item[2].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::gameControlsMenu);
+	_menu[0].item[1].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::saveGameMenu);
+	_menu[0].item[2].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::gameControlsMenu);
 	_menu[0].item[3].callback = quitPlayingFunctor;
-	_menu[0].item[4].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::resumeGame);
+	_menu[0].item[4].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::resumeGame);
 	
 	GUI_V1_MENU(_menu[1], -1, -1, 0x140, 0x38, 248, 249, 250, 0, 254,-1, 8, 0, 2, -1, -1, -1, -1);
 	GUI_V1_MENU_ITEM(_menu[1].item[0], 1, 0, 0, 0, 0x18, 0, 0x1E, 0x48, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[1].item[1], 1, 0, 0, 0, 0xD8, 0, 0x1E, 0x48, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
-	_menu[1].item[0].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::quitConfirmYes);
-	_menu[1].item[1].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::quitConfirmNo);
+	_menu[1].item[0].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::quitConfirmYes);
+	_menu[1].item[1].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::quitConfirmNo);
 	
 	GUI_V1_MENU(_menu[2], -1, -1, 0x120, 0xA0, 248, 249, 250, 0, 251, -1, 8, 0, 6, 132, 22, 132, 124);
 	GUI_V1_MENU_ITEM(_menu[2].item[0], 1, 0, 0, 0, -1, 255, 0x27, 0x100, 0x0F, 252, 253, 5, 0, 248, 249, 250, -1, 0, 0, 0, 0, 0);
@@ -1411,7 +1411,7 @@ void GUI_v1::initStaticResource() {
 	GUI_V1_MENU(_menu[3], -1, -1, 288, 67, 248, 249, 250, 0, 251, -1, 8, 0, 2, -1, -1, -1, -1);
 	GUI_V1_MENU_ITEM(_menu[3].item[0], 1, 0, 0, 0, 24, 0, 44, 85, 15, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[3].item[1], 1, 0, 0, 0, 179, 0, 44, 85, 15, 252, 253, -1, 255, 248, 249, 250, -1, 0, 0, 0, 0, 0);
-	_menu[3].item[0].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::savegameConfirm);
+	_menu[3].item[0].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::savegameConfirm);
 	_menu[3].item[1].callback = cancelSubMenuFunctor;
 	
 	GUI_V1_MENU(_menu[4], -1, -1, 0xD0, 0x4C, 248, 249, 250, 0, 251, -1, 8, 0, 2, -1, -1, -1, -1);
@@ -1427,14 +1427,14 @@ void GUI_v1::initStaticResource() {
 	GUI_V1_MENU_ITEM(_menu[5].item[3], 1, 0, 0, 0, 0xA5, 0, 0x51, 0x80, 0x0F, 252, 253, 5, 0, 248, 249, 250, -1, 0, 0x10, 0x53, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[5].item[4], 1, 0, 0, 0, 0xA5, 0, 0x62, 0x80, 0x0F, 252, 253, 5, 0, 248, 249, 250, -1, 0, 0x10, 0x65, 0, 0);
 	GUI_V1_MENU_ITEM(_menu[5].item[5], 1, 0, 0, 0,   -1, 0, 0x7F, 0x6C, 0x0F, 252, 253, -1, 255, 248, 249, 250, -1, -0, 0, 0, 0, 0);
-	_menu[5].item[0].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::controlsChangeMusic);
-	_menu[5].item[1].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::controlsChangeSounds);
-	_menu[5].item[2].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::controlsChangeWalk);
-	_menu[5].item[4].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::controlsChangeText);
-	_menu[5].item[5].callback = BUTTON_FUNCTOR(GUI_v1, this, &GUI_v1::controlsApply);
+	_menu[5].item[0].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeMusic);
+	_menu[5].item[1].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeSounds);
+	_menu[5].item[2].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeWalk);
+	_menu[5].item[4].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsChangeText);
+	_menu[5].item[5].callback = BUTTON_FUNCTOR(GUI_LoK, this, &GUI_LoK::controlsApply);
 }
 
-void KyraEngine_v1::setupButtonData() {
+void KyraEngine_LoK::setupButtonData() {
 	delete[] _buttonData;
 	delete[] _buttonDataListPtr;
 
@@ -1444,9 +1444,9 @@ void KyraEngine_v1::setupButtonData() {
 	assert(_buttonDataListPtr);
 
 	GUI_V1_BUTTON(_buttonData[1], 0x01, 1, 1, 1, 0x0487, 0, 0x009, 0xA4, 0x36, 0x1E, 0);
-	_buttonData[1].buttonCallback = BUTTON_FUNCTOR(GUI_v1, _gui, &GUI_v1::buttonMenuCallback);
+	_buttonData[1].buttonCallback = BUTTON_FUNCTOR(GUI_LoK, _gui, &GUI_LoK::buttonMenuCallback);
 
-	Button::Callback inventoryFunctor = BUTTON_FUNCTOR(KyraEngine_v1, this, &KyraEngine_v1::buttonInventoryCallback);
+	Button::Callback inventoryFunctor = BUTTON_FUNCTOR(KyraEngine_LoK, this, &KyraEngine_LoK::buttonInventoryCallback);
 	for (int i = 2; i <= 10; ++i)
 		_buttonData[i].buttonCallback = inventoryFunctor;
 	_buttonData[0].buttonCallback = inventoryFunctor;
@@ -1461,7 +1461,7 @@ void KyraEngine_v1::setupButtonData() {
 	GUI_V1_BUTTON(_buttonData[9], 0x0A, 0, 0, 0, 0x0400, 0, 0x099, 0xB3, 0x13, 0x14, 0);
 	GUI_V1_BUTTON(_buttonData[10], 0x0B, 0, 0, 0, 0x0400, 0, 0x0AD, 0xB3, 0x13, 0x14, 0);
 
-	Button::Callback amuletFunctor = BUTTON_FUNCTOR(KyraEngine_v1, this, &KyraEngine_v1::buttonAmuletCallback);
+	Button::Callback amuletFunctor = BUTTON_FUNCTOR(KyraEngine_LoK, this, &KyraEngine_LoK::buttonAmuletCallback);
 	GUI_V1_BUTTON(_buttonData[11], 0x15, 1, 1, 1, 0x0487, 0, 0x0FD, 0x9C, 0x1A, 0x12, 0);
 	GUI_V1_BUTTON(_buttonData[12], 0x16, 1, 1, 1, 0x0487, 0, 0x0E7, 0xAA, 0x1A, 0x12, 0);
 	GUI_V1_BUTTON(_buttonData[13], 0x17, 1, 1, 1, 0x0487, 0, 0x0FD, 0xB5, 0x1A, 0x12, 0);
@@ -1474,29 +1474,29 @@ void KyraEngine_v1::setupButtonData() {
 	_buttonDataListPtr[14] = 0;
 }
 
-const uint8 KyraEngine_v1::_magicMouseItemStartFrame[] = {
+const uint8 KyraEngine_LoK::_magicMouseItemStartFrame[] = {
 	0xAD, 0xB7, 0xBE, 0x00
 };
 
-const uint8 KyraEngine_v1::_magicMouseItemEndFrame[] = {
+const uint8 KyraEngine_LoK::_magicMouseItemEndFrame[] = {
 	0xB1, 0xB9, 0xC2, 0x00
 };
 
-const uint8 KyraEngine_v1::_magicMouseItemStartFrame2[] = {
+const uint8 KyraEngine_LoK::_magicMouseItemStartFrame2[] = {
 	0xB2, 0xBA, 0xC3, 0x00
 };
 
-const uint8 KyraEngine_v1::_magicMouseItemEndFrame2[] = {
+const uint8 KyraEngine_LoK::_magicMouseItemEndFrame2[] = {
 	0xB6, 0xBD, 0xC8, 0x00
 };
 
-const uint16 KyraEngine_v1::_amuletX[] = { 231, 275, 253, 253 };
-const uint16 KyraEngine_v1::_amuletY[] = { 170, 170, 159, 181 };
+const uint16 KyraEngine_LoK::_amuletX[] = { 231, 275, 253, 253 };
+const uint16 KyraEngine_LoK::_amuletY[] = { 170, 170, 159, 181 };
 
-const uint16 KyraEngine_v1::_amuletX2[] = { 0x000, 0x0FD, 0x0E7, 0x0FD, 0x113, 0x000 };
-const uint16 KyraEngine_v1::_amuletY2[] = { 0x000, 0x09F, 0x0AA, 0x0B5, 0x0AA, 0x000 };
+const uint16 KyraEngine_LoK::_amuletX2[] = { 0x000, 0x0FD, 0x0E7, 0x0FD, 0x113, 0x000 };
+const uint16 KyraEngine_LoK::_amuletY2[] = { 0x000, 0x09F, 0x0AA, 0x0B5, 0x0AA, 0x000 };
 
-const int8 KyraEngine_v1::_dosTrackMap[] = {
+const int8 KyraEngine_LoK::_dosTrackMap[] = {
 	-1,   0,  -1,   1,   0,   3,   0,   2,
 	 0,   4,   1,   2,   1,   3,   1,   4,
 	 1,  92,   1,   6,   1,   7,   2,   2,
@@ -1513,7 +1513,7 @@ const int8 KyraEngine_v1::_dosTrackMap[] = {
 	 8,   4,   8,   5,   6,  11,   5,  11
 };
 
-const int KyraEngine_v1::_dosTrackMapSize = ARRAYSIZE(KyraEngine_v1::_dosTrackMap);
+const int KyraEngine_LoK::_dosTrackMapSize = ARRAYSIZE(KyraEngine_LoK::_dosTrackMap);
 
 // kyra engine v2 static data
 
diff --git a/engines/kyra/text_v1.cpp b/engines/kyra/text_lok.cpp
index 5534992c6a..ccca079e32 100644
--- a/engines/kyra/text_v1.cpp
+++ b/engines/kyra/text_lok.cpp
@@ -23,17 +23,17 @@
  *
  */
 
-#include "kyra/kyra_v1.h"
-#include "kyra/screen_v1.h"
+#include "kyra/kyra_lok.h"
+#include "kyra/screen_lok.h"
 #include "kyra/text.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/sprites.h"
 #include "kyra/timer.h"
 
 namespace Kyra {
 
-void KyraEngine_v1::waitForChatToFinish(int vocFile, int16 chatDuration, const char *chatStr, uint8 charNum) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::waitForChatToFinish(%i, %s, %i)", chatDuration, chatStr, charNum);
+void KyraEngine_LoK::waitForChatToFinish(int vocFile, int16 chatDuration, const char *chatStr, uint8 charNum) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::waitForChatToFinish(%i, %s, %i)", chatDuration, chatStr, charNum);
 	bool hasUpdatedNPCs = false;
 	bool runLoop = true;
 	bool drawText = textEnabled();
@@ -154,7 +154,7 @@ void KyraEngine_v1::waitForChatToFinish(int vocFile, int16 chatDuration, const c
 	//clearKyrandiaButtonIO();
 }
 
-void KyraEngine_v1::endCharacterChat(int8 charNum, int16 convoInitialized) {
+void KyraEngine_LoK::endCharacterChat(int8 charNum, int16 convoInitialized) {
 	_charSayUnk3 = -1;
 
 	if (charNum > 4 && charNum < 11) {
@@ -171,7 +171,7 @@ void KyraEngine_v1::endCharacterChat(int8 charNum, int16 convoInitialized) {
 	}
 }
 
-void KyraEngine_v1::restoreChatPartnerAnimFrame(int8 charNum) {
+void KyraEngine_LoK::restoreChatPartnerAnimFrame(int8 charNum) {
 	_talkingCharNum = -1;
 
 	if (charNum > 0 && charNum < 5) {
@@ -186,7 +186,7 @@ void KyraEngine_v1::restoreChatPartnerAnimFrame(int8 charNum) {
 	_animator->updateAllObjectShapes();
 }
 
-void KyraEngine_v1::backupChatPartnerAnimFrame(int8 charNum) {
+void KyraEngine_LoK::backupChatPartnerAnimFrame(int8 charNum) {
 	_talkingCharNum = 0;
 
 	if (charNum < 5 && charNum > 0)
@@ -202,7 +202,7 @@ void KyraEngine_v1::backupChatPartnerAnimFrame(int8 charNum) {
 	_animator->updateAllObjectShapes();
 }
 
-int8 KyraEngine_v1::getChatPartnerNum() {
+int8 KyraEngine_LoK::getChatPartnerNum() {
 	uint8 sceneTable[] = {0x2, 0x5, 0x2D, 0x7, 0x1B, 0x8, 0x22, 0x9, 0x30, 0x0A};
 	int pos = 0;
 	int partner = -1;
@@ -224,7 +224,7 @@ int8 KyraEngine_v1::getChatPartnerNum() {
 	return partner;
 }
 
-int KyraEngine_v1::initCharacterChat(int8 charNum) {
+int KyraEngine_LoK::initCharacterChat(int8 charNum) {
 	int returnValue = 0;
 
 	if (_talkingCharNum == -1) {
@@ -258,8 +258,8 @@ int KyraEngine_v1::initCharacterChat(int8 charNum) {
 	return returnValue;
 }
 
-void KyraEngine_v1::characterSays(int vocFile, const char *chatStr, int8 charNum, int8 chatDuration) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::characterSays('%s', %i, %d)", chatStr, charNum, chatDuration);
+void KyraEngine_LoK::characterSays(int vocFile, const char *chatStr, int8 charNum, int8 chatDuration) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::characterSays('%s', %i, %d)", chatStr, charNum, chatDuration);
 	uint8 startAnimFrames[] =  { 0x10, 0x32, 0x56, 0x0, 0x0, 0x0 };
 
 	uint16 chatTicks;
@@ -338,8 +338,8 @@ void KyraEngine_v1::characterSays(int vocFile, const char *chatStr, int8 charNum
 	endCharacterChat(charNum, convoInitialized);
 }
 
-void KyraEngine_v1::drawSentenceCommand(const char *sentence, int color) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::drawSentenceCommand('%s', %i)", sentence, color);
+void KyraEngine_LoK::drawSentenceCommand(const char *sentence, int color) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::drawSentenceCommand('%s', %i)", sentence, color);
 	_screen->hideMouse();
 	_screen->fillRect(8, 143, 311, 152, 12);
 
@@ -358,8 +358,8 @@ void KyraEngine_v1::drawSentenceCommand(const char *sentence, int color) {
 	_fadeText = false;
 }
 
-void KyraEngine_v1::updateSentenceCommand(const char *str1, const char *str2, int color) {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::updateSentenceCommand('%s', '%s', %i)", str1, str2, color);
+void KyraEngine_LoK::updateSentenceCommand(const char *str1, const char *str2, int color) {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::updateSentenceCommand('%s', '%s', %i)", str1, str2, color);
 	char sentenceCommand[500];
 	strncpy(sentenceCommand, str1, 500);
 	if (str2)
@@ -369,8 +369,8 @@ void KyraEngine_v1::updateSentenceCommand(const char *str1, const char *str2, in
 	_screen->updateScreen();
 }
 
-void KyraEngine_v1::updateTextFade() {
-	debugC(9, kDebugLevelMain, "KyraEngine_v1::updateTextFade()");
+void KyraEngine_LoK::updateTextFade() {
+	debugC(9, kDebugLevelMain, "KyraEngine_LoK::updateTextFade()");
 	if (!_fadeText)
 		return;
 
diff --git a/engines/kyra/timer_v1.cpp b/engines/kyra/timer_lok.cpp
index f5e7c52ba1..91081a36b3 100644
--- a/engines/kyra/timer_v1.cpp
+++ b/engines/kyra/timer_lok.cpp
@@ -24,19 +24,19 @@
  */
 
 #include "kyra/kyra.h"
-#include "kyra/kyra_v1.h"
+#include "kyra/kyra_lok.h"
 #include "kyra/screen.h"
-#include "kyra/animator_v1.h"
+#include "kyra/animator_lok.h"
 #include "kyra/timer.h"
 
 #include "common/system.h"
 
 namespace Kyra {
 
-#define TimerV1(x) new Common::Functor1Mem<int, void, KyraEngine_v1>(this, &KyraEngine_v1::x)
+#define TimerV1(x) new Common::Functor1Mem<int, void, KyraEngine_LoK>(this, &KyraEngine_LoK::x)
 
-void KyraEngine_v1::setupTimers() {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::setupTimers()");
+void KyraEngine_LoK::setupTimers() {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::setupTimers()");
 
 	for (int i = 0; i <= 4; ++i)
 		_timer->addTimer(i, 0, -1, 1);
@@ -73,8 +73,8 @@ void KyraEngine_v1::setupTimers() {
 	_timer->addTimer(33, TimerV1(updateAnimFlag2), 3, 1);
 }
 
-void KyraEngine_v1::timerUpdateHeadAnims(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::timerUpdateHeadAnims(%i)", timerNum);
+void KyraEngine_LoK::timerUpdateHeadAnims(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::timerUpdateHeadAnims(%i)", timerNum);
 	static int8 currentFrame = 0;
 	static const int8 frameTable[] = {4, 5, 4, 5, 4, 5, 0, 1, 4, 5,
 								4, 4, 6, 4, 8, 1, 9, 4, -1};
@@ -92,8 +92,8 @@ void KyraEngine_v1::timerUpdateHeadAnims(int timerNum) {
 	_animator->animRefreshNPC(_talkingCharNum);
 }
 
-void KyraEngine_v1::timerSetFlags1(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::timerSetFlags(%i)", timerNum);
+void KyraEngine_LoK::timerSetFlags1(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::timerSetFlags(%i)", timerNum);
 	if (_currentCharacter->sceneId == 0x1C)
 		return;
 
@@ -111,65 +111,65 @@ void KyraEngine_v1::timerSetFlags1(int timerNum) {
 	}
 }
 
-void KyraEngine_v1::timerFadeText(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::timerFadeText(%i)", timerNum);
+void KyraEngine_LoK::timerFadeText(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::timerFadeText(%i)", timerNum);
 	_fadeText = true;
 }
 
-void KyraEngine_v1::updateAnimFlag1(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::updateAnimFlag1(%d)", timerNum);
+void KyraEngine_LoK::updateAnimFlag1(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::updateAnimFlag1(%d)", timerNum);
 	if (_brandonStatusBit & 2) {
 		_brandonStatusBit0x02Flag = 1;
 	}
 }
 
-void KyraEngine_v1::updateAnimFlag2(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::updateAnimFlag2(%d)", timerNum);
+void KyraEngine_LoK::updateAnimFlag2(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::updateAnimFlag2(%d)", timerNum);
 	if (_brandonStatusBit & 0x20) {
 		_brandonStatusBit0x20Flag = 1;
 	}
 }
 
-void KyraEngine_v1::setTextFadeTimerCountdown(int16 countdown) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::setTextFadeTimerCountdown(%i)", countdown);
+void KyraEngine_LoK::setTextFadeTimerCountdown(int16 countdown) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::setTextFadeTimerCountdown(%i)", countdown);
 	if (countdown == -1)
 		countdown = 32000;
 
 	_timer->setCountdown(31, countdown*60);
 }
 
-void KyraEngine_v1::timerSetFlags2(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::timerSetFlags2(%i)", timerNum);
+void KyraEngine_LoK::timerSetFlags2(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::timerSetFlags2(%i)", timerNum);
 	if (!((uint32*)(_flagsTable+0x2D))[timerNum])
 		((uint32*)(_flagsTable+0x2D))[timerNum] = 1;
 }
 
-void KyraEngine_v1::timerCheckAnimFlag1(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::timerCheckAnimFlag1(%i)", timerNum);
+void KyraEngine_LoK::timerCheckAnimFlag1(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::timerCheckAnimFlag1(%i)", timerNum);
 	if (_brandonStatusBit & 0x20) {
 		checkAmuletAnimFlags();
 		_timer->setCountdown(18, -1);
 	}
 }
 
-void KyraEngine_v1::timerCheckAnimFlag2(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::timerCheckAnimFlag2(%i)", timerNum);
+void KyraEngine_LoK::timerCheckAnimFlag2(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::timerCheckAnimFlag2(%i)", timerNum);
 	if (_brandonStatusBit & 0x2) {
 		checkAmuletAnimFlags();
 		_timer->setCountdown(14, -1);
 	}
 }
 
-void KyraEngine_v1::timerRedrawAmulet(int timerNum) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::timerRedrawAmulet(%i)", timerNum);
+void KyraEngine_LoK::timerRedrawAmulet(int timerNum) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::timerRedrawAmulet(%i)", timerNum);
 	if (queryGameFlag(0xF1)) {
 		drawAmulet();
 		_timer->setCountdown(19, -1);
 	}
 }
 
-void KyraEngine_v1::setWalkspeed(uint8 newSpeed) {
-	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_v1::setWalkspeed(%i)", newSpeed);
+void KyraEngine_LoK::setWalkspeed(uint8 newSpeed) {
+	debugC(9, kDebugLevelMain | kDebugLevelTimer, "KyraEngine_LoK::setWalkspeed(%i)", newSpeed);
 	static const uint8 speeds[] = { 11, 9, 6, 5, 3 };
 
 	assert(newSpeed < ARRAYSIZE(speeds));
diff --git a/engines/kyra/wsamovie.cpp b/engines/kyra/wsamovie.cpp
index 5190f24ad6..42159478dd 100644
--- a/engines/kyra/wsamovie.cpp
+++ b/engines/kyra/wsamovie.cpp
@@ -35,11 +35,11 @@
 #include "kyra/resource.h"
 
 namespace Kyra {
-WSAMovieV1::WSAMovieV1(KyraEngine *vm) : Movie(vm) {}
-WSAMovieV1::~WSAMovieV1() { close(); }
+WSAMovie_v1::WSAMovie_v1(KyraEngine *vm) : Movie(vm) {}
+WSAMovie_v1::~WSAMovie_v1() { close(); }
 
-int WSAMovieV1::open(const char *filename, int offscreenDecode, uint8 *palBuf) {
-	debugC(9, kDebugLevelMovie, "WSAMovieV1::open('%s', %d, %p)", filename, offscreenDecode, (const void *)palBuf);
+int WSAMovie_v1::open(const char *filename, int offscreenDecode, uint8 *palBuf) {
+	debugC(9, kDebugLevelMovie, "WSAMovie_v1::open('%s', %d, %p)", filename, offscreenDecode, (const void *)palBuf);
 	close();
 
 	uint32 flags = 0;
@@ -123,8 +123,8 @@ int WSAMovieV1::open(const char *filename, int offscreenDecode, uint8 *palBuf) {
 	return _numFrames;
 }
 
-void WSAMovieV1::close() {
-	debugC(9, kDebugLevelMovie, "WSAMovieV1::close()");
+void WSAMovie_v1::close() {
+	debugC(9, kDebugLevelMovie, "WSAMovie_v1::close()");
 	if (_opened) {
 		delete[] _deltaBuffer;
 		delete[] _offscreenBuffer;
@@ -134,8 +134,8 @@ void WSAMovieV1::close() {
 	}
 }
 
-void WSAMovieV1::displayFrame(int frameNum, ...) {
-	debugC(9, kDebugLevelMovie, "WSAMovieV1::displayFrame(%d, ...)", frameNum);
+void WSAMovie_v1::displayFrame(int frameNum, ...) {
+	debugC(9, kDebugLevelMovie, "WSAMovie_v1::displayFrame(%d, ...)", frameNum);
 	if (frameNum >= _numFrames || !_opened)
 		return;
 
@@ -198,8 +198,8 @@ void WSAMovieV1::displayFrame(int frameNum, ...) {
 		_vm->screen()->copyBlockToPage(_drawPage, _x, _y, _width, _height, _offscreenBuffer);
 }
 
-void WSAMovieV1::processFrame(int frameNum, uint8 *dst) {
-	debugC(9, kDebugLevelMovie, "WSAMovieV1::processFrame(%d, %p)", frameNum, (const void *)dst);
+void WSAMovie_v1::processFrame(int frameNum, uint8 *dst) {
+	debugC(9, kDebugLevelMovie, "WSAMovie_v1::processFrame(%d, %p)", frameNum, (const void *)dst);
 	if (!_opened)
 		return;
 	assert(frameNum <= _numFrames);
@@ -213,11 +213,11 @@ void WSAMovieV1::processFrame(int frameNum, uint8 *dst) {
 
 #pragma mark -
 
-WSAMovieAmiga::WSAMovieAmiga(KyraEngine *vm) : WSAMovieV1(vm), _buffer(0) {}
+WSAMovieAmiga::WSAMovieAmiga(KyraEngine *vm) : WSAMovie_v1(vm), _buffer(0) {}
 
 int WSAMovieAmiga::open(const char *filename, int offscreenDecode, uint8 *palBuf) {
 	debugC(9, kDebugLevelMovie, "WSAMovieAmiga::open('%s', %d, %p)", filename, offscreenDecode, (const void *)palBuf);
-	int res = WSAMovieV1::open(filename, offscreenDecode, palBuf);
+	int res = WSAMovie_v1::open(filename, offscreenDecode, palBuf);
 
 	if (!res)
 		return 0;
@@ -233,7 +233,7 @@ void WSAMovieAmiga::close() {
 		delete[] _buffer;
 		_buffer = 0;
 	}
-	WSAMovieV1::close();
+	WSAMovie_v1::close();
 }
 
 void WSAMovieAmiga::displayFrame(int frameNum, ...) {
@@ -342,10 +342,10 @@ void WSAMovieAmiga::processFrame(int frameNum, uint8 *dst) {
 
 #pragma mark -
 
-WSAMovieV2::WSAMovieV2(KyraEngine *vm, Screen_v2 *screen) : WSAMovieV1(vm), _screen(screen), _xAdd(0), _yAdd(0) {}
+WSAMovie_v2::WSAMovie_v2(KyraEngine *vm, Screen_v2 *screen) : WSAMovie_v1(vm), _screen(screen), _xAdd(0), _yAdd(0) {}
 
-int WSAMovieV2::open(const char *filename, int unk1, uint8 *palBuf) {
-	debugC(9, kDebugLevelMovie, "WSAMovieV2::open('%s', %d, %p)", filename, unk1, (const void *)palBuf);
+int WSAMovie_v2::open(const char *filename, int unk1, uint8 *palBuf) {
+	debugC(9, kDebugLevelMovie, "WSAMovie_v2::open('%s', %d, %p)", filename, unk1, (const void *)palBuf);
 	close();
 
 	uint32 flags = 0;
@@ -429,8 +429,8 @@ int WSAMovieV2::open(const char *filename, int unk1, uint8 *palBuf) {
 	return _numFrames;
 }
 
-void WSAMovieV2::displayFrame(int frameNum, ...) {
-	debugC(9, kDebugLevelMovie, "WSAMovieV2::displayFrame(%d, ...)", frameNum);
+void WSAMovie_v2::displayFrame(int frameNum, ...) {
+	debugC(9, kDebugLevelMovie, "WSAMovie_v2::displayFrame(%d, ...)", frameNum);
 	if (frameNum >= _numFrames || frameNum < 0 || !_opened)
 		return;
 
diff --git a/engines/kyra/wsamovie.h b/engines/kyra/wsamovie.h
index d1f3465c07..cc3a188eea 100644
--- a/engines/kyra/wsamovie.h
+++ b/engines/kyra/wsamovie.h
@@ -60,10 +60,10 @@ protected:
 	int _drawPage;
 };
 
-class WSAMovieV1 : public Movie {
+class WSAMovie_v1 : public Movie {
 public:
-	WSAMovieV1(KyraEngine *vm);
-	virtual ~WSAMovieV1();
+	WSAMovie_v1(KyraEngine *vm);
+	virtual ~WSAMovie_v1();
 
 	virtual int open(const char *filename, int offscreen, uint8 *palette);
 	virtual void close();
@@ -94,7 +94,7 @@ protected:
 	uint8 *_frameData;
 };
 
-class WSAMovieAmiga : public WSAMovieV1 {
+class WSAMovieAmiga : public WSAMovie_v1 {
 public:
 	WSAMovieAmiga(KyraEngine *vm);
 	int open(const char *filename, int offscreen, uint8 *palette);
@@ -107,9 +107,9 @@ private:
 	uint8 *_buffer;
 };
 
-class WSAMovieV2 : public WSAMovieV1 {
+class WSAMovie_v2 : public WSAMovie_v1 {
 public:
-	WSAMovieV2(KyraEngine *vm, Screen_v2 *scren);
+	WSAMovie_v2(KyraEngine *vm, Screen_v2 *scren);
 
 	int open(const char *filename, int unk1, uint8 *palette);