PEGASUS: Remove t prefix from typedefs

Some other minor cleanup too

152 files changed, 4318 insertions, 4341 deletions

diff --git a/engines/pegasus/ai/ai_action.cpp b/engines/pegasus/ai/ai_action.cpp
index 36367eb1d6..38d639038f 100755
--- a/engines/pegasus/ai/ai_action.cpp
+++ b/engines/pegasus/ai/ai_action.cpp
@@ -38,7 +38,7 @@ void AICompoundAction::performAIAction(AIRule *rule) {
 		(*it)->performAIAction(rule);
 }
 
-AIPlayMessageAction::AIPlayMessageAction(const Common::String &movieName, bool keepLastFrame, const tInputBits interruptionFilter) {
+AIPlayMessageAction::AIPlayMessageAction(const Common::String &movieName, bool keepLastFrame, const InputBits interruptionFilter) {
 	_movieName = movieName;
 	_keepLastFrame = keepLastFrame;
 	_interruptionFilter = interruptionFilter;
diff --git a/engines/pegasus/ai/ai_action.h b/engines/pegasus/ai/ai_action.h
index 09a1d13699..9ac30782a9 100755
--- a/engines/pegasus/ai/ai_action.h
+++ b/engines/pegasus/ai/ai_action.h
@@ -79,13 +79,13 @@ protected:
 
 class AIPlayMessageAction : public AIAction {
 public:
-	AIPlayMessageAction(const Common::String &movieName, bool keepLastFrame, const tInputBits = kWarningInterruption);
+	AIPlayMessageAction(const Common::String &movieName, bool keepLastFrame, const InputBits = kWarningInterruption);
 
 	virtual void performAIAction(AIRule *);
 
 protected:
 	Common::String _movieName;
-	tInputBits _interruptionFilter;
+	InputBits _interruptionFilter;
 	bool _keepLastFrame;
 };
 
diff --git a/engines/pegasus/ai/ai_area.cpp b/engines/pegasus/ai/ai_area.cpp
index 923df41cf1..6203843087 100755
--- a/engines/pegasus/ai/ai_area.cpp
+++ b/engines/pegasus/ai/ai_area.cpp
@@ -135,7 +135,7 @@ void AIArea::setAIVolume(const uint16 volume) {
 // If this function is called while a sequence is playing, it will just "remember"
 // the time value, so that when the sequence finishes, the new time is asserted.
 
-void AIArea::setAIAreaToTime(const tLowerClientSignature client, const tLowerAreaSignature area, const TimeValue time) {
+void AIArea::setAIAreaToTime(const LowerClientSignature client, const LowerAreaSignature area, const TimeValue time) {
 	switch (area) {
 	case kLeftAreaSignature:
 		// Only support kInventorySignature client, since AI never calls SetAIAreaToTime.
@@ -199,7 +199,7 @@ void AIArea::setAIAreaToTime(const tLowerClientSignature client, const tLowerAre
 //		kBiochipSignature		kRightAreaSignature
 //		kInventorySignature		kMiddleAreaSignature
 
-void AIArea::playAIAreaSequence(const tLowerClientSignature, const tLowerAreaSignature area, const TimeValue start, const TimeValue stop) {
+void AIArea::playAIAreaSequence(const LowerClientSignature, const LowerAreaSignature area, const TimeValue start, const TimeValue stop) {
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
 
 	lockAIOut();
@@ -260,7 +260,7 @@ void AIArea::playAIAreaSequence(const tLowerClientSignature, const tLowerAreaSig
 	unlockAI();
 }
 
-bool AIArea::playAIMovie(const tLowerAreaSignature area, const Common::String &movieName, bool keepLastFrame, const tInputBits interruptFilter) {
+bool AIArea::playAIMovie(const LowerAreaSignature area, const Common::String &movieName, bool keepLastFrame, const InputBits interruptFilter) {
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
 	
 	lockAIOut();
@@ -337,7 +337,7 @@ bool AIArea::playAIMovie(const tLowerAreaSignature area, const Common::String &m
 }
 
 //	Only implemented for kMiddleAreaSignature, kInventorySignature
-void AIArea::loopAIAreaSequence(const tLowerClientSignature owner, const tLowerAreaSignature area, const TimeValue start, const TimeValue stop) {
+void AIArea::loopAIAreaSequence(const LowerClientSignature owner, const LowerAreaSignature area, const TimeValue start, const TimeValue stop) {
 	if (area == kMiddleAreaSignature && owner == kInventorySignature && owner == _middleAreaOwner) {
 		_middleAreaMovie.stop();
 		_middleAreaMovie.setFlags(0);
@@ -361,7 +361,7 @@ void AIArea::setLeftMovieTime(const TimeValue time) {
 	_leftInventoryTime = time;
 }
 
-void AIArea::setMiddleMovieTime(const tLowerClientSignature client, const TimeValue time) {	
+void AIArea::setMiddleMovieTime(const LowerClientSignature client, const TimeValue time) {	
 	if (client == kInventorySignature) {
 		_middleInventoryTime = time;
 		if (_middleAreaOwner == kBiochipSignature) {
@@ -594,7 +594,7 @@ void AIArea::getSmallInfoSegment(TimeValue &start, TimeValue &stop) {
 	}
 }
 
-tLowerClientSignature AIArea::getMiddleAreaOwner() {
+LowerClientSignature AIArea::getMiddleAreaOwner() {
 	return _middleAreaOwner;
 }
 
diff --git a/engines/pegasus/ai/ai_area.h b/engines/pegasus/ai/ai_area.h
index 7387b4081b..10bfc933a1 100755
--- a/engines/pegasus/ai/ai_area.h
+++ b/engines/pegasus/ai/ai_area.h
@@ -108,18 +108,18 @@ public:
 	//      kAISignature            kLeftAreaSignature
 	// Further, the kAISignature never sets a static frame time in the left area,
 	// but only plays a sequence from the AI movie.
-	void setAIAreaToTime(const tLowerClientSignature, const tLowerAreaSignature, const TimeValue);
+	void setAIAreaToTime(const LowerClientSignature, const LowerAreaSignature, const TimeValue);
 	
 	// The "Play" functions play the requested sequence synchronously.
-	void playAIAreaSequence(const tLowerClientSignature, const tLowerAreaSignature, const TimeValue, const TimeValue);
+	void playAIAreaSequence(const LowerClientSignature, const LowerAreaSignature, const TimeValue, const TimeValue);
 
 	// For PlayAIMovie, it is assumed that the client is the AI itself.
 	// This is used to play AI messages as well as Optical Memory video.
 	// Returns true if the movie played all the way through, false if it was interrupted.
-	bool playAIMovie(const tLowerAreaSignature, const Common::String &movieName, bool keepLastFrame, const tInputBits);
+	bool playAIMovie(const LowerAreaSignature, const Common::String &movieName, bool keepLastFrame, const InputBits);
 
 	// Loop the requested sequence indefinitely.
-	void loopAIAreaSequence(const tLowerClientSignature, const tLowerAreaSignature, const TimeValue, const TimeValue);
+	void loopAIAreaSequence(const LowerClientSignature, const LowerAreaSignature, const TimeValue, const TimeValue);
 
 	void addAIRule(AIRule *);
 
@@ -133,7 +133,7 @@ public:
 	void checkMiddleArea();
 	void checkRules();
 
-	tLowerClientSignature getMiddleAreaOwner();
+	LowerClientSignature getMiddleAreaOwner();
 	void toggleMiddleAreaOwner();
 
 	TimeValue getBigInfoTime();
@@ -143,7 +143,7 @@ protected:
 	void useIdleTime();
 
 	void setLeftMovieTime(const TimeValue);
-	void setMiddleMovieTime(const tLowerClientSignature, const TimeValue);
+	void setMiddleMovieTime(const LowerClientSignature, const TimeValue);
 	void setRightMovieTime(const TimeValue);
 
 	Movie _leftAreaMovie;
@@ -151,9 +151,9 @@ protected:
 	Movie _rightAreaMovie;
 	Movie _AIMovie;
 
-	tLowerClientSignature _leftAreaOwner;
-	tLowerClientSignature _middleAreaOwner;
-	tLowerClientSignature _rightAreaOwner;
+	LowerClientSignature _leftAreaOwner;
+	LowerClientSignature _middleAreaOwner;
+	LowerClientSignature _rightAreaOwner;
 
 	TimeValue _leftInventoryTime;
 	TimeValue _middleInventoryTime;
diff --git a/engines/pegasus/ai/ai_condition.cpp b/engines/pegasus/ai/ai_condition.cpp
index 8b77d723c6..df6d3227e5 100755
--- a/engines/pegasus/ai/ai_condition.cpp
+++ b/engines/pegasus/ai/ai_condition.cpp
@@ -149,20 +149,20 @@ bool AITimerCondition::fireCondition() {
 AILocationCondition::AILocationCondition(uint32 maxLocations) {
 	_numLocations = 0;
 	_maxLocations = maxLocations;
-	_locations = new tRoomViewID[maxLocations];
+	_locations = new RoomViewID[maxLocations];
 }
 
 AILocationCondition::~AILocationCondition() {
 	delete[] _locations;
 }
 
-void AILocationCondition::addLocation(const tRoomViewID location) {
+void AILocationCondition::addLocation(const RoomViewID location) {
 	if (_numLocations < _maxLocations)
 		_locations[_numLocations++] = location;
 }
 
 bool AILocationCondition::fireCondition() {
-	tRoomViewID test = GameState.getCurrentRoomAndView(), *p;
+	RoomViewID test = GameState.getCurrentRoomAndView(), *p;
 	uint32 i;
 
 	for (i = 0, p = _locations; i < _numLocations; i++, p++) {
@@ -180,7 +180,7 @@ void AILocationCondition::writeAICondition(Common::WriteStream *stream) {
 	stream->writeUint32BE(_numLocations);
 
 	uint32 i;
-	tRoomViewID *p;
+	RoomViewID *p;
 	for (i = 0, p = _locations; i < _numLocations; i++, p++)
 		stream->writeUint32BE(*p);
 }
@@ -190,19 +190,19 @@ void AILocationCondition::readAICondition(Common::ReadStream *stream) {
 
 	if (_maxLocations != maxLocations) {
 		delete[] _locations;
-		_locations = new tRoomViewID[maxLocations];
+		_locations = new RoomViewID[maxLocations];
 		_maxLocations = maxLocations;
 	}
 
 	_numLocations = stream->readUint32BE();
 
 	uint32 i;
-	tRoomViewID *p;
+	RoomViewID *p;
 	for (i = 0, p = _locations; i < _numLocations; i++, p++)
 		*p = stream->readUint32BE();
 }
 
-AIDoorOpenedCondition::AIDoorOpenedCondition(tRoomViewID doorLocation) {
+AIDoorOpenedCondition::AIDoorOpenedCondition(RoomViewID doorLocation) {
 	_doorLocation = doorLocation;
 }
 
@@ -210,7 +210,7 @@ bool AIDoorOpenedCondition::fireCondition() {
 	return GameState.getCurrentRoomAndView() == _doorLocation && GameState.isCurrentDoorOpen();
 }
 
-AIHasItemCondition::AIHasItemCondition(const tItemID item) {
+AIHasItemCondition::AIHasItemCondition(const ItemID item) {
 	_item = item;
 }
 
@@ -218,7 +218,7 @@ bool AIHasItemCondition::fireCondition() {
 	return _item == kNoItemID || GameState.isTakenItemID(_item);
 }
 
-AIDoesntHaveItemCondition::AIDoesntHaveItemCondition(const tItemID item) {
+AIDoesntHaveItemCondition::AIDoesntHaveItemCondition(const ItemID item) {
 	_item = item;
 }
 
@@ -226,7 +226,7 @@ bool AIDoesntHaveItemCondition::fireCondition() {
 	return _item == kNoItemID || !GameState.isTakenItemID(_item);
 }
 
-AICurrentItemCondition::AICurrentItemCondition(const tItemID item) {
+AICurrentItemCondition::AICurrentItemCondition(const ItemID item) {
 	_item = item;
 }
 	
@@ -239,7 +239,7 @@ bool AICurrentItemCondition::fireCondition() {
 	return item != 0 && item->getObjectID() == _item;
 }
 
-AICurrentBiochipCondition::AICurrentBiochipCondition(const tItemID biochip)  {
+AICurrentBiochipCondition::AICurrentBiochipCondition(const ItemID biochip)  {
 	_biochip = biochip;
 }
 
@@ -252,7 +252,7 @@ bool AICurrentBiochipCondition::fireCondition() {
 	return biochip != 0 && biochip->getObjectID() == _biochip;
 }
 
-AIItemStateCondition::AIItemStateCondition(const tItemID item, const tItemState state) {
+AIItemStateCondition::AIItemStateCondition(const ItemID item, const ItemState state) {
 	_item = item;
 	_state = state;
 }
@@ -270,15 +270,15 @@ bool AIEnergyMonitorCondition::fireCondition() {
 	return g_energyMonitor != 0 && g_energyMonitor->getCurrentEnergy() < _energyThreshold;
 }
 
-AILastExtraCondition::AILastExtraCondition(const tExtraID lastExtra) {
+AILastExtraCondition::AILastExtraCondition(const ExtraID lastExtra) {
 	_lastExtra = lastExtra;
 }
 
 bool AILastExtraCondition::fireCondition() {
-	return g_neighborhood && (tExtraID)g_neighborhood->getLastExtra() == _lastExtra;
+	return g_neighborhood && (ExtraID)g_neighborhood->getLastExtra() == _lastExtra;
 }
 
-AICondition *makeLocationAndDoesntHaveItemCondition(const tRoomID room, const tDirectionConstant direction, const tItemID item) {
+AICondition *makeLocationAndDoesntHaveItemCondition(const RoomID room, const DirectionConstant direction, const ItemID item) {
 	AILocationCondition *location = new AILocationCondition(1);
 	location->addLocation(MakeRoomView(room, direction));
 	
diff --git a/engines/pegasus/ai/ai_condition.h b/engines/pegasus/ai/ai_condition.h
index 559ec55c80..ba4f41108c 100755
--- a/engines/pegasus/ai/ai_condition.h
+++ b/engines/pegasus/ai/ai_condition.h
@@ -151,15 +151,15 @@ public:
 	AILocationCondition(uint32);
 	virtual ~AILocationCondition();
 
-	void addLocation(tRoomViewID);
+	void addLocation(RoomViewID);
 	virtual bool fireCondition();
 
-	virtual void					writeAICondition(Common::WriteStream *);
-	virtual void					readAICondition(Common::ReadStream *);
+	virtual void writeAICondition(Common::WriteStream *);
+	virtual void readAICondition(Common::ReadStream *);
 
 protected:
 	uint32 _numLocations, _maxLocations;
-	tRoomViewID *_locations;
+	RoomViewID *_locations;
 };
 
 /////////////////////////////////////////////
@@ -168,13 +168,13 @@ protected:
 
 class AIDoorOpenedCondition : public AICondition {
 public:
-	AIDoorOpenedCondition(tRoomViewID);
+	AIDoorOpenedCondition(RoomViewID);
 	virtual ~AIDoorOpenedCondition() {}
 
 	virtual bool fireCondition();
 
 protected:
-	tRoomViewID _doorLocation;
+	RoomViewID _doorLocation;
 };
 
 /////////////////////////////////////////////
@@ -183,12 +183,12 @@ protected:
 
 class AIHasItemCondition : public AICondition {
 public:
-	AIHasItemCondition(const tItemID);
+	AIHasItemCondition(const ItemID);
 
 	virtual bool fireCondition();
 
 protected:
-	tItemID _item;
+	ItemID _item;
 };
 
 /////////////////////////////////////////////
@@ -197,12 +197,12 @@ protected:
 
 class AIDoesntHaveItemCondition : public AICondition {
 public:
-	AIDoesntHaveItemCondition(const tItemID);
+	AIDoesntHaveItemCondition(const ItemID);
 
 	virtual bool fireCondition();
 
 protected:
-	tItemID _item;
+	ItemID _item;
 };
 
 /////////////////////////////////////////////
@@ -211,12 +211,12 @@ protected:
 
 class AICurrentItemCondition : public AICondition {
 public:
-	AICurrentItemCondition(const tItemID);
+	AICurrentItemCondition(const ItemID);
 
 	virtual bool fireCondition();
 
 protected:
-	tItemID _item;
+	ItemID _item;
 };
 
 /////////////////////////////////////////////
@@ -225,12 +225,12 @@ protected:
 
 class AICurrentBiochipCondition : public AICondition {
 public:
-	AICurrentBiochipCondition(const tItemID);
+	AICurrentBiochipCondition(const ItemID);
 
 	virtual bool fireCondition();
 
 protected:
-	tItemID _biochip;
+	ItemID _biochip;
 };
 
 /////////////////////////////////////////////
@@ -239,13 +239,13 @@ protected:
 
 class AIItemStateCondition : public AICondition {
 public:
-	AIItemStateCondition(const tItemID, const tItemState);
+	AIItemStateCondition(const ItemID, const ItemState);
 
 	virtual bool fireCondition();
 
 protected:
-	tItemID _item;
-	tItemState _state;
+	ItemID _item;
+	ItemState _state;
 };
 
 /////////////////////////////////////////////
@@ -268,19 +268,19 @@ protected:
 
 class AILastExtraCondition : public AICondition {
 public:
-	AILastExtraCondition(const tExtraID);
+	AILastExtraCondition(const ExtraID);
 
 	virtual bool fireCondition();
 
 protected:
-	tExtraID _lastExtra;
+	ExtraID _lastExtra;
 };
 
 /////////////////////////////////////////////
 //
 //	Helper functions
 
-AICondition *makeLocationAndDoesntHaveItemCondition(const tRoomID room, const tDirectionConstant direction, const tItemID item);
+AICondition *makeLocationAndDoesntHaveItemCondition(const RoomID room, const DirectionConstant direction, const ItemID item);
 
 } // End of namespace Pegasus
 
diff --git a/engines/pegasus/compass.cpp b/engines/pegasus/compass.cpp
index 2c80c5c41d..6ae4e11a0d 100755
--- a/engines/pegasus/compass.cpp
+++ b/engines/pegasus/compass.cpp
@@ -70,9 +70,9 @@ void Compass::draw(const Common::Rect &r1) {
 		Common::Rect r2;
 		_compassImage.getSurfaceBounds(r2);
 
-		tCoordType width = r2.width();
-		tCoordType offsetH = width / 10 - bounds.width() / 2 + (getFaderValue() * width) / 450 - bounds.left;
-		tCoordType offsetV = -bounds.top;
+		CoordType width = r2.width();
+		CoordType offsetH = width / 10 - bounds.width() / 2 + (getFaderValue() * width) / 450 - bounds.left;
+		CoordType offsetV = -bounds.top;
 		r2 = r1;
 		r2.translate(offsetH, offsetV);
 		_compassImage.drawImage(r2, r1);
diff --git a/engines/pegasus/console.cpp b/engines/pegasus/console.cpp
index f8008a0681..e66859d5fa 100644
--- a/engines/pegasus/console.cpp
+++ b/engines/pegasus/console.cpp
@@ -79,9 +79,9 @@ bool PegasusConsole::Cmd_Jump(int argc, const char **argv) {
 		return true;
 	}
 
-	tNeighborhoodID neighborhood = (tNeighborhoodID)atoi(argv[1]);
-	tRoomID room = (tRoomID)atoi(argv[2]);
-	tDirectionConstant direction = (tDirectionConstant)atoi(argv[3]);
+	NeighborhoodID neighborhood = (NeighborhoodID)atoi(argv[1]);
+	RoomID room = (RoomID)atoi(argv[2]);
+	DirectionConstant direction = (DirectionConstant)atoi(argv[3]);
 
 	if ((neighborhood < kCaldoriaID || neighborhood > kNoradDeltaID || neighborhood == kFinalTSAID) &&
 			neighborhood != kNoradSubChaseID) {
diff --git a/engines/pegasus/constants.h b/engines/pegasus/constants.h
index 17466b0dd4..e98ebd0997 100755
--- a/engines/pegasus/constants.h
+++ b/engines/pegasus/constants.h
@@ -35,69 +35,73 @@ namespace Pegasus {
 
 // TODO: Organize these
 
-const tGameID kGameIDNothing = -1;
-
-const tActorID kNoActorID = kGameIDNothing;
-const tActorID kPlayerID = 0;
-const tItemID kNoItemID = kGameIDNothing;
-const tRoomID kNoRoomID = kGameIDNothing;
-const tExtraID kNoExtraID = 0xFFFFFFFF;
-const tNeighborhoodID kNoNeighborhoodID = kGameIDNothing;
-const tAlternateID kNoAlternateID = 0;
-const tGameMenuCommand kMenuCmdNoCommand = 0;
-
-const tHotSpotActivationID kActivateHotSpotAlways = 0;
-const tHotSpotActivationID kActivateHotSpotNever = -1;
-
-const tItemState kNoItemState = -1;
-
-const tDirectionConstant kNoDirection = 0xFF;
-
-const tTurnDirection kNoTurn = 0xFF;
-const tTurnDirection kTurnLeft = 0;
-const tTurnDirection kTurnRight = 1;
-const tTurnDirection kTurnUp = 2;
-const tTurnDirection kTurnDown = 3;
-const tTurnDirection kMaxTurns = 4;
-
-const tGameMode kNoMode = -1;
-const tGameMode kModeNavigation = 0;
-const tGameMode kLastGameShellMode = kModeNavigation;
-
-const tCanMoveForwardReason kCanMoveForward = 0;
-const tCanMoveForwardReason kCantMoveBlocked = kCanMoveForward + 1;
-const tCanMoveForwardReason kCantMoveDoorClosed = kCantMoveBlocked + 1;
-const tCanMoveForwardReason kCantMoveDoorLocked = kCantMoveDoorClosed + 1;
-const tCanMoveForwardReason kCantMoveLastReason = kCantMoveDoorLocked;
-
-const tCanTurnReason kCanTurn = 0;
-const tCanTurnReason kCantTurnNoTurn = kCanTurn + 1;
-const tCanTurnReason kCantTurnLastReason = kCantTurnNoTurn;
-
-const tCanOpenDoorReason kCanOpenDoor = 0;
-const tCanOpenDoorReason kCantOpenNoDoor = kCanOpenDoor + 1;
-const tCanOpenDoorReason kCantOpenLocked = kCantOpenNoDoor + 1;
-const tCanOpenDoorReason kCantOpenAlreadyOpen = kCantOpenLocked + 1;
-const tCanOpenDoorReason kCantOpenLastReason = kCantOpenAlreadyOpen;
-
-const tDisplayElementID kNoDisplayElement = -1;
-const tDisplayElementID kHighestReservedElementID = -2;
-
-const tDisplayElementID kCursorID = kHighestReservedElementID;
-const tDisplayElementID kLoadScreenID = kCursorID - 1;
-
-const tDisplayOrder kMinAvailableOrder = 0;
-const tDisplayOrder kMaxAvailableOrder = 999998;
-const tDisplayOrder kLoadScreenOrder = 900000;
-const tDisplayOrder kCursorOrder = 1000000;
-
-const tHotSpotID kNoHotSpotID = -1;
-const tHotSpotFlags kNoHotSpotFlags = 0;
-const tHotSpotFlags kAllHotSpotFlags = ~kNoHotSpotFlags;
-
-const tNotificationFlags kNoNotificationFlags = 0;
-
-const tDisplayElementID kCurrentDragSpriteID = 1000;
+const GameID kGameIDNothing = -1;
+
+const ActorID kNoActorID = kGameIDNothing;
+const ActorID kPlayerID = 0;
+const ItemID kNoItemID = kGameIDNothing;
+const RoomID kNoRoomID = kGameIDNothing;
+const ExtraID kNoExtraID = 0xFFFFFFFF;
+const NeighborhoodID kNoNeighborhoodID = kGameIDNothing;
+const AlternateID kNoAlternateID = 0;
+const GameMenuCommand kMenuCmdNoCommand = 0;
+
+const HotSpotActivationID kActivateHotSpotAlways = 0;
+const HotSpotActivationID kActivateHotSpotNever = -1;
+
+const ItemState kNoItemState = -1;
+
+const DirectionConstant kNoDirection = 0xFF;
+static const DirectionConstant kNorth = 0;
+static const DirectionConstant kSouth = 1;
+static const DirectionConstant kEast = 2;
+static const DirectionConstant kWest = 3;
+
+const TurnDirection kNoTurn = 0xFF;
+const TurnDirection kTurnLeft = 0;
+const TurnDirection kTurnRight = 1;
+const TurnDirection kTurnUp = 2;
+const TurnDirection kTurnDown = 3;
+const TurnDirection kMaxTurns = 4;
+
+const GameMode kNoMode = -1;
+const GameMode kModeNavigation = 0;
+const GameMode kLastGameShellMode = kModeNavigation;
+
+const CanMoveForwardReason kCanMoveForward = 0;
+const CanMoveForwardReason kCantMoveBlocked = kCanMoveForward + 1;
+const CanMoveForwardReason kCantMoveDoorClosed = kCantMoveBlocked + 1;
+const CanMoveForwardReason kCantMoveDoorLocked = kCantMoveDoorClosed + 1;
+const CanMoveForwardReason kCantMoveLastReason = kCantMoveDoorLocked;
+
+const CanTurnReason kCanTurn = 0;
+const CanTurnReason kCantTurnNoTurn = kCanTurn + 1;
+const CanTurnReason kCantTurnLastReason = kCantTurnNoTurn;
+
+const CanOpenDoorReason kCanOpenDoor = 0;
+const CanOpenDoorReason kCantOpenNoDoor = kCanOpenDoor + 1;
+const CanOpenDoorReason kCantOpenLocked = kCantOpenNoDoor + 1;
+const CanOpenDoorReason kCantOpenAlreadyOpen = kCantOpenLocked + 1;
+const CanOpenDoorReason kCantOpenLastReason = kCantOpenAlreadyOpen;
+
+const DisplayElementID kNoDisplayElement = -1;
+const DisplayElementID kHighestReservedElementID = -2;
+
+const DisplayElementID kCursorID = kHighestReservedElementID;
+const DisplayElementID kLoadScreenID = kCursorID - 1;
+
+const DisplayOrder kMinAvailableOrder = 0;
+const DisplayOrder kMaxAvailableOrder = 999998;
+const DisplayOrder kLoadScreenOrder = 900000;
+const DisplayOrder kCursorOrder = 1000000;
+
+const HotSpotID kNoHotSpotID = -1;
+const HotSpotFlags kNoHotSpotFlags = 0;
+const HotSpotFlags kAllHotSpotFlags = ~kNoHotSpotFlags;
+
+const NotificationFlags kNoNotificationFlags = 0;
+
+const DisplayElementID kCurrentDragSpriteID = 1000;
 
 const TimeScale kDefaultTimeScale = 600;
 
@@ -217,23 +221,23 @@ const TimeValue kPlasmaImpactTime = kTwoSeconds;
 
 const TimeValue kNoradAirMaskTimeLimit = kOneMinute + kFifteenSeconds;
 
-const tNotificationID kNeighborhoodNotificationID = 1;
-const tNotificationID kLastNeighborhoodNotificationID = kNeighborhoodNotificationID;
-
-const tNotificationFlags kNeighborhoodMovieCompletedFlag = 1;
-const tNotificationFlags kMoveForwardCompletedFlag = kNeighborhoodMovieCompletedFlag << 1;
-const tNotificationFlags kStrideCompletedFlag = kMoveForwardCompletedFlag << 1;
-const tNotificationFlags kTurnCompletedFlag = kStrideCompletedFlag << 1;
-const tNotificationFlags kSpotCompletedFlag = kTurnCompletedFlag << 1;
-const tNotificationFlags kDoorOpenCompletedFlag = kSpotCompletedFlag << 1;
-const tNotificationFlags kExtraCompletedFlag = kDoorOpenCompletedFlag << 1;
-const tNotificationFlags kSpotSoundCompletedFlag = kExtraCompletedFlag << 1;
-const tNotificationFlags kDelayCompletedFlag = kSpotSoundCompletedFlag << 1;
-const tNotificationFlags kActionRequestCompletedFlag = kDelayCompletedFlag << 1;
-const tNotificationFlags kDeathExtraCompletedFlag = kActionRequestCompletedFlag << 1;
-const tNotificationFlags kLastNeighborhoodNotificationFlag = kDeathExtraCompletedFlag;
-
-const tNotificationFlags kNeighborhoodFlags =	kNeighborhoodMovieCompletedFlag |
+const NotificationID kNeighborhoodNotificationID = 1;
+const NotificationID kLastNeighborhoodNotificationID = kNeighborhoodNotificationID;
+
+const NotificationFlags kNeighborhoodMovieCompletedFlag = 1;
+const NotificationFlags kMoveForwardCompletedFlag = kNeighborhoodMovieCompletedFlag << 1;
+const NotificationFlags kStrideCompletedFlag = kMoveForwardCompletedFlag << 1;
+const NotificationFlags kTurnCompletedFlag = kStrideCompletedFlag << 1;
+const NotificationFlags kSpotCompletedFlag = kTurnCompletedFlag << 1;
+const NotificationFlags kDoorOpenCompletedFlag = kSpotCompletedFlag << 1;
+const NotificationFlags kExtraCompletedFlag = kDoorOpenCompletedFlag << 1;
+const NotificationFlags kSpotSoundCompletedFlag = kExtraCompletedFlag << 1;
+const NotificationFlags kDelayCompletedFlag = kSpotSoundCompletedFlag << 1;
+const NotificationFlags kActionRequestCompletedFlag = kDelayCompletedFlag << 1;
+const NotificationFlags kDeathExtraCompletedFlag = kActionRequestCompletedFlag << 1;
+const NotificationFlags kLastNeighborhoodNotificationFlag = kDeathExtraCompletedFlag;
+
+const NotificationFlags kNeighborhoodFlags =	kNeighborhoodMovieCompletedFlag |
 												kMoveForwardCompletedFlag |
 												kStrideCompletedFlag |
 												kTurnCompletedFlag |
@@ -262,146 +266,146 @@ const char kContinueSave = 1;
 
 //	Display IDs.
 
-const tDisplayElementID kNavMovieID = 1;
-const tDisplayElementID kTurnPushID = 2;
+const DisplayElementID kNavMovieID = 1;
+const DisplayElementID kTurnPushID = 2;
 
-const tDisplayElementID kMaxGameShellDisplayID = kTurnPushID;
+const DisplayElementID kMaxGameShellDisplayID = kTurnPushID;
 
 //	Display ordering.
 
-const tDisplayOrder kNavLayer = 10000;
-const tDisplayOrder kNavMovieOrder = kNavLayer;
-const tDisplayOrder kTurnPushOrder = kNavMovieOrder + 1;
+const DisplayOrder kNavLayer = 10000;
+const DisplayOrder kNavMovieOrder = kNavLayer;
+const DisplayOrder kTurnPushOrder = kNavMovieOrder + 1;
 
 /////////////////////////////////////////////
 //
 //	Display IDs.
 
-const tDisplayElementID kScreenDimmerID = kMaxGameShellDisplayID + 1;
-const tDisplayElementID kInterface1ID = kScreenDimmerID + 1;
-const tDisplayElementID kInterface2ID = kInterface1ID + 1;
-const tDisplayElementID kInterface3ID = kInterface2ID + 1;
-const tDisplayElementID kInterface4ID = kInterface3ID + 1;
-const tDisplayElementID kDateID = kInterface4ID + 1;
-const tDisplayElementID kCompassID = kDateID + 1;
-const tDisplayElementID kInventoryPushID = kCompassID + 1;
-const tDisplayElementID kInventoryLidID = kInventoryPushID + 1;
-const tDisplayElementID kBiochipPushID = kInventoryLidID + 1;
-const tDisplayElementID kBiochipLidID = kBiochipPushID + 1;
-const tDisplayElementID kEnergyBarID = kBiochipLidID + 1;
-const tDisplayElementID kWarningLightID = kEnergyBarID + 1;
-const tDisplayElementID kAILeftAreaID = kWarningLightID + 1;
-const tDisplayElementID kAIMiddleAreaID = kAILeftAreaID + 1;
-const tDisplayElementID kAIRightAreaID = kAIMiddleAreaID + 1;
-const tDisplayElementID kAIMovieID = kAIRightAreaID + 1;
-const tDisplayElementID kInventoryDropHighlightID = kAIMovieID + 1;
-const tDisplayElementID kBiochipDropHighlightID = kInventoryDropHighlightID + 1;
+const DisplayElementID kScreenDimmerID = kMaxGameShellDisplayID + 1;
+const DisplayElementID kInterface1ID = kScreenDimmerID + 1;
+const DisplayElementID kInterface2ID = kInterface1ID + 1;
+const DisplayElementID kInterface3ID = kInterface2ID + 1;
+const DisplayElementID kInterface4ID = kInterface3ID + 1;
+const DisplayElementID kDateID = kInterface4ID + 1;
+const DisplayElementID kCompassID = kDateID + 1;
+const DisplayElementID kInventoryPushID = kCompassID + 1;
+const DisplayElementID kInventoryLidID = kInventoryPushID + 1;
+const DisplayElementID kBiochipPushID = kInventoryLidID + 1;
+const DisplayElementID kBiochipLidID = kBiochipPushID + 1;
+const DisplayElementID kEnergyBarID = kBiochipLidID + 1;
+const DisplayElementID kWarningLightID = kEnergyBarID + 1;
+const DisplayElementID kAILeftAreaID = kWarningLightID + 1;
+const DisplayElementID kAIMiddleAreaID = kAILeftAreaID + 1;
+const DisplayElementID kAIRightAreaID = kAIMiddleAreaID + 1;
+const DisplayElementID kAIMovieID = kAIRightAreaID + 1;
+const DisplayElementID kInventoryDropHighlightID = kAIMovieID + 1;
+const DisplayElementID kBiochipDropHighlightID = kInventoryDropHighlightID + 1;
 
-const tDisplayElementID kDraggingSpriteID = 1000;
+const DisplayElementID kDraggingSpriteID = 1000;
 
-const tDisplayElementID kCroppedMovieID = 2000;
+const DisplayElementID kCroppedMovieID = 2000;
 
-const tDisplayElementID kNeighborhoodDisplayID = 3000;
+const DisplayElementID kNeighborhoodDisplayID = 3000;
 
-const tDisplayElementID kItemPictureBaseID = 5000;
+const DisplayElementID kItemPictureBaseID = 5000;
 
-const tCoordType kNavAreaLeft = 64;
-const tCoordType kNavAreaTop = 64;
+const CoordType kNavAreaLeft = 64;
+const CoordType kNavAreaTop = 64;
 
-const tCoordType kBackground1Left = 0;
-const tCoordType kBackground1Top = 64;
+const CoordType kBackground1Left = 0;
+const CoordType kBackground1Top = 64;
 
-const tCoordType kBackground2Left = 0;
-const tCoordType kBackground2Top = 0;
+const CoordType kBackground2Left = 0;
+const CoordType kBackground2Top = 0;
 
-const tCoordType kBackground3Left = 576;
-const tCoordType kBackground3Top = 64;
+const CoordType kBackground3Left = 576;
+const CoordType kBackground3Top = 64;
 
-const tCoordType kBackground4Left = 0;
-const tCoordType kBackground4Top = 320;
+const CoordType kBackground4Left = 0;
+const CoordType kBackground4Top = 320;
 
-const tCoordType kOverviewControllerLeft = 540;
-const tCoordType kOverviewControllerTop = 348;
+const CoordType kOverviewControllerLeft = 540;
+const CoordType kOverviewControllerTop = 348;
 
-const tCoordType kSwapLeft = 194;
-const tCoordType kSwapTop = 116;
+const CoordType kSwapLeft = 194;
+const CoordType kSwapTop = 116;
 
-const tCoordType kSwapHiliteLeft = 200;
-const tCoordType kSwapHiliteTop = 206;
+const CoordType kSwapHiliteLeft = 200;
+const CoordType kSwapHiliteTop = 206;
 
-const tCoordType kDateLeft = 136;
-const tCoordType kDateTop = 44;
+const CoordType kDateLeft = 136;
+const CoordType kDateTop = 44;
 
-const tCoordType kCompassLeft = 222;
-const tCoordType kCompassTop = 42;
-const tCoordType kCompassWidth = 92;
+const CoordType kCompassLeft = 222;
+const CoordType kCompassTop = 42;
+const CoordType kCompassWidth = 92;
 
-const tCoordType kInventoryPushLeft = 74;
-const tCoordType kInventoryPushTop = 92;
+const CoordType kInventoryPushLeft = 74;
+const CoordType kInventoryPushTop = 92;
 
-const tCoordType kInventoryLidLeft = 74;
-const tCoordType kInventoryLidTop = 316;
+const CoordType kInventoryLidLeft = 74;
+const CoordType kInventoryLidTop = 316;
 
-const tCoordType kBiochipPushLeft = 362;
-const tCoordType kBiochipPushTop = 192;
+const CoordType kBiochipPushLeft = 362;
+const CoordType kBiochipPushTop = 192;
 
-const tCoordType kBiochipLidLeft = 362;
-const tCoordType kBiochipLidTop = 316;
+const CoordType kBiochipLidLeft = 362;
+const CoordType kBiochipLidTop = 316;
 
-const tCoordType kInventoryDropLeft = 0;
-const tCoordType kInventoryDropTop = 320;
-const tCoordType kInventoryDropRight = 232;
-const tCoordType kInventoryDropBottom = 480;
+const CoordType kInventoryDropLeft = 0;
+const CoordType kInventoryDropTop = 320;
+const CoordType kInventoryDropRight = 232;
+const CoordType kInventoryDropBottom = 480;
 
-const tCoordType kBiochipDropLeft = 302;
-const tCoordType kBiochipDropTop = 320;
-const tCoordType kBiochipDropRight = 640;
-const tCoordType kBiochipDropBottom = 480;
+const CoordType kBiochipDropLeft = 302;
+const CoordType kBiochipDropTop = 320;
+const CoordType kBiochipDropRight = 640;
+const CoordType kBiochipDropBottom = 480;
 
-const tCoordType kFinalMessageLeft = kInventoryPushLeft + 1;
-const tCoordType kFinalMessageTop = kInventoryPushTop + 24;
+const CoordType kFinalMessageLeft = kInventoryPushLeft + 1;
+const CoordType kFinalMessageTop = kInventoryPushTop + 24;
 
 /////////////////////////////////////////////
 //
 //	Notifications.
 
-const tNotificationID kJMPDCShellNotificationID = kLastNeighborhoodNotificationID + 1;
-const tNotificationID kInterfaceNotificationID = kJMPDCShellNotificationID + 1;
-const tNotificationID kAINotificationID = kInterfaceNotificationID + 1;
-const tNotificationID kNoradNotificationID = kAINotificationID + 1;
-const tNotificationID kNoradECRNotificationID = kNoradNotificationID + 1;
-const tNotificationID kNoradFillingStationNotificationID = kNoradECRNotificationID + 1;
-const tNotificationID kNoradPressureNotificationID = kNoradFillingStationNotificationID + 1;
-const tNotificationID kNoradUtilityNotificationID = kNoradPressureNotificationID + 1;
-const tNotificationID kNoradElevatorNotificationID = kNoradUtilityNotificationID + 1;
-const tNotificationID kNoradSubPlatformNotificationID = kNoradElevatorNotificationID + 1;
-const tNotificationID kSubControlNotificationID = kNoradSubPlatformNotificationID + 1;
-const tNotificationID kNoradGreenBallNotificationID = kSubControlNotificationID + 1;
-const tNotificationID kNoradGlobeNotificationID = kNoradGreenBallNotificationID + 1;
-const tNotificationID kCaldoriaVidPhoneNotificationID = kNoradGlobeNotificationID + 1;
-const tNotificationID kCaldoriaMessagesNotificationID = kCaldoriaVidPhoneNotificationID + 1;
-const tNotificationID kCaldoriaBombTimerNotificationID = kCaldoriaMessagesNotificationID + 1;
+const NotificationID kJMPDCShellNotificationID = kLastNeighborhoodNotificationID + 1;
+const NotificationID kInterfaceNotificationID = kJMPDCShellNotificationID + 1;
+const NotificationID kAINotificationID = kInterfaceNotificationID + 1;
+const NotificationID kNoradNotificationID = kAINotificationID + 1;
+const NotificationID kNoradECRNotificationID = kNoradNotificationID + 1;
+const NotificationID kNoradFillingStationNotificationID = kNoradECRNotificationID + 1;
+const NotificationID kNoradPressureNotificationID = kNoradFillingStationNotificationID + 1;
+const NotificationID kNoradUtilityNotificationID = kNoradPressureNotificationID + 1;
+const NotificationID kNoradElevatorNotificationID = kNoradUtilityNotificationID + 1;
+const NotificationID kNoradSubPlatformNotificationID = kNoradElevatorNotificationID + 1;
+const NotificationID kSubControlNotificationID = kNoradSubPlatformNotificationID + 1;
+const NotificationID kNoradGreenBallNotificationID = kSubControlNotificationID + 1;
+const NotificationID kNoradGlobeNotificationID = kNoradGreenBallNotificationID + 1;
+const NotificationID kCaldoriaVidPhoneNotificationID = kNoradGlobeNotificationID + 1;
+const NotificationID kCaldoriaMessagesNotificationID = kCaldoriaVidPhoneNotificationID + 1;
+const NotificationID kCaldoriaBombTimerNotificationID = kCaldoriaMessagesNotificationID + 1;
 
 //	Sent to the shell by fShellNotification.
-const tNotificationFlags kGameStartingFlag = 1;
-const tNotificationFlags kNeedNewJumpFlag = kGameStartingFlag << 1;
-const tNotificationFlags kPlayerDiedFlag = kNeedNewJumpFlag << 1;
+const NotificationFlags kGameStartingFlag = 1;
+const NotificationFlags kNeedNewJumpFlag = kGameStartingFlag << 1;
+const NotificationFlags kPlayerDiedFlag = kNeedNewJumpFlag << 1;
 
-const tNotificationFlags kJMPShellNotificationFlags = kGameStartingFlag |
+const NotificationFlags kJMPShellNotificationFlags = kGameStartingFlag |
 														kNeedNewJumpFlag |
 														kPlayerDiedFlag;
 
 //	Sent to the interface.
-const tNotificationFlags kInventoryLidOpenFlag = 1;
-const tNotificationFlags kInventoryLidClosedFlag = kInventoryLidOpenFlag << 1;
-const tNotificationFlags kInventoryDrawerUpFlag = kInventoryLidClosedFlag << 1;
-const tNotificationFlags kInventoryDrawerDownFlag = kInventoryDrawerUpFlag << 1;
-const tNotificationFlags kBiochipLidOpenFlag = kInventoryDrawerDownFlag << 1;
-const tNotificationFlags kBiochipLidClosedFlag = kBiochipLidOpenFlag << 1;
-const tNotificationFlags kBiochipDrawerUpFlag = kBiochipLidClosedFlag << 1;
-const tNotificationFlags kBiochipDrawerDownFlag = kBiochipDrawerUpFlag << 1;
-
-const tNotificationFlags kInterfaceNotificationFlags =	kInventoryLidOpenFlag |
+const NotificationFlags kInventoryLidOpenFlag = 1;
+const NotificationFlags kInventoryLidClosedFlag = kInventoryLidOpenFlag << 1;
+const NotificationFlags kInventoryDrawerUpFlag = kInventoryLidClosedFlag << 1;
+const NotificationFlags kInventoryDrawerDownFlag = kInventoryDrawerUpFlag << 1;
+const NotificationFlags kBiochipLidOpenFlag = kInventoryDrawerDownFlag << 1;
+const NotificationFlags kBiochipLidClosedFlag = kBiochipLidOpenFlag << 1;
+const NotificationFlags kBiochipDrawerUpFlag = kBiochipLidClosedFlag << 1;
+const NotificationFlags kBiochipDrawerDownFlag = kBiochipDrawerUpFlag << 1;
+
+const NotificationFlags kInterfaceNotificationFlags =	kInventoryLidOpenFlag |
 														kInventoryLidClosedFlag |
 														kInventoryDrawerUpFlag |
 														kInventoryDrawerDownFlag |
@@ -414,28 +418,28 @@ const tNotificationFlags kInterfaceNotificationFlags =	kInventoryLidOpenFlag |
 
 //	Neighborhood hot spots.
 
-const tHotSpotID kFirstNeighborhoodSpotID = 5000;
+const HotSpotID kFirstNeighborhoodSpotID = 5000;
 
 //	kShellSpotFlag is a flag which marks all hot spots which belong to the shell, like
 //	the current item and current biochip spots.
-const tHotSpotFlags kShellSpotFlag = 1;
+const HotSpotFlags kShellSpotFlag = 1;
 //	kNeighborhoodSpotFlag is a flag which marks all hot spots which belong to a
 //	neighborhood, like buttons on walls and so on.
-const tHotSpotFlags kNeighborhoodSpotFlag = kShellSpotFlag << 1;
+const HotSpotFlags kNeighborhoodSpotFlag = kShellSpotFlag << 1;
 //	kZoomInSpotFlag is a flag which marks all hot spots which indicate a zoom.
-const tHotSpotFlags kZoomInSpotFlag = kNeighborhoodSpotFlag << 1;
+const HotSpotFlags kZoomInSpotFlag = kNeighborhoodSpotFlag << 1;
 //	kZoomOutSpotFlag is a flag which marks all hot spots which indicate a zoom.
-const tHotSpotFlags kZoomOutSpotFlag = kZoomInSpotFlag << 1;
+const HotSpotFlags kZoomOutSpotFlag = kZoomInSpotFlag << 1;
 
-const tHotSpotFlags kClickSpotFlag = kZoomOutSpotFlag << 1;
-const tHotSpotFlags kPlayExtraSpotFlag = kClickSpotFlag << 1;
-const tHotSpotFlags kPickUpItemSpotFlag = kPlayExtraSpotFlag << 1;
-const tHotSpotFlags kDropItemSpotFlag = kPickUpItemSpotFlag << 1;
-const tHotSpotFlags kOpenDoorSpotFlag = kDropItemSpotFlag << 1;
+const HotSpotFlags kClickSpotFlag = kZoomOutSpotFlag << 1;
+const HotSpotFlags kPlayExtraSpotFlag = kClickSpotFlag << 1;
+const HotSpotFlags kPickUpItemSpotFlag = kPlayExtraSpotFlag << 1;
+const HotSpotFlags kDropItemSpotFlag = kPickUpItemSpotFlag << 1;
+const HotSpotFlags kOpenDoorSpotFlag = kDropItemSpotFlag << 1;
 
-const tHotSpotFlags kZoomSpotFlags = kZoomInSpotFlag | kZoomOutSpotFlag;
+const HotSpotFlags kZoomSpotFlags = kZoomInSpotFlag | kZoomOutSpotFlag;
 
-const tHotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag;
+const HotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag;
 
 /////////////////////////////////////////////
 //
@@ -444,64 +448,64 @@ const tHotSpotFlags kHighestGameShellSpotFlag = kOpenDoorSpotFlag;
 //	Shell hot spots.
 //	The shell reserves all hot spot IDs from 0 to 999
 
-const tHotSpotID kCurrentItemSpotID = 0;
-const tHotSpotID kCurrentBiochipSpotID = kCurrentItemSpotID + 1;
+const HotSpotID kCurrentItemSpotID = 0;
+const HotSpotID kCurrentBiochipSpotID = kCurrentItemSpotID + 1;
 
-const tHotSpotID kInventoryDropSpotID = kCurrentBiochipSpotID + 1;
-const tHotSpotID kBiochipDropSpotID = kInventoryDropSpotID + 1;
+const HotSpotID kInventoryDropSpotID = kCurrentBiochipSpotID + 1;
+const HotSpotID kBiochipDropSpotID = kInventoryDropSpotID + 1;
 
-const tHotSpotID kInfoReturnSpotID = kBiochipDropSpotID + 1;
+const HotSpotID kInfoReturnSpotID = kBiochipDropSpotID + 1;
 
-const tHotSpotID kAIHint1SpotID = kInfoReturnSpotID + 1;
-const tHotSpotID kAIHint2SpotID = kAIHint1SpotID + 1;
-const tHotSpotID kAIHint3SpotID = kAIHint2SpotID + 1;
-const tHotSpotID kAISolveSpotID = kAIHint3SpotID + 1;
-const tHotSpotID kAIBriefingSpotID = kAISolveSpotID + 1;
-const tHotSpotID kAIScanSpotID = kAIBriefingSpotID + 1;
+const HotSpotID kAIHint1SpotID = kInfoReturnSpotID + 1;
+const HotSpotID kAIHint2SpotID = kAIHint1SpotID + 1;
+const HotSpotID kAIHint3SpotID = kAIHint2SpotID + 1;
+const HotSpotID kAISolveSpotID = kAIHint3SpotID + 1;
+const HotSpotID kAIBriefingSpotID = kAISolveSpotID + 1;
+const HotSpotID kAIScanSpotID = kAIBriefingSpotID + 1;
 
-const tHotSpotID kPegasusRecallSpotID = kAIScanSpotID + 1;
+const HotSpotID kPegasusRecallSpotID = kAIScanSpotID + 1;
 
-const tHotSpotID kAriesSpotID = kPegasusRecallSpotID + 1;
-const tHotSpotID kMercurySpotID = kAriesSpotID + 1;
-const tHotSpotID kPoseidonSpotID = kMercurySpotID + 1;
+const HotSpotID kAriesSpotID = kPegasusRecallSpotID + 1;
+const HotSpotID kMercurySpotID = kAriesSpotID + 1;
+const HotSpotID kPoseidonSpotID = kMercurySpotID + 1;
 
-const tHotSpotID kAirMaskToggleSpotID = kPoseidonSpotID + 1;
+const HotSpotID kAirMaskToggleSpotID = kPoseidonSpotID + 1;
 
-const tHotSpotID kShuttleEnergySpotID = kAirMaskToggleSpotID + 1;
-const tHotSpotID kShuttleGravitonSpotID = kShuttleEnergySpotID + 1;
-const tHotSpotID kShuttleTractorSpotID = kShuttleGravitonSpotID + 1;
-const tHotSpotID kShuttleViewSpotID = kShuttleTractorSpotID + 1;
-const tHotSpotID kShuttleTransportSpotID = kShuttleViewSpotID + 1;
+const HotSpotID kShuttleEnergySpotID = kAirMaskToggleSpotID + 1;
+const HotSpotID kShuttleGravitonSpotID = kShuttleEnergySpotID + 1;
+const HotSpotID kShuttleTractorSpotID = kShuttleGravitonSpotID + 1;
+const HotSpotID kShuttleViewSpotID = kShuttleTractorSpotID + 1;
+const HotSpotID kShuttleTransportSpotID = kShuttleViewSpotID + 1;
 
 //	Most of these are obsolete:
 
 //	kInventoryDropSpotFlag is a flag which marks hot spots which are valid drop spots
 //	for inventory items.
-//	const tHotSpotFlags kInventoryDropSpotFlag = kHighestGameShellSpotFlag << 1;
+//	const HotSpotFlags kInventoryDropSpotFlag = kHighestGameShellSpotFlag << 1;
 
 //	kBiochipDropSpotFlag is a flag which marks hot spots which are valid drop spots
 //	for biochips.
-//	const tHotSpotFlags kBiochipDropSpotFlag = kInventoryDropSpotFlag << 1;
+//	const HotSpotFlags kBiochipDropSpotFlag = kInventoryDropSpotFlag << 1;
 
 //	kInventorySpotFlag is a flag which marks hot spots which indicate inventory items
 //	in the environment.
-//	const tHotSpotFlags kInventorySpotFlag = kBiochipDropSpotFlag << 1;
+//	const HotSpotFlags kInventorySpotFlag = kBiochipDropSpotFlag << 1;
 
 //	kBiochipSpotFlag is a flag which marks hot spots which indicate biochips
 //	in the environment.
-const tHotSpotFlags kPickUpBiochipSpotFlag = kHighestGameShellSpotFlag << 1;
-const tHotSpotFlags kDropBiochipSpotFlag = kPickUpBiochipSpotFlag << 1;
+const HotSpotFlags kPickUpBiochipSpotFlag = kHighestGameShellSpotFlag << 1;
+const HotSpotFlags kDropBiochipSpotFlag = kPickUpBiochipSpotFlag << 1;
 
-const tHotSpotFlags kInfoReturnSpotFlag = kDropBiochipSpotFlag << 1;
+const HotSpotFlags kInfoReturnSpotFlag = kDropBiochipSpotFlag << 1;
 
 //	Biochip and inventory hot spot flags...
 
-const tHotSpotFlags kAIBiochipSpotFlag = kInfoReturnSpotFlag << 1;
-const tHotSpotFlags kPegasusBiochipSpotFlag = kAIBiochipSpotFlag << 1;
-const tHotSpotFlags kOpticalBiochipSpotFlag = kPegasusBiochipSpotFlag << 1;
-const tHotSpotFlags kAirMaskSpotFlag = kOpticalBiochipSpotFlag << 1;
+const HotSpotFlags kAIBiochipSpotFlag = kInfoReturnSpotFlag << 1;
+const HotSpotFlags kPegasusBiochipSpotFlag = kAIBiochipSpotFlag << 1;
+const HotSpotFlags kOpticalBiochipSpotFlag = kPegasusBiochipSpotFlag << 1;
+const HotSpotFlags kAirMaskSpotFlag = kOpticalBiochipSpotFlag << 1;
 
-const tHotSpotFlags kJMPClickingSpotFlags = kClickSpotFlag |
+const HotSpotFlags kJMPClickingSpotFlags = kClickSpotFlag |
 											kPlayExtraSpotFlag |
 											kOpenDoorSpotFlag |
 											kInfoReturnSpotFlag |
@@ -519,30 +523,30 @@ const int32 kDeathMenuID = 4;
 //
 //	Menu commands.
 
-const tGameMenuCommand kMenuCmdOverview = kMenuCmdNoCommand + 1;
-const tGameMenuCommand kMenuCmdStartAdventure = kMenuCmdOverview + 1;
-const tGameMenuCommand kMenuCmdStartWalkthrough = kMenuCmdStartAdventure + 1;
-const tGameMenuCommand kMenuCmdRestore = kMenuCmdStartWalkthrough + 1;
-const tGameMenuCommand kMenuCmdCredits = kMenuCmdRestore + 1;
-const tGameMenuCommand kMenuCmdQuit = kMenuCmdCredits + 1;
+const GameMenuCommand kMenuCmdOverview = kMenuCmdNoCommand + 1;
+const GameMenuCommand kMenuCmdStartAdventure = kMenuCmdOverview + 1;
+const GameMenuCommand kMenuCmdStartWalkthrough = kMenuCmdStartAdventure + 1;
+const GameMenuCommand kMenuCmdRestore = kMenuCmdStartWalkthrough + 1;
+const GameMenuCommand kMenuCmdCredits = kMenuCmdRestore + 1;
+const GameMenuCommand kMenuCmdQuit = kMenuCmdCredits + 1;
 
-const tGameMenuCommand kMenuCmdDeathContinue = kMenuCmdQuit + 1;
+const GameMenuCommand kMenuCmdDeathContinue = kMenuCmdQuit + 1;
 
-const tGameMenuCommand kMenuCmdDeathQuitDemo = kMenuCmdDeathContinue + 1;
-const tGameMenuCommand kMenuCmdDeathMainMenuDemo = kMenuCmdDeathQuitDemo + 1;
+const GameMenuCommand kMenuCmdDeathQuitDemo = kMenuCmdDeathContinue + 1;
+const GameMenuCommand kMenuCmdDeathMainMenuDemo = kMenuCmdDeathQuitDemo + 1;
 
-const tGameMenuCommand kMenuCmdDeathRestore = kMenuCmdDeathMainMenuDemo + 1;
-const tGameMenuCommand kMenuCmdDeathMainMenu = kMenuCmdDeathRestore + 1;
+const GameMenuCommand kMenuCmdDeathRestore = kMenuCmdDeathMainMenuDemo + 1;
+const GameMenuCommand kMenuCmdDeathMainMenu = kMenuCmdDeathRestore + 1;
 
-const tGameMenuCommand kMenuCmdPauseSave = kMenuCmdDeathMainMenu + 1;
-const tGameMenuCommand kMenuCmdPauseContinue = kMenuCmdPauseSave + 1;
-const tGameMenuCommand kMenuCmdPauseRestore = kMenuCmdPauseContinue + 1;
-const tGameMenuCommand kMenuCmdPauseQuit = kMenuCmdPauseRestore + 1;
+const GameMenuCommand kMenuCmdPauseSave = kMenuCmdDeathMainMenu + 1;
+const GameMenuCommand kMenuCmdPauseContinue = kMenuCmdPauseSave + 1;
+const GameMenuCommand kMenuCmdPauseRestore = kMenuCmdPauseContinue + 1;
+const GameMenuCommand kMenuCmdPauseQuit = kMenuCmdPauseRestore + 1;
 
-const tGameMenuCommand kMenuCmdCreditsMainMenu = kMenuCmdPauseQuit + 1;
+const GameMenuCommand kMenuCmdCreditsMainMenu = kMenuCmdPauseQuit + 1;
 
-const tGameMenuCommand kMenuCmdCancelRestart = kMenuCmdCreditsMainMenu + 1;
-const tGameMenuCommand kMenuCmdEjectRestart = kMenuCmdCancelRestart + 1;
+const GameMenuCommand kMenuCmdCancelRestart = kMenuCmdCreditsMainMenu + 1;
+const GameMenuCommand kMenuCmdEjectRestart = kMenuCmdCancelRestart + 1;
 
 const TimeValue kMenuButtonHiliteTime = 20;
 const TimeScale kMenuButtonHiliteScale = kSixtyTicksPerSecond;
@@ -551,74 +555,74 @@ const TimeScale kMenuButtonHiliteScale = kSixtyTicksPerSecond;
 
 //	Warning light PICTs:
 
-const tResIDType kLightOffID = 128;
-const tResIDType kLightYellowID = 129;
-const tResIDType kLightOrangeID = 130;
-const tResIDType kLightRedID = 131;
+const ResIDType kLightOffID = 128;
+const ResIDType kLightYellowID = 129;
+const ResIDType kLightOrangeID = 130;
+const ResIDType kLightRedID = 131;
 
 //	Date PICTs:
 
-const tResIDType kDatePrehistoricID = 138;
-const tResIDType kDate2112ID = 139;
-const tResIDType kDate2185ID = 140;
-const tResIDType kDate2310ID = 141;
-const tResIDType kDate2318ID = 142;
+const ResIDType kDatePrehistoricID = 138;
+const ResIDType kDate2112ID = 139;
+const ResIDType kDate2185ID = 140;
+const ResIDType kDate2310ID = 141;
+const ResIDType kDate2318ID = 142;
 
 /////////////////////////////////////////////
 //
 //	Display Order
 
-const tDisplayOrder kCroppedMovieLayer = 11000;
-
-const tDisplayOrder kMonitorLayer = 12000;
-
-const tDisplayOrder kDragSpriteLayer = 15000;
-const tDisplayOrder kDragSpriteOrder = kDragSpriteLayer;
-
-const tDisplayOrder kInterfaceLayer = 20000;
-const tDisplayOrder kBackground1Order = kInterfaceLayer;
-const tDisplayOrder kBackground2Order = kBackground1Order + 1;
-const tDisplayOrder kBackground3Order = kBackground2Order + 1;
-const tDisplayOrder kBackground4Order = kBackground3Order + 1;
-const tDisplayOrder kDateOrder = kBackground4Order + 1;
-const tDisplayOrder kCompassOrder = kDateOrder + 1;
-const tDisplayOrder kEnergyBarOrder = kCompassOrder + 1;
-const tDisplayOrder kEnergyLightOrder = kEnergyBarOrder + 1;
-
-const tDisplayOrder kAILayer = 22000;
-const tDisplayOrder kAILeftAreaOrder = kAILayer;
-const tDisplayOrder kAIMiddleAreaOrder = kAILeftAreaOrder + 1;
-const tDisplayOrder kAIRightAreaOrder = kAIMiddleAreaOrder + 1;
-const tDisplayOrder kAIMovieOrder = kAIRightAreaOrder + 1;
-
-const tDisplayOrder kHilitesLayer = 23000;
-const tDisplayOrder kInventoryHiliteOrder = kHilitesLayer;
-const tDisplayOrder kBiochipHiliteOrder = kInventoryHiliteOrder + 1;
-
-const tDisplayOrder kPanelsLayer = 25000;
-const tDisplayOrder kInventoryPushOrder = kPanelsLayer;
-const tDisplayOrder kInventoryLidOrder = kInventoryPushOrder + 1;
-const tDisplayOrder kBiochipPushOrder = kInventoryLidOrder + 1;
-const tDisplayOrder kBiochipLidOrder = kBiochipPushOrder + 1;
-const tDisplayOrder kFinalMessageOrder = kBiochipLidOrder + 1;
-
-const tDisplayOrder kInfoLayer = 26000;
-const tDisplayOrder kInfoBackgroundOrder = kInfoLayer;
-const tDisplayOrder kInfoSpinOrder = kInfoBackgroundOrder + 1;
-
-const tDisplayOrder kScreenDimmerOrder = 30000;
-
-const tDisplayOrder kPauseScreenLayer = 31000;
-const tDisplayOrder kPauseMenuOrder = kPauseScreenLayer;
-const tDisplayOrder kSaveGameOrder = kPauseMenuOrder + 1;
-const tDisplayOrder kContinueOrder = kSaveGameOrder + 1;
-const tDisplayOrder kRestoreOrder = kContinueOrder + 1;
-const tDisplayOrder kSoundFXOrder = kRestoreOrder + 1;
-const tDisplayOrder kAmbienceOrder = kSoundFXOrder + 1;
-const tDisplayOrder kWalkthruOrder = kAmbienceOrder + 1;
-const tDisplayOrder kQuitToMainMenuOrder = kWalkthruOrder + 1;
-const tDisplayOrder kPauseLargeHiliteOrder = kQuitToMainMenuOrder + 1;
-const tDisplayOrder kPauseSmallHiliteOrder = kPauseLargeHiliteOrder + 1;
+const DisplayOrder kCroppedMovieLayer = 11000;
+
+const DisplayOrder kMonitorLayer = 12000;
+
+const DisplayOrder kDragSpriteLayer = 15000;
+const DisplayOrder kDragSpriteOrder = kDragSpriteLayer;
+
+const DisplayOrder kInterfaceLayer = 20000;
+const DisplayOrder kBackground1Order = kInterfaceLayer;
+const DisplayOrder kBackground2Order = kBackground1Order + 1;
+const DisplayOrder kBackground3Order = kBackground2Order + 1;
+const DisplayOrder kBackground4Order = kBackground3Order + 1;
+const DisplayOrder kDateOrder = kBackground4Order + 1;
+const DisplayOrder kCompassOrder = kDateOrder + 1;
+const DisplayOrder kEnergyBarOrder = kCompassOrder + 1;
+const DisplayOrder kEnergyLightOrder = kEnergyBarOrder + 1;
+
+const DisplayOrder kAILayer = 22000;
+const DisplayOrder kAILeftAreaOrder = kAILayer;
+const DisplayOrder kAIMiddleAreaOrder = kAILeftAreaOrder + 1;
+const DisplayOrder kAIRightAreaOrder = kAIMiddleAreaOrder + 1;
+const DisplayOrder kAIMovieOrder = kAIRightAreaOrder + 1;
+
+const DisplayOrder kHilitesLayer = 23000;
+const DisplayOrder kInventoryHiliteOrder = kHilitesLayer;
+const DisplayOrder kBiochipHiliteOrder = kInventoryHiliteOrder + 1;
+
+const DisplayOrder kPanelsLayer = 25000;
+const DisplayOrder kInventoryPushOrder = kPanelsLayer;
+const DisplayOrder kInventoryLidOrder = kInventoryPushOrder + 1;
+const DisplayOrder kBiochipPushOrder = kInventoryLidOrder + 1;
+const DisplayOrder kBiochipLidOrder = kBiochipPushOrder + 1;
+const DisplayOrder kFinalMessageOrder = kBiochipLidOrder + 1;
+
+const DisplayOrder kInfoLayer = 26000;
+const DisplayOrder kInfoBackgroundOrder = kInfoLayer;
+const DisplayOrder kInfoSpinOrder = kInfoBackgroundOrder + 1;
+
+const DisplayOrder kScreenDimmerOrder = 30000;
+
+const DisplayOrder kPauseScreenLayer = 31000;
+const DisplayOrder kPauseMenuOrder = kPauseScreenLayer;
+const DisplayOrder kSaveGameOrder = kPauseMenuOrder + 1;
+const DisplayOrder kContinueOrder = kSaveGameOrder + 1;
+const DisplayOrder kRestoreOrder = kContinueOrder + 1;
+const DisplayOrder kSoundFXOrder = kRestoreOrder + 1;
+const DisplayOrder kAmbienceOrder = kSoundFXOrder + 1;
+const DisplayOrder kWalkthruOrder = kAmbienceOrder + 1;
+const DisplayOrder kQuitToMainMenuOrder = kWalkthruOrder + 1;
+const DisplayOrder kPauseLargeHiliteOrder = kQuitToMainMenuOrder + 1;
+const DisplayOrder kPauseSmallHiliteOrder = kPauseLargeHiliteOrder + 1;
 
 /////////////////////////////////////////////
 //
@@ -674,23 +678,23 @@ enum {
 	kPlayerWonGame
 };
 
-static const tCoordType kAILeftAreaLeft = 76;
-static const tCoordType kAILeftAreaTop = 334;
+static const CoordType kAILeftAreaLeft = 76;
+static const CoordType kAILeftAreaTop = 334;
 
-static const tCoordType kAILeftAreaWidth = 96;
-static const tCoordType kAILeftAreaHeight = 96;
+static const CoordType kAILeftAreaWidth = 96;
+static const CoordType kAILeftAreaHeight = 96;
 
-static const tCoordType kAIMiddleAreaLeft = 172;
-static const tCoordType kAIMiddleAreaTop = 334;
+static const CoordType kAIMiddleAreaLeft = 172;
+static const CoordType kAIMiddleAreaTop = 334;
 
-static const tCoordType kAIMiddleAreaWidth = 192;
-static const tCoordType kAIMiddleAreaHeight = 96;
+static const CoordType kAIMiddleAreaWidth = 192;
+static const CoordType kAIMiddleAreaHeight = 96;
 
-static const tCoordType kAIRightAreaLeft = 364;
-static const tCoordType kAIRightAreaTop = 334;
+static const CoordType kAIRightAreaLeft = 364;
+static const CoordType kAIRightAreaTop = 334;
 
-static const tCoordType kAIRightAreaWidth = 96;
-static const tCoordType kAIRightAreaHeight = 96;
+static const CoordType kAIRightAreaWidth = 96;
+static const CoordType kAIRightAreaHeight = 96;
 
 enum {
 	kTSAPlayerNotArrived,				//	initial state, must be zero
@@ -712,18 +716,13 @@ enum {
 	kPlayerFinishedWithTSA
 };
 
-static const tDirectionConstant kNorth = 0;
-static const tDirectionConstant kSouth = 1;
-static const tDirectionConstant kEast = 2;
-static const tDirectionConstant kWest = 3;
-
 /////////////////////////////////////////////
 //
 //	Mode constants.
 
-static const tGameMode kModeInventoryPick = kLastGameShellMode + 1;
-static const tGameMode kModeBiochipPick = kModeInventoryPick + 1;
-static const tGameMode kModeInfoScreen = kModeBiochipPick + 1;
+static const GameMode kModeInventoryPick = kLastGameShellMode + 1;
+static const GameMode kModeBiochipPick = kModeInventoryPick + 1;
+static const GameMode kModeInfoScreen = kModeBiochipPick + 1;
 
 } // End of namespace Pegasus
 
diff --git a/engines/pegasus/elements.cpp b/engines/pegasus/elements.cpp
index 6fce18ff9e..850b9cb8cf 100644
--- a/engines/pegasus/elements.cpp
+++ b/engines/pegasus/elements.cpp
@@ -32,7 +32,7 @@
 
 namespace Pegasus {
 
-DisplayElement::DisplayElement(const tDisplayElementID id) : IDObject(id) {
+DisplayElement::DisplayElement(const DisplayElementID id) : IDObject(id) {
 	_elementIsDisplaying = false;
 	_elementIsVisible = false;
 	_elementOrder = 0;
@@ -45,7 +45,7 @@ DisplayElement::~DisplayElement() {
 		((PegasusEngine *)g_engine)->_gfx->removeDisplayElement(this);
 }
 
-void DisplayElement::setDisplayOrder(const tDisplayOrder order) {
+void DisplayElement::setDisplayOrder(const DisplayOrder order) {
 	if (_elementOrder != order) {
 		_elementOrder = order;
 		if (isDisplaying()) {
@@ -70,7 +70,7 @@ void DisplayElement::stopDisplaying() {
 	}
 }
 
-void DisplayElement::setBounds(const tCoordType left, const tCoordType top, const tCoordType right, const tCoordType bottom) {
+void DisplayElement::setBounds(const CoordType left, const CoordType top, const CoordType right, const CoordType bottom) {
 	setBounds(Common::Rect(left, top, right, bottom));
 }
 
@@ -78,37 +78,37 @@ void DisplayElement::getBounds(Common::Rect &r) const {
 	r = _bounds;
 }
 
-void DisplayElement::sizeElement(const tCoordType h, const tCoordType v) {
+void DisplayElement::sizeElement(const CoordType h, const CoordType v) {
 	Common::Rect newBounds = _bounds;
 	newBounds.right = _bounds.left + h;
 	newBounds.bottom = _bounds.top + v;
 	setBounds(newBounds);
 }
 
-void DisplayElement::moveElementTo(const tCoordType h, const tCoordType v) {
+void DisplayElement::moveElementTo(const CoordType h, const CoordType v) {
 	Common::Rect newBounds = _bounds;
 	newBounds.moveTo(h, v);
 	setBounds(newBounds);
 }
 
-void DisplayElement::moveElement(const tCoordType dh, const tCoordType dv) {
+void DisplayElement::moveElement(const CoordType dh, const CoordType dv) {
 	Common::Rect newBounds = _bounds;
 	newBounds.translate(dh, dv);
 	setBounds(newBounds);
 }
 
-void DisplayElement::getLocation(tCoordType &h, tCoordType &v) const {
+void DisplayElement::getLocation(CoordType &h, CoordType &v) const {
 	h = _bounds.left;
 	v = _bounds.top;
 }
 
-void DisplayElement::centerElementAt(const tCoordType h, const tCoordType v) {
+void DisplayElement::centerElementAt(const CoordType h, const CoordType v) {
 	Common::Rect newBounds = _bounds;
 	newBounds.moveTo(h - (_bounds.width() / 2), v - (_bounds.height() / 2));
 	setBounds(newBounds);
 }
 
-void DisplayElement::getCenter(tCoordType &h, tCoordType &v) const {
+void DisplayElement::getCenter(CoordType &h, CoordType &v) const {
 	h = (_bounds.left + _bounds.right) / 2;
 	v = (_bounds.top + _bounds.bottom) / 2;
 }
@@ -158,14 +158,14 @@ void DisplayElement::setTriggeredElement(DisplayElement *element) {
 		_triggeredElement = this;
 }
 
-bool DisplayElement::validToDraw(tDisplayOrder backLayer, tDisplayOrder frontLayer) {
+bool DisplayElement::validToDraw(DisplayOrder backLayer, DisplayOrder frontLayer) {
 	return	isDisplaying() && _elementIsVisible &&
 			(getObjectID() <= kHighestReservedElementID ||
 			(getDisplayOrder() >= backLayer &&
 			getDisplayOrder() <= frontLayer));
 }
 
-DropHighlight::DropHighlight(const tDisplayElementID id) : DisplayElement(id) {
+DropHighlight::DropHighlight(const DisplayElementID id) : DisplayElement(id) {
 	_highlightColor = 0;
 	_thickness = 2;
 	_cornerDiameter = 0;
@@ -193,7 +193,7 @@ void DropHighlight::draw(const Common::Rect &) {
 	}
 }
 
-IdlerAnimation::IdlerAnimation(const tDisplayElementID id) : Animation(id) {
+IdlerAnimation::IdlerAnimation(const DisplayElementID id) : Animation(id) {
 	_lastTime = 0xffffffff;
 }
 
@@ -224,7 +224,7 @@ void IdlerAnimation::timeChanged(const TimeValue) {
 	triggerRedraw();
 }
 
-FrameSequence::FrameSequence(const tDisplayElementID id) : IdlerAnimation(id) {
+FrameSequence::FrameSequence(const DisplayElementID id) : IdlerAnimation(id) {
 	_duration = 0;
 	_currentFrameNum = 0;
 	_resFork = new Common::MacResManager();
@@ -312,7 +312,7 @@ bool FrameSequence::isSequenceOpen() const {
 	return _numFrames != 0;
 }
 
-Sprite::Sprite(const tDisplayElementID id) : DisplayElement(id) {
+Sprite::Sprite(const DisplayElementID id) : DisplayElement(id) {
 	_numFrames = 0;
 	_currentFrameNum = 0xffffffff;
 	_currentFrame = 0;
@@ -339,13 +339,13 @@ void Sprite::discardFrames() {
 	}
 }
 
-void Sprite::addPICTResourceFrame(const tResIDType pictID, bool transparent, const tCoordType left, const tCoordType top) {
+void Sprite::addPICTResourceFrame(const ResIDType pictID, bool transparent, const CoordType left, const CoordType top) {
 	SpriteFrame *frame = new SpriteFrame();
 	frame->initFromPICTResource(((PegasusEngine *)g_engine)->_resFork, pictID, transparent);
 	addFrame(frame, left, top);
 }
 
-uint32 Sprite::addFrame(SpriteFrame *frame, const tCoordType left, const tCoordType top) {
+uint32 Sprite::addFrame(SpriteFrame *frame, const CoordType left, const CoordType top) {
 	SpriteFrameRec frameRecord;
 	frameRecord.frame = frame;
 	frameRecord.frameLeft = left;
@@ -436,7 +436,7 @@ void Sprite::draw(const Common::Rect &r) {
 	}
 }
 
-SpriteSequence::SpriteSequence(const tDisplayElementID id, const tDisplayElementID spriteID) :
+SpriteSequence::SpriteSequence(const DisplayElementID id, const DisplayElementID spriteID) :
 		FrameSequence(id), _sprite(spriteID), _transparent(false) {
 }
 
@@ -524,7 +524,7 @@ void ScreenDimmer::draw(const Common::Rect &r) {
 #undef DRAW_PIXEL
 #undef SKIP_PIXEL
 
-SoundLevel::SoundLevel(const tDisplayElementID id) : DisplayElement(id) {
+SoundLevel::SoundLevel(const DisplayElementID id) : DisplayElement(id) {
 	_soundLevel = 0;
 }
 
diff --git a/engines/pegasus/elements.h b/engines/pegasus/elements.h
index 6e20e72201..009cb3a690 100644
--- a/engines/pegasus/elements.h
+++ b/engines/pegasus/elements.h
@@ -44,13 +44,13 @@ namespace Pegasus {
 class DisplayElement : public IDObject {
 friend class GraphicsManager;
 public:
-	DisplayElement(const tDisplayElementID);
+	DisplayElement(const DisplayElementID);
 	virtual ~DisplayElement();
 	
-	void setDisplayOrder(const tDisplayOrder);
-	tDisplayOrder getDisplayOrder() const { return _elementOrder; }
+	void setDisplayOrder(const DisplayOrder);
+	DisplayOrder getDisplayOrder() const { return _elementOrder; }
 	
-	bool validToDraw(tDisplayOrder, tDisplayOrder);
+	bool validToDraw(DisplayOrder, DisplayOrder);
 	
 	virtual void draw(const Common::Rect&) {}
 	bool isDisplaying() { return _elementIsDisplaying; }
@@ -65,15 +65,15 @@ public:
 	void triggerRedraw();
 	void setTriggeredElement(DisplayElement *);
 	
-	virtual void setBounds(const tCoordType, const tCoordType, const tCoordType, const tCoordType);
-	virtual void setBounds(const Common::Rect&);
-	virtual void getBounds(Common::Rect&) const;
-	virtual void sizeElement(const tCoordType, const tCoordType);
-	virtual void moveElementTo(const tCoordType, const tCoordType);
-	virtual void moveElement(const tCoordType, const tCoordType);
-	virtual void getLocation(tCoordType&, tCoordType&) const;
-	virtual void getCenter(tCoordType&, tCoordType&) const;
-	virtual void centerElementAt(const tCoordType, const tCoordType);
+	virtual void setBounds(const CoordType, const CoordType, const CoordType, const CoordType);
+	virtual void setBounds(const Common::Rect &);
+	virtual void getBounds(Common::Rect &) const;
+	virtual void sizeElement(const CoordType, const CoordType);
+	virtual void moveElementTo(const CoordType, const CoordType);
+	virtual void moveElement(const CoordType, const CoordType);
+	virtual void getLocation(CoordType &, CoordType &) const;
+	virtual void getCenter(CoordType &, CoordType &) const;
+	virtual void centerElementAt(const CoordType, const CoordType);
 
 protected:
 	Common::Rect _bounds;
@@ -82,7 +82,7 @@ protected:
 
 	// Used only by PegasusEngine
 	bool _elementIsDisplaying;
-	tDisplayOrder _elementOrder;
+	DisplayOrder _elementOrder;
 	DisplayElement *_nextElement;
 };
 
@@ -90,7 +90,7 @@ protected:
 // QuickDraw "hilite" :P (deal with it!)
 class DropHighlight : public DisplayElement {
 public:
-	DropHighlight(const tDisplayElementID);
+	DropHighlight(const DisplayElementID);
 	virtual ~DropHighlight() {}
 
 	void setHighlightColor(const uint32 &highlight) { _highlightColor = highlight; }
@@ -112,12 +112,12 @@ protected:
 
 class Animation : public DisplayElement, public DynamicElement {
 public:
-	Animation(const tDisplayElementID id) : DisplayElement(id) {}
+	Animation(const DisplayElementID id) : DisplayElement(id) {}
 };
 
 class IdlerAnimation : public Animation, public Idler {
 public:
-	IdlerAnimation(const tDisplayElementID);
+	IdlerAnimation(const DisplayElementID);
 	
 	virtual void startDisplaying();
 	virtual void stopDisplaying();
@@ -138,7 +138,7 @@ protected:
 
 class FrameSequence : public IdlerAnimation {
 public:
-	FrameSequence(const tDisplayElementID);
+	FrameSequence(const DisplayElementID);
 	virtual ~FrameSequence();
 
 	void useFileName(const Common::String &fileName);
@@ -169,11 +169,11 @@ class SpriteFrame;
 class Sprite : public DisplayElement {
 friend class SpriteFrame;
 public:
-	Sprite(const tDisplayElementID);
+	Sprite(const DisplayElementID);
 	virtual ~Sprite();
 
-	virtual void addPICTResourceFrame(const tResIDType, const bool, const tCoordType, const tCoordType);
-	virtual uint32 addFrame(SpriteFrame *, const tCoordType, const tCoordType);
+	virtual void addPICTResourceFrame(const ResIDType, const bool, const CoordType, const CoordType);
+	virtual uint32 addFrame(SpriteFrame *, const CoordType, const CoordType);
 	virtual void removeFrame(const uint32);
 	virtual void discardFrames();
 	
@@ -193,8 +193,8 @@ public:
 protected:
 	struct SpriteFrameRec {
 		SpriteFrame *frame;
-		tCoordType frameLeft;
-		tCoordType frameTop;
+		CoordType frameLeft;
+		CoordType frameTop;
 	};
 
 	uint32 _numFrames;
@@ -205,7 +205,7 @@ protected:
 
 class SpriteSequence : public FrameSequence {
 public:
-	SpriteSequence(const tDisplayElementID id, const tDisplayElementID spriteID);
+	SpriteSequence(const DisplayElementID id, const DisplayElementID spriteID);
 	virtual ~SpriteSequence() {}
 
 	void useTransparent(bool transparent) { _transparent = transparent; }
@@ -234,7 +234,7 @@ public:
 
 class SoundLevel : public DisplayElement {
 public:
-	SoundLevel(const tDisplayElementID);
+	SoundLevel(const DisplayElementID);
 	virtual ~SoundLevel() {}
 	
 	void incrementLevel();
diff --git a/engines/pegasus/energymonitor.cpp b/engines/pegasus/energymonitor.cpp
index 2076ae1240..5f12bf4d94 100755
--- a/engines/pegasus/energymonitor.cpp
+++ b/engines/pegasus/energymonitor.cpp
@@ -68,7 +68,7 @@ void Blinker::timeChanged(const TimeValue time) {
 	}
 }
 
-static const tNotificationFlags kEnergyExpiredFlag = 1;
+static const NotificationFlags kEnergyExpiredFlag = 1;
 
 EnergyMonitor *g_energyMonitor = 0;
 
@@ -167,7 +167,7 @@ void EnergyMonitor::timeChanged(const TimeValue currentTime) {
 	} else {
 		uint32 currentEnergy = kMaxJMPEnergy - currentTime;
 
-		tEnergyStage newStage;
+		EnergyStage newStage;
 		if (currentEnergy > kWorriedEnergy)
 			newStage = kStageCasual;
 		else if (currentEnergy > kNervousEnergy)
diff --git a/engines/pegasus/energymonitor.h b/engines/pegasus/energymonitor.h
index cb5d4498fc..4c111af9cc 100755
--- a/engines/pegasus/energymonitor.h
+++ b/engines/pegasus/energymonitor.h
@@ -98,7 +98,7 @@ protected:
 
 	uint32 _barColor;
 	Common::Rect _levelRect;
-	tEnergyStage _stage;
+	EnergyStage _stage;
 	Sprite _energyLight;
 	Blinker _lightBlinker;
 	bool _calibrating, _dontFlash;
diff --git a/engines/pegasus/fader.h b/engines/pegasus/fader.h
index 8c4fb0ba81..24ecae021b 100755
--- a/engines/pegasus/fader.h
+++ b/engines/pegasus/fader.h
@@ -99,7 +99,7 @@ protected:
 
 class FaderAnimation : public DisplayElement, public Fader {
 public:
-	FaderAnimation(const tDisplayElementID id) : DisplayElement(id) {}
+	FaderAnimation(const DisplayElementID id) : DisplayElement(id) {}
 	virtual ~FaderAnimation() {}
 
 	void setFaderValue(const int32);
diff --git a/engines/pegasus/gamestate.cpp b/engines/pegasus/gamestate.cpp
index 5c889bdd20..0a8597de37 100755
--- a/engines/pegasus/gamestate.cpp
+++ b/engines/pegasus/gamestate.cpp
@@ -40,8 +40,8 @@ Common::Error GameStateManager::writeGameState(Common::WriteStream *stream) {
 	stream->writeUint16BE(_currentNeighborhood);
 	stream->writeUint16BE(_currentRoom);
 	stream->writeByte(_currentDirection);
-	stream->writeUint16BE(_nextNeighborhoodID);
-	stream->writeUint16BE(_nextRoomID);
+	stream->writeUint16BE(_nexNeighborhoodID);
+	stream->writeUint16BE(_nexRoomID);
 	stream->writeByte(_nextDirection);
 	stream->writeUint16BE(_lastNeighborhood);
 	stream->writeUint16BE(_lastRoom);
@@ -70,8 +70,8 @@ Common::Error GameStateManager::readGameState(Common::ReadStream *stream) {
 	_currentNeighborhood = stream->readUint16BE();
 	_currentRoom = stream->readUint16BE();
 	_currentDirection = stream->readByte();
-	_nextNeighborhoodID = stream->readUint16BE();
-	_nextRoomID = stream->readUint16BE();
+	_nexNeighborhoodID = stream->readUint16BE();
+	_nexRoomID = stream->readUint16BE();
 	_nextDirection = stream->readByte();
 	_lastNeighborhood = stream->readUint16BE();
 	_lastRoom = stream->readUint16BE();
@@ -100,8 +100,8 @@ void GameStateManager::resetGameState() {
 	_currentNeighborhood = kNoNeighborhoodID;
 	_currentRoom = kNoRoomID;
 	_currentDirection = kNoDirection;
-	_nextNeighborhoodID = kNoNeighborhoodID;
-	_nextRoomID = kNoRoomID;
+	_nexNeighborhoodID = kNoNeighborhoodID;
+	_nexRoomID = kNoRoomID;
 	_nextDirection = kNoDirection;
 	_lastNeighborhood = kNoNeighborhoodID;
 	_lastRoom = kNoRoomID;
@@ -121,13 +121,13 @@ void GameStateManager::resetGameState() {
 	resetWSCState();
 }
 
-void GameStateManager::getCurrentLocation(tNeighborhoodID &neighborhood, tRoomID &room, tDirectionConstant &direction) {
+void GameStateManager::getCurrentLocation(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction) {
 	neighborhood = _currentNeighborhood;
 	room = _currentRoom;
 	direction = _currentDirection;
 }
 
-void GameStateManager::setCurrentLocation(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) {
+void GameStateManager::setCurrentLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) {
 	_lastNeighborhood = _currentNeighborhood;
 	_lastRoom = _currentRoom;
 	_lastDirection = _currentDirection;
@@ -136,140 +136,140 @@ void GameStateManager::setCurrentLocation(const tNeighborhoodID neighborhood, co
 	_currentDirection = direction;
 }
 
-tNeighborhoodID GameStateManager::getCurrentNeighborhood() {
+NeighborhoodID GameStateManager::getCurrentNeighborhood() {
 	return _currentNeighborhood;
 }
 
-void GameStateManager::setCurrentNeighborhood(const tNeighborhoodID neighborhood) {
+void GameStateManager::setCurrentNeighborhood(const NeighborhoodID neighborhood) {
 	_lastNeighborhood = _currentNeighborhood;
 	_currentNeighborhood = neighborhood;
 }
 
-tRoomID GameStateManager::getCurrentRoom() {
+RoomID GameStateManager::getCurrentRoom() {
 	return _currentRoom;
 }
 
-void GameStateManager::setCurrentRoom(const tRoomID room) {
+void GameStateManager::setCurrentRoom(const RoomID room) {
 	_lastRoom = _currentRoom;
 	_currentRoom = room;
 }
 
-tDirectionConstant GameStateManager::getCurrentDirection() {
+DirectionConstant GameStateManager::getCurrentDirection() {
 	return _currentDirection;
 }
 
-void GameStateManager::setCurrentDirection(const tDirectionConstant direction) {
+void GameStateManager::setCurrentDirection(const DirectionConstant direction) {
 	_lastDirection = _currentDirection;
 	_currentDirection = direction;
 }
 
-tRoomViewID GameStateManager::getCurrentRoomAndView() {
+RoomViewID GameStateManager::getCurrentRoomAndView() {
 	return MakeRoomView(_currentRoom, _currentDirection);
 }
 
-void GameStateManager::getNextLocation(tNeighborhoodID &neighborhood, tRoomID &room, tDirectionConstant &direction) {
-	neighborhood = _nextNeighborhoodID;
-	room = _nextRoomID;
+void GameStateManager::getNextLocation(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction) {
+	neighborhood = _nexNeighborhoodID;
+	room = _nexRoomID;
 	direction = _nextDirection;
 }
 
-void GameStateManager::setNextLocation(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) {
-	_nextNeighborhoodID = neighborhood;
-	_nextRoomID = room;
+void GameStateManager::setNextLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) {
+	_nexNeighborhoodID = neighborhood;
+	_nexRoomID = room;
 	_nextDirection = direction;
 }
 
-tNeighborhoodID GameStateManager::getNextNeighborhood() {
-	return _nextNeighborhoodID;
+NeighborhoodID GameStateManager::getNextNeighborhood() {
+	return _nexNeighborhoodID;
 }
 
-void GameStateManager::setNextNeighborhood(const tNeighborhoodID neighborhood) {
-	_nextNeighborhoodID = neighborhood;
+void GameStateManager::setNextNeighborhood(const NeighborhoodID neighborhood) {
+	_nexNeighborhoodID = neighborhood;
 }
 
-tRoomID GameStateManager::getNextRoom() {
-	return _nextRoomID;
+RoomID GameStateManager::getNextRoom() {
+	return _nexRoomID;
 }
 
-void GameStateManager::setNextRoom(const tRoomID room) {
-	_nextRoomID = room;
+void GameStateManager::setNextRoom(const RoomID room) {
+	_nexRoomID = room;
 }
 
-tDirectionConstant GameStateManager::getNextDirection() {
+DirectionConstant GameStateManager::getNextDirection() {
 	return _nextDirection;
 }
 
-void GameStateManager::setNextDirection(const tDirectionConstant direction) {
+void GameStateManager::setNextDirection(const DirectionConstant direction) {
 	_nextDirection = direction;
 }
 
-void GameStateManager::getLastLocation(tNeighborhoodID &neighborhood, tRoomID &room, tDirectionConstant &direction) {
+void GameStateManager::getLastLocation(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction) {
 	neighborhood = _currentNeighborhood;
 	room = _currentRoom;
 	direction = _currentDirection;
 }
 
-void GameStateManager::setLastLocation(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) {
+void GameStateManager::setLastLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) {
 	_currentNeighborhood = neighborhood;
 	_currentRoom = room;
 	_currentDirection = direction;
 }
 
-tNeighborhoodID GameStateManager::getLastNeighborhood() {
+NeighborhoodID GameStateManager::getLastNeighborhood() {
 	return _lastNeighborhood;
 }
 
-void GameStateManager::setLastNeighborhood(const tNeighborhoodID neighborhood) {
+void GameStateManager::setLastNeighborhood(const NeighborhoodID neighborhood) {
 	_lastNeighborhood = neighborhood;
 }
 
-tRoomID GameStateManager::getLastRoom() {
+RoomID GameStateManager::getLastRoom() {
 	return _lastRoom;
 }
 
-void GameStateManager::setLastRoom(const tRoomID room) {
+void GameStateManager::setLastRoom(const RoomID room) {
 	_lastRoom = room;
 }
 
-tDirectionConstant GameStateManager::getLastDirection() {
+DirectionConstant GameStateManager::getLastDirection() {
 	return _lastDirection;
 }
 
-void GameStateManager::setLastDirection(const tDirectionConstant direction) {
+void GameStateManager::setLastDirection(const DirectionConstant direction) {
 	_lastDirection = direction;
 }
 
-tRoomViewID GameStateManager::getLastRoomAndView() {
+RoomViewID GameStateManager::getLastRoomAndView() {
 	return MakeRoomView(_lastRoom, _lastDirection);
 }
 
-void GameStateManager::getOpenDoorLocation(tRoomID &room, tDirectionConstant &direction) {
+void GameStateManager::getOpenDoorLocation(RoomID &room, DirectionConstant &direction) {
 	room = _openDoorRoom;
 	direction = _openDoorDirection;
 }
 
-void GameStateManager::setOpenDoorLocation(const tRoomID room, const tDirectionConstant direction) {
+void GameStateManager::setOpenDoorLocation(const RoomID room, const DirectionConstant direction) {
 	_openDoorRoom = room;
 	_openDoorDirection = direction;
 }
 
-tRoomID GameStateManager::getOpenDoorRoom() {
+RoomID GameStateManager::getOpenDoorRoom() {
 	return _openDoorRoom;
 }
 
-void GameStateManager::setOpenDoorRoom(const tRoomID room) {
+void GameStateManager::setOpenDoorRoom(const RoomID room) {
 	_openDoorRoom = room;
 }
 
-tDirectionConstant GameStateManager::getOpenDoorDirection() {
+DirectionConstant GameStateManager::getOpenDoorDirection() {
 	return _openDoorDirection;
 }
 
-void GameStateManager::setOpenDoorDirection(const tDirectionConstant direction) {
+void GameStateManager::setOpenDoorDirection(const DirectionConstant direction) {
 	_openDoorDirection = direction;
 }
 
-tRoomViewID GameStateManager::getDoorOpenRoomAndView() {
+RoomViewID GameStateManager::getDoorOpenRoomAndView() {
 	return MakeRoomView(_openDoorRoom, _openDoorDirection);
 }
 
@@ -277,8 +277,8 @@ bool GameStateManager::isCurrentDoorOpen() {
 	return _openDoorRoom == _currentRoom && _openDoorDirection == _currentDirection;
 }
 
-tGameScoreType GameStateManager::getCaldoriaTSAScore() {
-	tGameScoreType result = 0;
+GameScoreType GameStateManager::getCaldoriaTSAScore() {
+	GameScoreType result = 0;
 
 	if (_scoringFlags.getFlag(kScoringSawINNFlag))
 		result += kSawINNScore;
@@ -358,8 +358,8 @@ tGameScoreType GameStateManager::getCaldoriaTSAScore() {
 	return result;
 }
 
-tGameScoreType GameStateManager::getPrehistoricScore() {
-	tGameScoreType result = 0;
+GameScoreType GameStateManager::getPrehistoricScore() {
+	GameScoreType result = 0;
 
 	if (_scoringFlags.getFlag(kScoringThrewBreakerFlag))
 		result += kThrewBreakerScore;
@@ -373,8 +373,8 @@ tGameScoreType GameStateManager::getPrehistoricScore() {
 	return result;
 }
 
-tGameScoreType GameStateManager::getMarsScore() {
-	tGameScoreType result = 0;
+GameScoreType GameStateManager::getMarsScore() {
+	GameScoreType result = 0;
 
 	if (_scoringFlags.getFlag(kScoringThrownByRobotFlag))
 		result += kThrownByRobotScore;
@@ -422,8 +422,8 @@ tGameScoreType GameStateManager::getMarsScore() {
 	return result;
 }
 
-tGameScoreType GameStateManager::getNoradScore() {
-	tGameScoreType result = 0;
+GameScoreType GameStateManager::getNoradScore() {
+	GameScoreType result = 0;
 
 	if (_scoringFlags.getFlag(kScoringSawSecurityMonitorFlag))
 		result += kSawSecurityMonitorScore;
@@ -459,8 +459,8 @@ tGameScoreType GameStateManager::getNoradScore() {
 	return result;
 }
 
-tGameScoreType GameStateManager::getWSCScore() {
-	tGameScoreType result = 0;
+GameScoreType GameStateManager::getWSCScore() {
+	GameScoreType result = 0;
 
 	if (_scoringFlags.getFlag(kScoringRemovedDartFlag))
 		result += kRemovedDartScore;
@@ -506,8 +506,8 @@ tGameScoreType GameStateManager::getWSCScore() {
 	return result;
 }
 
-tGameScoreType GameStateManager::getGandhiScore() {
-	tGameScoreType result = 0;
+GameScoreType GameStateManager::getGandhiScore() {
+	GameScoreType result = 0;
 
 	if (_scoringFlags.getFlag(kScoringMarsGandhiFlag))
 		result += kMarsGandhiScore;
@@ -519,7 +519,7 @@ tGameScoreType GameStateManager::getGandhiScore() {
 	return result;
 }
 
-tGameScoreType GameStateManager::getTotalScore() {
+GameScoreType GameStateManager::getTotalScore() {
 	return	getCaldoriaTSAScore() +
 			getPrehistoricScore() +
 			getMarsScore() +
@@ -607,7 +607,7 @@ void GameStateManager::writeNoradState(Common::WriteStream *stream) {
 void GameStateManager::readNoradState(Common::ReadStream *stream) {
 	_noradFlags.readFromStream(stream);
 	_noradSubRoomPressure = stream->readUint16BE();
-	_noradSubPrepState = (tNoradSubPrepState)stream->readByte();
+	_noradSubPrepState = (NoradSubPrepState)stream->readByte();
 }
 
 void GameStateManager::resetNoradState() {
@@ -1524,11 +1524,11 @@ bool GameStateManager::allTimeZonesFinished() {
 	return getWSCFinished() && getMarsFinished() && getNoradFinished();
 }
 
-void GameStateManager::setTakenItemID(tItemID id, bool value) {
+void GameStateManager::setTakenItemID(ItemID id, bool value) {
 	_itemTakenFlags.setFlag(id, value);
 }
 
-bool GameStateManager::isTakenItemID(tItemID id) {
+bool GameStateManager::isTakenItemID(ItemID id) {
 	return _itemTakenFlags.getFlag(id);
 }
 
@@ -1988,11 +1988,11 @@ uint16 GameStateManager::getNoradSubRoomPressure() {
 	return _noradSubRoomPressure;
 }
 
-void GameStateManager::setNoradSubPrepState(tNoradSubPrepState state) {
+void GameStateManager::setNoradSubPrepState(NoradSubPrepState state) {
 	_noradSubPrepState = state;
 }
 
-tNoradSubPrepState GameStateManager::getNoradSubPrepState() {
+NoradSubPrepState GameStateManager::getNoradSubPrepState() {
 	return _noradSubPrepState;
 }
 
diff --git a/engines/pegasus/gamestate.h b/engines/pegasus/gamestate.h
index b95a5d7fdd..5eab093c5b 100755
--- a/engines/pegasus/gamestate.h
+++ b/engines/pegasus/gamestate.h
@@ -300,48 +300,48 @@ public:
 	
 	void resetGameState();
 	
-	void getCurrentLocation(tNeighborhoodID &neighborhood, tRoomID &room, tDirectionConstant &direction);
-	void setCurrentLocation(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction);
+	void getCurrentLocation(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction);
+	void setCurrentLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction);
 	
-	tNeighborhoodID getCurrentNeighborhood();
-	void setCurrentNeighborhood(const tNeighborhoodID neighborhood);
-	tRoomID getCurrentRoom();
-	void setCurrentRoom(const tRoomID room);
-	tDirectionConstant getCurrentDirection();
-	void setCurrentDirection(const tDirectionConstant direction);
+	NeighborhoodID getCurrentNeighborhood();
+	void setCurrentNeighborhood(const NeighborhoodID neighborhood);
+	RoomID getCurrentRoom();
+	void setCurrentRoom(const RoomID room);
+	DirectionConstant getCurrentDirection();
+	void setCurrentDirection(const DirectionConstant direction);
 	
-	tRoomViewID getCurrentRoomAndView();
+	RoomViewID getCurrentRoomAndView();
 	
-	void getNextLocation(tNeighborhoodID &neighborhood, tRoomID &room, tDirectionConstant &direction);
-	void	setNextLocation(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction);
+	void getNextLocation(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction);
+	void	setNextLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction);
 
-	tNeighborhoodID getNextNeighborhood();
-	void setNextNeighborhood(const tNeighborhoodID neighborhood);
-	tRoomID getNextRoom();
-	void setNextRoom(const tRoomID room);
-	tDirectionConstant getNextDirection();
-	void setNextDirection(const tDirectionConstant direction);
+	NeighborhoodID getNextNeighborhood();
+	void setNextNeighborhood(const NeighborhoodID neighborhood);
+	RoomID getNextRoom();
+	void setNextRoom(const RoomID room);
+	DirectionConstant getNextDirection();
+	void setNextDirection(const DirectionConstant direction);
 	
-	void getLastLocation(tNeighborhoodID &neighborhood, tRoomID &room, tDirectionConstant &direction);
-	void setLastLocation(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction);
+	void getLastLocation(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction);
+	void setLastLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction);
 	
-	tNeighborhoodID getLastNeighborhood();
-	void setLastNeighborhood(const tNeighborhoodID neighborhood);
-	tRoomID getLastRoom();
-	void setLastRoom(const tRoomID room);
-	tDirectionConstant getLastDirection();
-	void setLastDirection(const tDirectionConstant direction);
+	NeighborhoodID getLastNeighborhood();
+	void setLastNeighborhood(const NeighborhoodID neighborhood);
+	RoomID getLastRoom();
+	void setLastRoom(const RoomID room);
+	DirectionConstant getLastDirection();
+	void setLastDirection(const DirectionConstant direction);
 	
-	tRoomViewID getLastRoomAndView();
+	RoomViewID getLastRoomAndView();
 	
-	void getOpenDoorLocation(tRoomID &room, tDirectionConstant &direction);
-	void setOpenDoorLocation(const tRoomID room, const tDirectionConstant direction);
-	tRoomID getOpenDoorRoom();
-	void setOpenDoorRoom(const tRoomID room);
-	tDirectionConstant getOpenDoorDirection();
-	void setOpenDoorDirection(const tDirectionConstant direction);
+	void getOpenDoorLocation(RoomID &room, DirectionConstant &direction);
+	void setOpenDoorLocation(const RoomID room, const DirectionConstant direction);
+	RoomID getOpenDoorRoom();
+	void setOpenDoorRoom(const RoomID room);
+	DirectionConstant getOpenDoorDirection();
+	void setOpenDoorDirection(const DirectionConstant direction);
 	
-	tRoomViewID getDoorOpenRoomAndView();
+	RoomViewID getDoorOpenRoomAndView();
 	
 	bool isCurrentDoorOpen();
 
@@ -563,13 +563,13 @@ public:
 	bool					getScoringNoradGandhi();
 	bool					getScoringWSCGandhi();
 
-	tGameScoreType			getCaldoriaTSAScore();
-	tGameScoreType			getPrehistoricScore();
-	tGameScoreType			getMarsScore();
-	tGameScoreType			getNoradScore();
-	tGameScoreType			getWSCScore();
-	tGameScoreType			getGandhiScore();
-	tGameScoreType			getTotalScore();
+	GameScoreType			getCaldoriaTSAScore();
+	GameScoreType			getPrehistoricScore();
+	GameScoreType			getMarsScore();
+	GameScoreType			getNoradScore();
+	GameScoreType			getWSCScore();
+	GameScoreType			getGandhiScore();
+	GameScoreType			getTotalScore();
 
 	void					writeCaldoriaState(Common::WriteStream *stream);
 	void					readCaldoriaState(Common::ReadStream *stream);
@@ -615,10 +615,10 @@ public:
 	void						setNoradFinished(bool);
 	bool					getNoradFinished();
 	bool					allTimeZonesFinished();
-	void						setTakenItemID(tItemID, bool);
-	bool					isTakenItemID(tItemID);
-	void						setTakenItem(Item*, bool);
-	bool					isTakenItem(Item*);
+	void						setTakenItemID(ItemID, bool);
+	bool					isTakenItemID(ItemID);
+	void						setTakenItem(Item *, bool);
+	bool					isTakenItem(Item *);
 	
 	//	Caldoria
 	void						setCaldoriaFuseTimeLimit(const TimeValue);
@@ -739,8 +739,8 @@ public:
 	bool					getNoradWaitingForLaser();
 	void						setNoradSubRoomPressure(uint16);
 	uint16					getNoradSubRoomPressure();
-	void						setNoradSubPrepState(tNoradSubPrepState);
-	tNoradSubPrepState		getNoradSubPrepState();
+	void						setNoradSubPrepState(NoradSubPrepState);
+	NoradSubPrepState		getNoradSubPrepState();
 	void						setNoradArrivedFromSub(bool);
 	bool					getNoradArrivedFromSub();
 	
@@ -841,17 +841,17 @@ protected:
 
 private:
 	// Base
-	tNeighborhoodID _currentNeighborhood;
-	tRoomID _currentRoom;
-	tDirectionConstant _currentDirection;
-	tNeighborhoodID _nextNeighborhoodID;
-	tRoomID _nextRoomID;
-	tDirectionConstant _nextDirection;
-	tNeighborhoodID _lastNeighborhood;
-	tRoomID _lastRoom;
-	tDirectionConstant _lastDirection;
-	tRoomID _openDoorRoom;
-	tDirectionConstant _openDoorDirection;
+	NeighborhoodID _currentNeighborhood;
+	RoomID _currentRoom;
+	DirectionConstant _currentDirection;
+	NeighborhoodID _nexNeighborhoodID;
+	RoomID _nexRoomID;
+	DirectionConstant _nextDirection;
+	NeighborhoodID _lastNeighborhood;
+	RoomID _lastRoom;
+	DirectionConstant _lastDirection;
+	RoomID _openDoorRoom;
+	DirectionConstant _openDoorDirection;
 
 	// Pegasus Prime
 	FlagsArray<byte, kNumGlobalFlags> _globalFlags;
@@ -872,7 +872,7 @@ private:
 	
 	FlagsArray<byte, kNumNoradFlags> _noradFlags;
 	uint16 _noradSubRoomPressure;
-	tNoradSubPrepState _noradSubPrepState;
+	NoradSubPrepState _noradSubPrepState;
 	
 	FlagsArray<byte, kNumMarsFlags> _marsFlags;
 	
diff --git a/engines/pegasus/graphics.cpp b/engines/pegasus/graphics.cpp
index 06db31f71d..175f15e91d 100644
--- a/engines/pegasus/graphics.cpp
+++ b/engines/pegasus/graphics.cpp
@@ -188,7 +188,7 @@ void GraphicsManager::clearScreen() {
 	_modifiedScreen = true;
 }
 
-DisplayElement *GraphicsManager::findDisplayElement(const tDisplayElementID id) {
+DisplayElement *GraphicsManager::findDisplayElement(const DisplayElementID id) {
 	DisplayElement *runner = _firstDisplayElement;
 
 	while (runner) {
diff --git a/engines/pegasus/graphics.h b/engines/pegasus/graphics.h
index 0e5de47d95..7c5bd69a69 100644
--- a/engines/pegasus/graphics.h
+++ b/engines/pegasus/graphics.h
@@ -51,14 +51,14 @@ public:
 	void addDisplayElement(DisplayElement *element);
 	void removeDisplayElement(DisplayElement *element);
 	void invalRect(const Common::Rect &rect);
-	tDisplayOrder getBackOfActiveLayer() const { return _backLayer; }
-	tDisplayOrder getFrontOfActiveLayer() const { return _frontLayer; }
+	DisplayOrder getBackOfActiveLayer() const { return _backLayer; }
+	DisplayOrder getFrontOfActiveLayer() const { return _frontLayer; }
 	void updateDisplay();
 	Graphics::Surface *getCurSurface() { return _curSurface; }
 	void setCurSurface(Graphics::Surface *surface) { _curSurface = surface; }
 	Graphics::Surface *getWorkArea() { return &_workArea; }
 	void clearScreen();
-	DisplayElement *findDisplayElement(const tDisplayElementID id);
+	DisplayElement *findDisplayElement(const DisplayElementID id);
 	void shakeTheWorld(TimeValue time, TimeScale scale);
 	void enableErase();
 	void disableErase();
@@ -75,7 +75,7 @@ private:
 
 	bool _modifiedScreen, _erase;
 	Common::Rect _dirtyRect;
-	tDisplayOrder _backLayer, _frontLayer;
+	DisplayOrder _backLayer, _frontLayer;
 	DisplayElement *_firstDisplayElement, *_lastDisplayElement;
 	Graphics::Surface _workArea, *_curSurface;
 
diff --git a/engines/pegasus/hotspot.cpp b/engines/pegasus/hotspot.cpp
index b8ff97a897..84731b7a06 100755
--- a/engines/pegasus/hotspot.cpp
+++ b/engines/pegasus/hotspot.cpp
@@ -115,7 +115,7 @@ bool Region::pointInRegion(const Common::Point &point) const {
 	return true;
 }
 
-void Region::moveTo(tCoordType h, tCoordType v) {
+void Region::moveTo(CoordType h, CoordType v) {
 	_bounds.moveTo(h, v);
 }
 
@@ -123,7 +123,7 @@ void Region::moveTo(const Common::Point &point) {
 	_bounds.moveTo(point);
 }
 
-void Region::translate(tCoordType h, tCoordType v) {
+void Region::translate(CoordType h, CoordType v) {
 	_bounds.translate(h, v);
 }
 
@@ -131,7 +131,7 @@ void Region::translate(const Common::Point &point) {
 	_bounds.translate(point.x, point.y);
 }
 
-void Region::getCenter(tCoordType &h, tCoordType &v) const {
+void Region::getCenter(CoordType &h, CoordType &v) const {
 	h = (_bounds.left + _bounds.right) / 2;
 	v = (_bounds.top + _bounds.bottom) / 2;
 }
@@ -140,7 +140,7 @@ void Region::getCenter(Common::Point &point) const {
 	getCenter(point.x, point.y);
 }
 
-Hotspot::Hotspot(const tHotSpotID id) : IDObject(id) {
+Hotspot::Hotspot(const HotSpotID id) : IDObject(id) {
 	_spotFlags = kNoHotSpotFlags;
 	_spotActive = false;
 }
@@ -152,7 +152,7 @@ void Hotspot::setArea(const Common::Rect &area) {
 	_spotArea = Region(area);
 }
 
-void Hotspot::setArea(const tCoordType left, const tCoordType top, const tCoordType right, const tCoordType bottom) {
+void Hotspot::setArea(const CoordType left, const CoordType top, const CoordType right, const CoordType bottom) {
 	_spotArea = Region(Common::Rect(left, top, right, bottom));
 }
 
@@ -164,7 +164,7 @@ void Hotspot::getCenter(Common::Point &pt) const {
 	_spotArea.getCenter(pt);
 }
 
-void Hotspot::getCenter(tCoordType &h, tCoordType &v) const {
+void Hotspot::getCenter(CoordType &h, CoordType &v) const {
 	_spotArea.getCenter(h, v);
 }
 
@@ -176,11 +176,11 @@ void Hotspot::setInactive() {
 	_spotActive = false;
 }
 
-void Hotspot::setHotspotFlags(const tHotSpotFlags flags) {
+void Hotspot::setHotspotFlags(const HotSpotFlags flags) {
 	_spotFlags = flags;
 }
 
-void Hotspot::setMaskedHotspotFlags(const tHotSpotFlags flags, const tHotSpotFlags mask) {
+void Hotspot::setMaskedHotspotFlags(const HotSpotFlags flags, const HotSpotFlags mask) {
 	_spotFlags = (_spotFlags & ~mask) | flags;
 }
 
@@ -188,7 +188,7 @@ bool Hotspot::isSpotActive() const {
 	return _spotActive;
 }
 
-void Hotspot::moveSpotTo(const tCoordType h, const tCoordType v) {
+void Hotspot::moveSpotTo(const CoordType h, const CoordType v) {
 	_spotArea.moveTo(h, v);
 }
 
@@ -196,7 +196,7 @@ void Hotspot::moveSpotTo(const Common::Point pt) {
 	_spotArea.moveTo(pt);
 }
 
-void Hotspot::moveSpot(const tCoordType h, const tCoordType v) {
+void Hotspot::moveSpot(const CoordType h, const CoordType v) {
 	_spotArea.translate(h, v);
 }
 
@@ -208,7 +208,7 @@ bool Hotspot::pointInSpot(const Common::Point where) const {
 	return _spotActive && _spotArea.pointInRegion(where);
 }
 
-tHotSpotFlags Hotspot::getHotspotFlags() const {
+HotSpotFlags Hotspot::getHotspotFlags() const {
 	return _spotFlags;
 }
 
@@ -234,12 +234,12 @@ Hotspot *HotspotList::findHotspot(const Common::Point where) {
 	return 0;
 }
 
-tHotSpotID HotspotList::findHotspotID(const Common::Point where) {
+HotSpotID HotspotList::findHotspotID(const Common::Point where) {
 	Hotspot *hotspot = findHotspot(where);
 	return hotspot ? hotspot->getObjectID() : kNoHotSpotID;
 }
 
-Hotspot *HotspotList::findHotspotByID(const tHotSpotID id) {
+Hotspot *HotspotList::findHotspotByID(const HotSpotID id) {
 	for (HotspotIterator it = begin(); it != end(); it++)
 		if ((*it)->getObjectID() == id)
 			return *it;
@@ -247,7 +247,7 @@ Hotspot *HotspotList::findHotspotByID(const tHotSpotID id) {
 	return 0;
 }
 
-Hotspot *HotspotList::findHotspotByMask(const tHotSpotFlags flags) {
+Hotspot *HotspotList::findHotspotByMask(const HotSpotFlags flags) {
 	for (HotspotIterator it = begin(); it != end(); it++)
 		if (((*it)->getHotspotFlags() & flags) == flags)
 			return *it;
@@ -255,7 +255,7 @@ Hotspot *HotspotList::findHotspotByMask(const tHotSpotFlags flags) {
 	return 0;
 }
 
-void HotspotList::activateMaskedHotspots(const tHotSpotFlags flags) {
+void HotspotList::activateMaskedHotspots(const HotSpotFlags flags) {
 	for (HotspotIterator it = begin(); it != end(); it++)
 		if (flags == kNoHotSpotFlags || ((*it)->getHotspotFlags() & flags) != 0)
 			(*it)->setActive();
@@ -266,13 +266,13 @@ void HotspotList::deactivateAllHotspots() {
 		(*it)->setInactive();
 }
 
-void HotspotList::deactivateMaskedHotspots(const tHotSpotFlags flags) {
+void HotspotList::deactivateMaskedHotspots(const HotSpotFlags flags) {
 	for (HotspotIterator it = begin(); it != end(); it++)
 		if (((*it)->getHotspotFlags() & flags) != 0)
 			(*it)->setInactive();
 }
 
-void HotspotList::activateOneHotspot(const tHotSpotID id) {
+void HotspotList::activateOneHotspot(const HotSpotID id) {
 	for (HotspotIterator it = begin(); it != end(); it++) {
 		if ((*it)->getObjectID() == id) {
 			(*it)->setActive();
@@ -281,7 +281,7 @@ void HotspotList::activateOneHotspot(const tHotSpotID id) {
 	}
 }
 
-void HotspotList::deactivateOneHotspot(const tHotSpotID id) {
+void HotspotList::deactivateOneHotspot(const HotSpotID id) {
 	for (HotspotIterator it = begin(); it != end(); it++) {
 		if ((*it)->getObjectID() == id) {
 			(*it)->setInactive();
@@ -290,7 +290,7 @@ void HotspotList::deactivateOneHotspot(const tHotSpotID id) {
 	}
 }
 
-void HotspotList::removeOneHotspot(const tHotSpotID id) {
+void HotspotList::removeOneHotspot(const HotSpotID id) {
 	for (HotspotIterator it = begin(); it != end(); it++) {
 		if ((*it)->getObjectID() == id) {
 			erase(it);
@@ -299,7 +299,7 @@ void HotspotList::removeOneHotspot(const tHotSpotID id) {
 	}
 }
 
-void HotspotList::removeMaskedHotspots(const tHotSpotFlags flags) {
+void HotspotList::removeMaskedHotspots(const HotSpotFlags flags) {
 	if (flags != kNoHotSpotFlags) {
 		for (HotspotIterator it = begin(); it != end(); ) {
 			if (((*it)->getHotspotFlags() & flags) != 0)
@@ -312,13 +312,13 @@ void HotspotList::removeMaskedHotspots(const tHotSpotFlags flags) {
 	}
 }
 
-void HotspotList::setHotspotRect(const tHotSpotID id, const Common::Rect &r) {
+void HotspotList::setHotspotRect(const HotSpotID id, const Common::Rect &r) {
 	Hotspot *hotspot = findHotspotByID(id);
 	if (hotspot)
 		hotspot->setArea(r);
 }
 
-void HotspotList::getHotspotRect(const tHotSpotID id, Common::Rect &r) {
+void HotspotList::getHotspotRect(const HotSpotID id, Common::Rect &r) {
 	Hotspot *hotspot = findHotspotByID(id);
 	if (hotspot)
 		hotspot->getBoundingBox(r);
diff --git a/engines/pegasus/hotspot.h b/engines/pegasus/hotspot.h
index aafb96cc19..bc1d054f0d 100755
--- a/engines/pegasus/hotspot.h
+++ b/engines/pegasus/hotspot.h
@@ -61,11 +61,11 @@ public:
 
 	bool pointInRegion(const Common::Point &point) const;
 
-	void moveTo(tCoordType h, tCoordType v);
+	void moveTo(CoordType h, CoordType v);
 	void moveTo(const Common::Point &point);
-	void translate(tCoordType h, tCoordType v);
+	void translate(CoordType h, CoordType v);
 	void translate(const Common::Point &point);
-	void getCenter(tCoordType &h, tCoordType &v) const;
+	void getCenter(CoordType &h, CoordType &v) const;
 	void getCenter(Common::Point &point) const;
 
 private:
@@ -85,20 +85,20 @@ private:
 
 class Hotspot : public IDObject {
 public:
-	Hotspot(const tHotSpotID);
+	Hotspot(const HotSpotID);
 	virtual ~Hotspot();
 
 	void setArea(const Region &region) { _spotArea = region; }
 	void setArea(const Common::Rect &);
-	void setArea(const tCoordType, const tCoordType, const tCoordType, const tCoordType);
+	void setArea(const CoordType, const CoordType, const CoordType, const CoordType);
 	void getBoundingBox(Common::Rect &) const;
 	void getArea(Region &) const;
 	void getCenter(Common::Point&) const;
-	void getCenter(tCoordType&, tCoordType&) const;
+	void getCenter(CoordType&, CoordType&) const;
 	
-	void moveSpotTo(const tCoordType, const tCoordType);
+	void moveSpotTo(const CoordType, const CoordType);
 	void moveSpotTo(const Common::Point);
-	void moveSpot(const tCoordType, const tCoordType);
+	void moveSpot(const CoordType, const CoordType);
 	void moveSpot(const Common::Point);
 	
 	bool pointInSpot(const Common::Point) const;
@@ -107,13 +107,13 @@ public:
 	void setInactive();
 	bool isSpotActive() const;
 	
-	tHotSpotFlags getHotspotFlags() const;
-	void setHotspotFlags(const tHotSpotFlags);
-	void setMaskedHotspotFlags(const tHotSpotFlags flags, const tHotSpotFlags mask);
+	HotSpotFlags getHotspotFlags() const;
+	void setHotspotFlags(const HotSpotFlags);
+	void setMaskedHotspotFlags(const HotSpotFlags flags, const HotSpotFlags mask);
 
 protected:
 	Region _spotArea;
-	tHotSpotFlags _spotFlags;
+	HotSpotFlags _spotFlags;
 	bool _spotActive;
 };
 
@@ -125,22 +125,22 @@ public:
 	void deleteHotspots();
 
 	Hotspot *findHotspot(const Common::Point);
-	tHotSpotID findHotspotID(const Common::Point);
-	Hotspot * findHotspotByID(const tHotSpotID);
-	Hotspot * findHotspotByMask(const tHotSpotFlags);
+	HotSpotID findHotspotID(const Common::Point);
+	Hotspot *findHotspotByID(const HotSpotID);
+	Hotspot *findHotspotByMask(const HotSpotFlags);
 
-	void activateMaskedHotspots(const tHotSpotFlags = kNoHotSpotFlags);
+	void activateMaskedHotspots(const HotSpotFlags = kNoHotSpotFlags);
 	void deactivateAllHotspots();
-	void deactivateMaskedHotspots(const tHotSpotFlags);
+	void deactivateMaskedHotspots(const HotSpotFlags);
 
-	void activateOneHotspot(const tHotSpotID);
-	void deactivateOneHotspot(const tHotSpotID);
+	void activateOneHotspot(const HotSpotID);
+	void deactivateOneHotspot(const HotSpotID);
 	
-	void removeOneHotspot(const tHotSpotID);
-	void removeMaskedHotspots(const tHotSpotFlags = kNoHotSpotFlags);
+	void removeOneHotspot(const HotSpotID);
+	void removeMaskedHotspots(const HotSpotFlags = kNoHotSpotFlags);
 
-	void setHotspotRect(const tHotSpotID, const Common::Rect&);
-	void getHotspotRect(const tHotSpotID, Common::Rect&);
+	void setHotspotRect(const HotSpotID, const Common::Rect&);
+	void getHotspotRect(const HotSpotID, Common::Rect&);
 };
 
 typedef HotspotList::iterator HotspotIterator;
diff --git a/engines/pegasus/input.cpp b/engines/pegasus/input.cpp
index e11b40ff22..bb5167b86e 100755
--- a/engines/pegasus/input.cpp
+++ b/engines/pegasus/input.cpp
@@ -39,10 +39,10 @@ InputDevice::InputDevice() {
 InputDevice::~InputDevice() {
 }
 
-void InputDevice::getInput(Input &input, const tInputBits filter) {
+void InputDevice::getInput(Input &input, const InputBits filter) {
 	// TODO: Save/Load keys
 
-	tInputBits currentBits = 0;
+	InputBits currentBits = 0;
 	bool consoleRequested = false;
 	bool altDown = false;
 
@@ -126,7 +126,7 @@ void InputDevice::getInput(Input &input, const tInputBits filter) {
 	input.setInputLocation(g_system->getEventManager()->getMousePos());
 
 	// Set the outgoing bits
-	tInputBits filteredBits = currentBits & filter;	
+	InputBits filteredBits = currentBits & filter;	
 	input.setInputBits((filteredBits & kAllButtonDownBits) | (filteredBits & _lastRawBits & kAllAutoBits));
 
 	// Update the last bits
@@ -140,7 +140,7 @@ void InputDevice::getInput(Input &input, const tInputBits filter) {
 }
 
 //	Wait until the input device stops returning input allowed by filter...
-void InputDevice::waitInput(const tInputBits filter) {
+void InputDevice::waitInput(const InputBits filter) {
 	if (filter != 0) {
 		for (;;) {
 			Input input;
@@ -162,7 +162,7 @@ int operator!=(const Input &arg1, const Input &arg2) {
 InputHandler *InputHandler::_inputHandler = 0;
 InputDevice InputHandler::_inputDevice;
 bool InputHandler::_invalHotspots = false;
-tInputBits InputHandler::_lastFilter = kFilterNoInput;
+InputBits InputHandler::_lastFilter = kFilterNoInput;
 
 InputHandler *InputHandler::setInputHandler(InputHandler *currentHandler) {
 	InputHandler *result = 0;
@@ -255,7 +255,7 @@ void InputHandler::activateHotspots() {
 		_nextHandler->activateHotspots();
 }
 
-tInputBits InputHandler::getInputFilter() {
+InputBits InputHandler::getInputFilter() {
 	if (_allowInput) {
 		if (_nextHandler)
 			return _nextHandler->getInputFilter();
@@ -266,7 +266,7 @@ tInputBits InputHandler::getInputFilter() {
 	return kFilterNoInput;
 }
 
-tInputBits InputHandler::getClickFilter() {
+InputBits InputHandler::getClickFilter() {
 	if (_allowInput && _nextHandler)
 		return _nextHandler->getClickFilter();
 
diff --git a/engines/pegasus/input.h b/engines/pegasus/input.h
index 8778ffbf2f..1aae16c062 100755
--- a/engines/pegasus/input.h
+++ b/engines/pegasus/input.h
@@ -41,12 +41,12 @@ public:
 	InputDevice();
 	~InputDevice();
 
-	void getInput(Input&, const tInputBits);
+	void getInput(Input &, const InputBits);
 
-	void waitInput(const tInputBits);
+	void waitInput(const InputBits);
 
 protected:
-	tInputBits _lastRawBits;
+	InputBits _lastRawBits;
 };
 
 enum {
@@ -267,9 +267,9 @@ enum {
 								kFilterMod3Button
 };
 
-static const tInputBits kHintInterruption = kFilterAllInputNoAuto;
-static const tInputBits kWarningInterruption = kFilterNoInput;
-static const tInputBits kOpticalInterruption = kFilterAllInputNoAuto;
+static const InputBits kHintInterruption = kFilterAllInputNoAuto;
+static const InputBits kWarningInterruption = kFilterNoInput;
+static const InputBits kOpticalInterruption = kFilterAllInputNoAuto;
 
 /*
 
@@ -356,7 +356,7 @@ public:
 	
 	void getInputLocation(Common::Point &where) const { where = _inputLocation; }
 	
-	bool anyInputBitSet(const tInputBits bits) const { return (_inputState & bits) != 0; }
+	bool anyInputBitSet(const InputBits bits) const { return (_inputState & bits) != 0; }
 
 	bool isAltDown() const { return _altDown; }
 	bool isConsoleRequested() const { return _consoleRequested; }
@@ -370,12 +370,12 @@ public:
 	}
 
 protected:
-	void setInputBits(const tInputBits state) { _inputState = state; }
+	void setInputBits(const InputBits state) { _inputState = state; }
 	void setInputLocation(const Common::Point &where) { _inputLocation = where; }
 	void setConsoleRequested(bool consoleRequested) { _consoleRequested = consoleRequested; }
 	void setAltDown(bool altDown) { _altDown = altDown; }
 	
-	tInputBits _inputState;
+	InputBits _inputState;
 	Common::Point _inputLocation;
 	bool _consoleRequested;
 	bool _altDown;
@@ -390,7 +390,7 @@ public:
 	static void getInput(Input&, Hotspot*&);
 	static void readInputDevice(Input&);
 	static void invalHotspots() { _invalHotspots = true; }
-	static tInputBits getCurrentFilter() { return _lastFilter; }
+	static InputBits getCurrentFilter() { return _lastFilter; }
 		
 	InputHandler(InputHandler*);
 	virtual ~InputHandler();
@@ -398,22 +398,22 @@ public:
 	virtual void setNextHandler(InputHandler *nextHandler) { _nextHandler = nextHandler; }
 	virtual InputHandler *getNextHandler() { return _nextHandler; }
 	
-	virtual void handleInput(const Input&, const Hotspot*);
-	virtual void clickInHotspot(const Input&, const Hotspot*);
+	virtual void handleInput(const Input &, const Hotspot *);
+	virtual void clickInHotspot(const Input &, const Hotspot *);
 	
 	virtual void activateHotspots();
-	virtual void updateCursor(const Common::Point, const Hotspot*);
-	virtual bool isClickInput(const Input&, const Hotspot*);
+	virtual void updateCursor(const Common::Point, const Hotspot *);
+	virtual bool isClickInput(const Input &, const Hotspot *);
 	virtual bool wantsCursor();
 	
 	virtual bool releaseInputFocus() { return true; }
 	virtual void grabInputFocus() {}
 	
 	//	This returns bits set for what kinds of input to accept.
-	virtual tInputBits getInputFilter();
+	virtual InputBits getInputFilter();
 
 	//	This returns bits defining what input constitutes a "click."
-	virtual tInputBits getClickFilter();
+	virtual InputBits getClickFilter();
 
 	virtual void allowInput(const bool allow) { _allowInput = allow; }
 
@@ -421,7 +421,7 @@ protected:
 	static InputHandler *_inputHandler;
 	static InputDevice _inputDevice; // TODO: Remove global constructor
 	static bool _invalHotspots;
-	static tInputBits _lastFilter;
+	static InputBits _lastFilter;
 	
 	InputHandler *_nextHandler;
 	bool _allowInput;
@@ -466,14 +466,14 @@ class JMPPPInput {
 public:
 	static bool isMenuButtonPressInput(const Input &input) { return input.twoButtonDown(); }
 
-	static tInputBits getClickInputFilter() { return kFilterTwoButton; }
+	static InputBits getClickInputFilter() { return kFilterTwoButton; }
 	static bool isClickInput(const Input &input) { return input.twoButtonDown(); }
 	static bool isDraggingInput(const Input &input) { return input.twoButtonAnyDown(); }
 	static bool isPressingInput(const Input &input) { return input.twoButtonAnyDown(); }
 
 	static bool isRaiseInventoryInput(const Input &input) { return input.leftFireButtonDown(); }
 	static bool isRaiseBiochipsInput(const Input &input) { return input.rightFireButtonDown(); }
-	static tInputBits getItemPanelsInputFilter() { return kFilterLeftFireButton | kFilterRightFireButton; }
+	static InputBits getItemPanelsInputFilter() { return kFilterLeftFireButton | kFilterRightFireButton; }
 
 	static bool isToggleAIMiddleInput(const Input &input) { return input.threeButtonDown(); }
 
diff --git a/engines/pegasus/interaction.h b/engines/pegasus/interaction.h
index b54c59ea38..b1318563ac 100755
--- a/engines/pegasus/interaction.h
+++ b/engines/pegasus/interaction.h
@@ -31,13 +31,13 @@
 
 namespace Pegasus {
 
-static const tInteractionID kNoInteractionID = -1;
+static const InteractionID kNoInteractionID = -1;
 
 class Neighborhood;
 
 class GameInteraction : public IDObject, public InputHandler {
 public:
-	GameInteraction(const tInteractionID id, Neighborhood *nextHandler) : IDObject(id), InputHandler((InputHandler *)nextHandler) {
+	GameInteraction(const InteractionID id, Neighborhood *nextHandler) : IDObject(id), InputHandler((InputHandler *)nextHandler) {
 		_isInteracting = false;
 		_savedHandler = 0;
 		_owner = nextHandler;
diff --git a/engines/pegasus/interface.cpp b/engines/pegasus/interface.cpp
index e9daecbd07..5e5188886e 100755
--- a/engines/pegasus/interface.cpp
+++ b/engines/pegasus/interface.cpp
@@ -294,11 +294,11 @@ void Interface::createInterface() {
 	}
 }
 
-tInventoryResult Interface::addInventoryItem(InventoryItem *item) {
+InventoryResult Interface::addInventoryItem(InventoryItem *item) {
 	return _inventoryPanel.addInventoryItem(item);
 }
 
-tInventoryResult Interface::removeInventoryItem(InventoryItem *item) {
+InventoryResult Interface::removeInventoryItem(InventoryItem *item) {
 	return _inventoryPanel.removeInventoryItem(item);
 }
 
@@ -314,11 +314,11 @@ void Interface::setCurrentInventoryItem(InventoryItem *item) {
 	setCurrentInventoryItemID(item->getObjectID());
 }
 
-void Interface::setCurrentInventoryItemID(tItemID id) {
+void Interface::setCurrentInventoryItemID(ItemID id) {
 	_inventoryPanel.setCurrentItemID(id);
 }
 
-tInventoryResult Interface::addBiochip(BiochipItem *item) {
+InventoryResult Interface::addBiochip(BiochipItem *item) {
 	return _biochipPanel.addInventoryItem(item);
 }
 
@@ -334,11 +334,11 @@ void Interface::setCurrentBiochip(BiochipItem *item) {
 	setCurrentBiochipID(item->getObjectID());
 }
 
-void Interface::setCurrentBiochipID(tItemID id) {
+void Interface::setCurrentBiochipID(ItemID id) {
 	_biochipPanel.setCurrentItemID(id);
 }
 
-void Interface::receiveNotification(Notification *notification, const tNotificationFlags flags) {
+void Interface::receiveNotification(Notification *notification, const NotificationFlags flags) {
 	if (notification == &_interfaceNotification) {
 		switch (flags) {
 		case kInventoryLidOpenFlag:
diff --git a/engines/pegasus/interface.h b/engines/pegasus/interface.h
index f8ad714e97..a65d9a595a 100755
--- a/engines/pegasus/interface.h
+++ b/engines/pegasus/interface.h
@@ -63,17 +63,17 @@ public:
 	bool isInventoryUp();
 	bool isInventoryDown();
 
-	tInventoryResult addInventoryItem(InventoryItem*);
-	tInventoryResult removeInventoryItem(InventoryItem*);
+	InventoryResult addInventoryItem(InventoryItem *);
+	InventoryResult removeInventoryItem(InventoryItem *);
 	void removeAllItemsFromInventory();
 	InventoryItem *getCurrentInventoryItem();
-	void setCurrentInventoryItem(InventoryItem*);
-	void setCurrentInventoryItemID(tItemID);
-	tInventoryResult addBiochip(BiochipItem*);
+	void setCurrentInventoryItem(InventoryItem *);
+	void setCurrentInventoryItemID(ItemID);
+	InventoryResult addBiochip(BiochipItem *);
 	void removeAllItemsFromBiochips();
 	BiochipItem *getCurrentBiochip();
-	void setCurrentBiochip(BiochipItem*);
-	void setCurrentBiochipID(tItemID);
+	void setCurrentBiochip(BiochipItem *);
+	void setCurrentBiochipID(ItemID);
 
 	void setDate(const uint16);
 
@@ -100,7 +100,7 @@ protected:
 	void throwAwayBiochipPanel();
 	void throwAwayEnergyMonitor();
 
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void inventoryLidOpen(const bool doCallBacks);
 	void inventoryLidClosed();
 	void inventoryDrawerUp();
diff --git a/engines/pegasus/items/biochips/aichip.cpp b/engines/pegasus/items/biochips/aichip.cpp
index d4e425921b..5e9fc9f8c3 100755
--- a/engines/pegasus/items/biochips/aichip.cpp
+++ b/engines/pegasus/items/biochips/aichip.cpp
@@ -33,7 +33,7 @@
 namespace Pegasus {
 
 // indexed by [number of hints][number of solves (0, 1, or 2)][which button to highlight]
-static const tItemState s_highlightState[4][3][7] = {
+static const ItemState s_highlightState[4][3][7] = {
 	{
 		{kAI000,	-1,			-1,			-1,			-1,			kAI005,		kAI006},
 		{kAI010,	-1,			-1,			-1,			-1,			kAI015,		kAI016},
@@ -58,7 +58,7 @@ static const tItemState s_highlightState[4][3][7] = {
 
 AIChip *g_AIChip = 0;
 
-AIChip::AIChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+AIChip::AIChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction), _briefingSpot(kAIBriefingSpotID), _scanSpot(kAIScanSpotID),
 		_hint1Spot(kAIHint1SpotID), _hint2Spot(kAIHint2SpotID), _hint3Spot(kAIHint3SpotID), _solveSpot(kAISolveSpotID) {
 	_briefingSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 10, kAIMiddleAreaTop + 27, kAIMiddleAreaLeft + 10 + 81, kAIMiddleAreaTop + 27 + 31));
@@ -186,7 +186,7 @@ void AIChip::showBriefingClicked() {
 		numSolves = 0;
 	}
 
-	tItemState newState = s_highlightState[vm->getNumHints()][numSolves][kAIBriefingSpotID - kAIHint1SpotID + 1];
+	ItemState newState = s_highlightState[vm->getNumHints()][numSolves][kAIBriefingSpotID - kAIHint1SpotID + 1];
 	if (newState != -1)
 		setItemState(newState);
 }
@@ -206,7 +206,7 @@ void AIChip::showEnvScanClicked() {
 		numSolves = 0;
 	}
 
-	tItemState newState = s_highlightState[vm->getNumHints()][numSolves][kAIScanSpotID - kAIHint1SpotID + 1];
+	ItemState newState = s_highlightState[vm->getNumHints()][numSolves][kAIScanSpotID - kAIHint1SpotID + 1];
 
 	if (newState != -1)
 		setItemState(newState);
@@ -217,7 +217,7 @@ void AIChip::clearClicked() {
 	setUpAIChip();
 }
 
-void AIChip::clickInAIHotspot(tHotSpotID id) {
+void AIChip::clickInAIHotspot(HotSpotID id) {
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
 
 	Common::String movieName;
@@ -243,7 +243,7 @@ void AIChip::clickInAIHotspot(tHotSpotID id) {
 		break;
 	}
 
-	tItemState state = getItemState();
+	ItemState state = getItemState();
 
 	if (!movieName.empty()) {
 		_playingMovie = true;
@@ -258,7 +258,7 @@ void AIChip::clickInAIHotspot(tHotSpotID id) {
 			numSolves = 0;
 		}
 
-		tItemState newState = s_highlightState[vm->getNumHints()][numSolves][id - kAIHint1SpotID + 1];
+		ItemState newState = s_highlightState[vm->getNumHints()][numSolves][id - kAIHint1SpotID + 1];
 
 		if (newState != -1)
 			setItemState(newState);
diff --git a/engines/pegasus/items/biochips/aichip.h b/engines/pegasus/items/biochips/aichip.h
index 96d2fb2c01..e0cbd994dd 100755
--- a/engines/pegasus/items/biochips/aichip.h
+++ b/engines/pegasus/items/biochips/aichip.h
@@ -33,7 +33,7 @@ namespace Pegasus {
 
 class AIChip : public BiochipItem {
 public:
-	AIChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	AIChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~AIChip();
 
 	void select();
@@ -44,7 +44,7 @@ public:
 	// own the center area.
 	void setUpAIChipRude();
 	void activateAIHotspots();
-	void clickInAIHotspot(tHotSpotID);
+	void clickInAIHotspot(HotSpotID);
 
 	void takeSharedArea();
 
diff --git a/engines/pegasus/items/biochips/biochipitem.cpp b/engines/pegasus/items/biochips/biochipitem.cpp
index 99e6050c85..5686948937 100755
--- a/engines/pegasus/items/biochips/biochipitem.cpp
+++ b/engines/pegasus/items/biochips/biochipitem.cpp
@@ -32,7 +32,7 @@
 
 namespace Pegasus {
 
-BiochipItem::BiochipItem(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+BiochipItem::BiochipItem(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		Item(id, neighborhood, room, direction) {
 
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
@@ -59,7 +59,7 @@ BiochipItem::~BiochipItem() {
 	delete[] _rightAreaInfo.entries;
 }
 
-tItemType BiochipItem::getItemType() {
+ItemType BiochipItem::getItemType() {
 	return kBiochipItemType;
 }
 
@@ -68,7 +68,7 @@ TimeValue BiochipItem::getRightAreaTime() const {
 		return 0xffffffff;
 
 	TimeValue time;
-	tItemState state;
+	ItemState state;
 
 	findItemStateEntryByState(_rightAreaInfo, _itemState, time);
 	if (time == 0xffffffff)
diff --git a/engines/pegasus/items/biochips/biochipitem.h b/engines/pegasus/items/biochips/biochipitem.h
index 904c23b392..24b9ae699a 100755
--- a/engines/pegasus/items/biochips/biochipitem.h
+++ b/engines/pegasus/items/biochips/biochipitem.h
@@ -32,10 +32,10 @@ namespace Pegasus {
 
 class BiochipItem : public Item {
 public:
-	BiochipItem(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	BiochipItem(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~BiochipItem();
 	
-	virtual tItemType getItemType();
+	virtual ItemType getItemType();
 	
 	TimeValue getPanelTime() const { return _biochipInfoPanelTime; }
 	TimeValue getRightAreaTime() const;
diff --git a/engines/pegasus/items/biochips/mapchip.cpp b/engines/pegasus/items/biochips/mapchip.cpp
index de6d4e2dfe..69050d5193 100755
--- a/engines/pegasus/items/biochips/mapchip.cpp
+++ b/engines/pegasus/items/biochips/mapchip.cpp
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 MapChip *g_map = 0;
 
-MapChip::MapChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+MapChip::MapChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction) {
 	g_map = this;
 	setItemState(kMapUnavailable);
@@ -69,8 +69,8 @@ void MapChip::deselect() {
 	_image.unloadImage();
 }
 
-void MapChip::moveToMapLocation(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant dir) {
-	tAirQuality airQuality;
+void MapChip::moveToMapLocation(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant dir) {
+	AirQuality airQuality;
 
 	if (g_neighborhood)
 		airQuality = g_neighborhood->getAirQuality(room);
diff --git a/engines/pegasus/items/biochips/mapchip.h b/engines/pegasus/items/biochips/mapchip.h
index 69bfabc200..6690090aa4 100755
--- a/engines/pegasus/items/biochips/mapchip.h
+++ b/engines/pegasus/items/biochips/mapchip.h
@@ -38,7 +38,7 @@ namespace Pegasus {
 
 class MapChip : public BiochipItem {
 public:
-	MapChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	MapChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~MapChip();
 
 	void select();
@@ -46,7 +46,7 @@ public:
 	void takeSharedArea();
 	void giveUpSharedArea();
 
-	void moveToMapLocation(const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	void moveToMapLocation(const NeighborhoodID, const RoomID, const DirectionConstant);
 
 	void writeToStream(Common::WriteStream *);
 	void readFromStream(Common::ReadStream *);
diff --git a/engines/pegasus/items/biochips/mapimage.cpp b/engines/pegasus/items/biochips/mapimage.cpp
index 6e4a8ecd12..bd7b8ff910 100755
--- a/engines/pegasus/items/biochips/mapimage.cpp
+++ b/engines/pegasus/items/biochips/mapimage.cpp
@@ -55,20 +55,20 @@ static const int kGearRoomFlagHigh = ROOM_TO_FLAG(kMars39, kWest);
 static const int kMazeFlagLow = ROOM_TO_FLAG(kMars60, kNorth);
 static const int kMazeFlagHigh = ROOM_TO_FLAG(kMarsMaze200, kWest);
 
-static const tCoordType kGearRoomScreenOffsetX = 49;
-static const tCoordType kGearRoomScreenOffsetY = 47;
+static const CoordType kGearRoomScreenOffsetX = 49;
+static const CoordType kGearRoomScreenOffsetY = 47;
 
-static const tCoordType kGearRoomGridOriginX = 1;
-static const tCoordType kGearRoomGridOriginY = 4;
+static const CoordType kGearRoomGridOriginX = 1;
+static const CoordType kGearRoomGridOriginY = 4;
 
-static const tCoordType kMazeScreenOffsetX = 16;
-static const tCoordType kMazeScreenOffsetY = 20;
+static const CoordType kMazeScreenOffsetX = 16;
+static const CoordType kMazeScreenOffsetY = 20;
 
-static const tCoordType kMazeGridOriginX = 6;
-static const tCoordType kMazeGridOriginY = 1;
+static const CoordType kMazeGridOriginX = 6;
+static const CoordType kMazeGridOriginY = 1;
 
-static const tCoordType kGridWidth = 4;
-static const tCoordType kGridHeight = 4;
+static const CoordType kGridWidth = 4;
+static const CoordType kGridHeight = 4;
 
 static const uint16 kMapOfMazePICTID = 906;
 static const uint16 kMapOfGearRoomPICTID = 907;
@@ -318,7 +318,7 @@ void MapImage::unloadImage() {
 	_whichArea = kMapNoArea;
 }
 
-void MapImage::moveToMapLocation(const tNeighborhoodID, const tRoomID room, const tDirectionConstant dir) {
+void MapImage::moveToMapLocation(const NeighborhoodID, const RoomID room, const DirectionConstant dir) {
 	GraphicsManager *gfx = ((PegasusEngine *)g_engine)->_gfx;
 
 	int flag = ROOM_TO_FLAG(room, dir);
@@ -346,7 +346,7 @@ void MapImage::addFlagToMask(const int flag) {
 // This function can even be sensitive to open doors.
 // clone2727 notices that it's not, though
 void MapImage::getRevealedRects(const uint32 flag, Common::Rect &r1) {	
-	tCoordType gridX, gridY;
+	CoordType gridX, gridY;
 
 	switch (_whichArea) {
 	case kMapMaze:
@@ -371,7 +371,7 @@ void MapImage::getRevealedRects(const uint32 flag, Common::Rect &r1) {
 void MapImage::drawPlayer() {
 	Graphics::Surface *screen = ((PegasusEngine *)g_engine)->_gfx->getCurSurface();
 
-	tCoordType gridX, gridY;
+	CoordType gridX, gridY;
 
 	switch (_whichArea) {
 	case kMapMaze:
diff --git a/engines/pegasus/items/biochips/mapimage.h b/engines/pegasus/items/biochips/mapimage.h
index 359d67ca4c..d596b585c4 100755
--- a/engines/pegasus/items/biochips/mapimage.h
+++ b/engines/pegasus/items/biochips/mapimage.h
@@ -49,7 +49,7 @@ public:
 	void loadGearRoomIfNecessary();
 	void loadMazeIfNecessary();
 	void unloadImage();
-	void moveToMapLocation(const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	void moveToMapLocation(const NeighborhoodID, const RoomID, const DirectionConstant);
 	
 	void draw(const Common::Rect &);
 	
diff --git a/engines/pegasus/items/biochips/opticalchip.cpp b/engines/pegasus/items/biochips/opticalchip.cpp
index f6519c7f61..6a9a41d573 100755
--- a/engines/pegasus/items/biochips/opticalchip.cpp
+++ b/engines/pegasus/items/biochips/opticalchip.cpp
@@ -30,7 +30,7 @@ namespace Pegasus {
 
 OpticalChip *g_opticalChip = 0;
 
-OpticalChip::OpticalChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+OpticalChip::OpticalChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction), _ariesHotspot(kAriesSpotID), _mercuryHotspot(kMercurySpotID),
 		_poseidonHotspot(kPoseidonSpotID) {
 	_ariesHotspot.setArea(Common::Rect(kAIMiddleAreaLeft + 60, kAIMiddleAreaTop + 27, kAIMiddleAreaLeft + 60 + 121, kAIMiddleAreaTop + 27 + 20));
@@ -118,11 +118,11 @@ void OpticalChip::activateOpticalHotspots() {
 		_poseidonHotspot.setActive();
 }
 
-void OpticalChip::clickInOpticalHotspot(tHotSpotID id) {
+void OpticalChip::clickInOpticalHotspot(HotSpotID id) {
 	playOpMemMovie(id);
 }
 
-void OpticalChip::playOpMemMovie(tHotSpotID id) {
+void OpticalChip::playOpMemMovie(HotSpotID id) {
 	Common::String movieName;
 	switch (id) {
 	case kAriesSpotID:
@@ -136,7 +136,7 @@ void OpticalChip::playOpMemMovie(tHotSpotID id) {
 		break;
 	}
 
-	tItemState state = getItemState(), newState;
+	ItemState state = getItemState(), newState;
 	switch (state) {
 	case kOptical000:
 		// Can never happen.
diff --git a/engines/pegasus/items/biochips/opticalchip.h b/engines/pegasus/items/biochips/opticalchip.h
index c44a5eaf63..b1ea87bffc 100755
--- a/engines/pegasus/items/biochips/opticalchip.h
+++ b/engines/pegasus/items/biochips/opticalchip.h
@@ -34,7 +34,7 @@ namespace Pegasus {
 
 class OpticalChip : public BiochipItem {
 public:
-	OpticalChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	OpticalChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~OpticalChip();
 
 	virtual void writeToStream(Common::WriteStream *);
@@ -45,8 +45,8 @@ public:
 	void addPoseidon();
 
 	void activateOpticalHotspots();
-	void clickInOpticalHotspot(tHotSpotID);
-	void playOpMemMovie(tHotSpotID);
+	void clickInOpticalHotspot(HotSpotID);
+	void playOpMemMovie(HotSpotID);
 
 protected:
 	enum {
diff --git a/engines/pegasus/items/biochips/pegasuschip.cpp b/engines/pegasus/items/biochips/pegasuschip.cpp
index 8d369c1a17..1e3e0d7a88 100755
--- a/engines/pegasus/items/biochips/pegasuschip.cpp
+++ b/engines/pegasus/items/biochips/pegasuschip.cpp
@@ -32,7 +32,7 @@
 
 namespace Pegasus {
 
-PegasusChip::PegasusChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+PegasusChip::PegasusChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction), _recallSpot(kPegasusRecallSpotID) {
 	_recallSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 116, kAIMiddleAreaTop + 63, kAIMiddleAreaLeft + 184, kAIMiddleAreaTop + 91));
 	_recallSpot.setHotspotFlags(kPegasusBiochipSpotFlag);
@@ -125,8 +125,8 @@ void PegasusChip::activatePegasusHotspots() {
 void PegasusChip::clickInPegasusHotspot() {
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
 
-	tItemState thisState = getItemState();
-	tItemState hiliteState;
+	ItemState thisState = getItemState();
+	ItemState hiliteState;
 
 	switch (thisState) {
 	case kPegasusPrehistoric00:
diff --git a/engines/pegasus/items/biochips/pegasuschip.h b/engines/pegasus/items/biochips/pegasuschip.h
index 1ee35b78a1..7597424821 100755
--- a/engines/pegasus/items/biochips/pegasuschip.h
+++ b/engines/pegasus/items/biochips/pegasuschip.h
@@ -33,7 +33,7 @@ namespace Pegasus {
 
 class PegasusChip : public BiochipItem {
 public:
-	PegasusChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	PegasusChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~PegasusChip();
 
 	void select();
diff --git a/engines/pegasus/items/biochips/retscanchip.cpp b/engines/pegasus/items/biochips/retscanchip.cpp
index e9904056c1..84b74a63d2 100755
--- a/engines/pegasus/items/biochips/retscanchip.cpp
+++ b/engines/pegasus/items/biochips/retscanchip.cpp
@@ -28,7 +28,7 @@
 
 namespace Pegasus {
 
-RetScanChip::RetScanChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+RetScanChip::RetScanChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction) {
 }
 
diff --git a/engines/pegasus/items/biochips/retscanchip.h b/engines/pegasus/items/biochips/retscanchip.h
index 7d8fe6d401..e72eaeddaf 100755
--- a/engines/pegasus/items/biochips/retscanchip.h
+++ b/engines/pegasus/items/biochips/retscanchip.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 class RetScanChip : public BiochipItem {
 public:
-	RetScanChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	RetScanChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~RetScanChip() {}
 	
 	void searchForLaser();
diff --git a/engines/pegasus/items/biochips/shieldchip.cpp b/engines/pegasus/items/biochips/shieldchip.cpp
index 4bd05728b4..58cbfcc4ec 100755
--- a/engines/pegasus/items/biochips/shieldchip.cpp
+++ b/engines/pegasus/items/biochips/shieldchip.cpp
@@ -31,7 +31,7 @@ namespace Pegasus {
 
 ShieldChip *g_shield = 0;
 
-ShieldChip::ShieldChip(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+ShieldChip::ShieldChip(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		BiochipItem(id, neighborhood, room, direction) {
 	g_shield = this;
 }
diff --git a/engines/pegasus/items/biochips/shieldchip.h b/engines/pegasus/items/biochips/shieldchip.h
index c0b9cc5183..69c6369236 100755
--- a/engines/pegasus/items/biochips/shieldchip.h
+++ b/engines/pegasus/items/biochips/shieldchip.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 class ShieldChip : public BiochipItem {
 public:
-	ShieldChip(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	ShieldChip(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~ShieldChip() {}
 
 	void select();
diff --git a/engines/pegasus/items/inventory.cpp b/engines/pegasus/items/inventory.cpp
index 8f7eb46fd4..e30fcac368 100755
--- a/engines/pegasus/items/inventory.cpp
+++ b/engines/pegasus/items/inventory.cpp
@@ -38,13 +38,13 @@ Inventory::Inventory() {
 Inventory::~Inventory() {
 }
 
-void Inventory::setWeightLimit(tWeightType limit) {
+void Inventory::setWeightLimit(WeightType limit) {
 	_weightLimit = limit;
 	//	*** What to do if the new weight limit is greater than the current weight?
 }
 
-tWeightType Inventory::getWeight() {
-	tWeightType	result = 0;
+WeightType Inventory::getWeight() {
+	WeightType	result = 0;
 
 	for (ItemIterator it = _inventoryList.begin(); it != _inventoryList.end(); it++)
 		result += (*it)->getItemWeight();
@@ -53,7 +53,7 @@ tWeightType Inventory::getWeight() {
 }
 
 //	If the item already belongs, just return kInventoryOK.
-tInventoryResult Inventory::addItem(Item *item) {
+InventoryResult Inventory::addItem(Item *item) {
 	if (itemInInventory(item))
 		return kInventoryOK;
 
@@ -67,7 +67,7 @@ tInventoryResult Inventory::addItem(Item *item) {
 	return kInventoryOK;
 }
 
-tInventoryResult Inventory::removeItem(Item *item) {
+InventoryResult Inventory::removeItem(Item *item) {
 	for (ItemIterator it = _inventoryList.begin(); it != _inventoryList.end(); it++) {
 		if (*it == item) {
 			_inventoryList.erase(it);
@@ -81,7 +81,7 @@ tInventoryResult Inventory::removeItem(Item *item) {
 	return kItemNotInInventory;
 }
 
-tInventoryResult Inventory::removeItem(tItemID id) {
+InventoryResult Inventory::removeItem(ItemID id) {
 	Item *item = findItemByID(id);
 	
 	if (item) {
@@ -108,7 +108,7 @@ bool Inventory::itemInInventory(Item *item) {
 	return false;
 }
 
-bool Inventory::itemInInventory(tItemID id) {
+bool Inventory::itemInInventory(ItemID id) {
 	return findItemByID(id) != NULL;
 }
 
@@ -121,7 +121,7 @@ Item *Inventory::getItemAt(int32 index) {
 	return 0;
 }
 
-tItemID Inventory::getItemIDAt(int32 index) {
+ItemID Inventory::getItemIDAt(int32 index) {
 	Item *item = getItemAt(index);
 
 	if (item)
@@ -130,7 +130,7 @@ tItemID Inventory::getItemIDAt(int32 index) {
 	return kNoItemID;
 }
 
-Item *Inventory::findItemByID(tItemID id) {
+Item *Inventory::findItemByID(ItemID id) {
 	return _inventoryList.findItemByID(id);
 }
 
@@ -147,7 +147,7 @@ int32 Inventory::findIndexOf(Item *item) {
 
 //	Return -1 if not found.
 
-int32 Inventory::findIndexOf(tItemID id) {
+int32 Inventory::findIndexOf(ItemID id) {
 	uint32 i = 0;
 	for (ItemIterator it = _inventoryList.begin(); it != _inventoryList.end(); it++, i++)
 		if ((*it)->getObjectID() == id)
@@ -156,7 +156,7 @@ int32 Inventory::findIndexOf(tItemID id) {
 	return -1;
 }
 
-tWeightType Inventory::getWeightLimit() {
+WeightType Inventory::getWeightLimit() {
 	return _weightLimit;
 }
 
@@ -164,11 +164,11 @@ int32 Inventory::getNumItems() {
 	return _inventoryList.size();
 }
 
-void Inventory::setOwnerID(const tActorID id) {
+void Inventory::setOwnerID(const ActorID id) {
 	_ownerID = id;
 }
 
-tActorID Inventory::getOwnerID() const {
+ActorID Inventory::getOwnerID() const {
 	return _ownerID;
 }
 
diff --git a/engines/pegasus/items/inventory.h b/engines/pegasus/items/inventory.h
index 7da782f00e..db872b1990 100755
--- a/engines/pegasus/items/inventory.h
+++ b/engines/pegasus/items/inventory.h
@@ -44,31 +44,31 @@ public:
 	Inventory();
 	virtual ~Inventory();
 	
-	tWeightType getWeightLimit();
-	void setWeightLimit(tWeightType limit);
-	tWeightType getWeight();
+	WeightType getWeightLimit();
+	void setWeightLimit(WeightType limit);
+	WeightType getWeight();
 	
-	virtual tInventoryResult addItem(Item *item);
-	virtual tInventoryResult removeItem(Item *item);
-	virtual tInventoryResult removeItem(tItemID id);
+	virtual InventoryResult addItem(Item *item);
+	virtual InventoryResult removeItem(Item *item);
+	virtual InventoryResult removeItem(ItemID id);
 	virtual bool itemInInventory(Item *item);
-	virtual bool itemInInventory(tItemID id);
+	virtual bool itemInInventory(ItemID id);
 	virtual Item *getItemAt(int32 index);
-	virtual tItemID getItemIDAt(int32 index);
-	virtual Item *findItemByID(tItemID id);
+	virtual ItemID getItemIDAt(int32 index);
+	virtual Item *findItemByID(ItemID id);
 	virtual int32 findIndexOf(Item *item);
-	virtual int32 findIndexOf(tItemID id);
+	virtual int32 findIndexOf(ItemID id);
 	int32 getNumItems();
 	virtual void removeAllItems();
 	
-	void setOwnerID(const tActorID id);
-	tActorID getOwnerID() const;
+	void setOwnerID(const ActorID id);
+	ActorID getOwnerID() const;
 	
 	uint32 getReferenceCount() { return _referenceCount; }
 
 protected:
-	tWeightType _weightLimit;
-	tActorID _ownerID;
+	WeightType _weightLimit;
+	ActorID _ownerID;
 	ItemList _inventoryList;
 
 private:
diff --git a/engines/pegasus/items/inventory/airmask.cpp b/engines/pegasus/items/inventory/airmask.cpp
index 682927deaf..56f9d6f62f 100755
--- a/engines/pegasus/items/inventory/airmask.cpp
+++ b/engines/pegasus/items/inventory/airmask.cpp
@@ -40,7 +40,7 @@ void AirMask::airMaskTimerExpired(FunctionPtr *, void *) {
 		g_neighborhood->checkAirMask();
 }
 
-AirMask::AirMask(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+AirMask::AirMask(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		InventoryItem(id, neighborhood, room, direction), _toggleSpot(kAirMaskToggleSpotID) {
 	g_airMask = this;
 	_toggleSpot.setArea(Common::Rect(kAIMiddleAreaLeft + 10, kAIMiddleAreaTop + 17, kAIMiddleAreaLeft + 110, kAIMiddleAreaTop + 57));
@@ -68,7 +68,7 @@ void AirMask::readFromStream(Common::ReadStream *stream) {
 }
 
 void AirMask::putMaskOn() {
-	tAirQuality airQuality;
+	AirQuality airQuality;
 
 	if (g_neighborhood)
 		airQuality = g_neighborhood->getAirQuality(GameState.getCurrentRoom());
@@ -76,8 +76,8 @@ void AirMask::putMaskOn() {
 		airQuality = kAirQualityGood;
 
 	uint airLevel = getAirLeft();
-	tItemState newState = getItemState();
-	tItemState oldState = newState;
+	ItemState newState = getItemState();
+	ItemState oldState = newState;
 
 	if (airLevel == 0) {
 		newState = kAirMaskEmptyFilter;
@@ -99,8 +99,8 @@ void AirMask::putMaskOn() {
 
 void AirMask::takeMaskOff() {	
 	uint airLevel = getAirLeft();
-	tItemState newState = getItemState();
-	tItemState oldState = newState;
+	ItemState newState = getItemState();
+	ItemState oldState = newState;
 
 	if (airLevel == 0)
 		newState = kAirMaskEmptyOff;
@@ -127,7 +127,7 @@ void AirMask::airQualityChanged() {
 		takeMaskOff();
 }
 
-void AirMask::setItemState(const tItemState newState) {
+void AirMask::setItemState(const ItemState newState) {
 	if (newState != getItemState()) {
 		InventoryItem::setItemState(newState);
 
diff --git a/engines/pegasus/items/inventory/airmask.h b/engines/pegasus/items/inventory/airmask.h
index 0e71380baf..f207f3b82b 100755
--- a/engines/pegasus/items/inventory/airmask.h
+++ b/engines/pegasus/items/inventory/airmask.h
@@ -34,13 +34,13 @@ namespace Pegasus {
 
 class AirMask : public InventoryItem, private Idler {
 public:
-	AirMask(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	AirMask(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~AirMask();
 
 	virtual void writeToStream(Common::WriteStream *);
 	virtual void readFromStream(Common::ReadStream *);
 
-	virtual void setItemState(const tItemState);
+	virtual void setItemState(const ItemState);
 	void putMaskOn();
 	void takeMaskOff();
 	void toggleItemState();
diff --git a/engines/pegasus/items/inventory/gascanister.cpp b/engines/pegasus/items/inventory/gascanister.cpp
index b6cd883bec..bf63cc6542 100755
--- a/engines/pegasus/items/inventory/gascanister.cpp
+++ b/engines/pegasus/items/inventory/gascanister.cpp
@@ -28,7 +28,7 @@
 
 namespace Pegasus {
 
-GasCanister::GasCanister(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+GasCanister::GasCanister(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		InventoryItem(id, neighborhood, room, direction) {
 }
 
diff --git a/engines/pegasus/items/inventory/gascanister.h b/engines/pegasus/items/inventory/gascanister.h
index 437df1292f..dae72c12cb 100755
--- a/engines/pegasus/items/inventory/gascanister.h
+++ b/engines/pegasus/items/inventory/gascanister.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 class GasCanister : public InventoryItem {
 public:
-	GasCanister(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	GasCanister(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~GasCanister() {}
 	
 	void select();
diff --git a/engines/pegasus/items/inventory/inventoryitem.cpp b/engines/pegasus/items/inventory/inventoryitem.cpp
index 17f07050b3..4399708879 100755
--- a/engines/pegasus/items/inventory/inventoryitem.cpp
+++ b/engines/pegasus/items/inventory/inventoryitem.cpp
@@ -31,7 +31,7 @@
 
 namespace Pegasus {
 
-InventoryItem::InventoryItem(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+InventoryItem::InventoryItem(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 		Item(id, neighborhood, room, direction) {
 
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
@@ -61,7 +61,7 @@ InventoryItem::~InventoryItem() {
 	delete[] _leftAreaInfo.entries;
 }
 
-tItemType InventoryItem::getItemType() {
+ItemType InventoryItem::getItemType() {
 	return kInventoryItemType;
 }
 
@@ -70,7 +70,7 @@ TimeValue InventoryItem::getLeftAreaTime() const {
 		return 0xffffffff;
 
 	TimeValue time;
-	tItemState state;
+	ItemState state;
 
 	findItemStateEntryByState(_leftAreaInfo, _itemState, time);
 	if (time == 0xffffffff)
diff --git a/engines/pegasus/items/inventory/inventoryitem.h b/engines/pegasus/items/inventory/inventoryitem.h
index d3247d651c..b526463b18 100755
--- a/engines/pegasus/items/inventory/inventoryitem.h
+++ b/engines/pegasus/items/inventory/inventoryitem.h
@@ -39,12 +39,12 @@ struct JMPInventoryInfo {
 
 class InventoryItem : public Item {
 public:
-	InventoryItem(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	InventoryItem(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~InventoryItem();
 	
-	virtual tItemType getItemType();
+	virtual ItemType getItemType();
 	
-	void getPanelTimes(TimeValue&, TimeValue&) const;
+	void getPanelTimes(TimeValue &, TimeValue &) const;
 	TimeValue getLeftAreaTime() const;
 	
 	void setAnimationTime(const TimeValue);
diff --git a/engines/pegasus/items/inventory/keycard.cpp b/engines/pegasus/items/inventory/keycard.cpp
index 53a3f67e00..c818b6675b 100755
--- a/engines/pegasus/items/inventory/keycard.cpp
+++ b/engines/pegasus/items/inventory/keycard.cpp
@@ -28,7 +28,7 @@
 
 namespace Pegasus {
 
-KeyCard::KeyCard(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) :
+KeyCard::KeyCard(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) :
 			InventoryItem(id, neighborhood, room, direction) {
 	setItemState(kFlashlightOff);
 }
@@ -40,7 +40,7 @@ void KeyCard::toggleItemState() {
 		setItemState(kFlashlightOff);
 }
 
-void KeyCard::setItemState(const tItemState newState) {
+void KeyCard::setItemState(const ItemState newState) {
 	if (newState != getItemState()) {
 		InventoryItem::setItemState(newState);
 		((PegasusEngine *)g_engine)->checkFlashlight();
diff --git a/engines/pegasus/items/inventory/keycard.h b/engines/pegasus/items/inventory/keycard.h
index 7fdb905d58..c30c789786 100755
--- a/engines/pegasus/items/inventory/keycard.h
+++ b/engines/pegasus/items/inventory/keycard.h
@@ -32,11 +32,11 @@ namespace Pegasus {
 
 class KeyCard : public InventoryItem {
 public:
-	KeyCard(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	KeyCard(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 	virtual ~KeyCard() {}
 	
 	virtual void toggleItemState();
-	virtual void setItemState(const tItemState);
+	virtual void setItemState(const ItemState);
 	bool isFlashlightOn();
 
 protected:
diff --git a/engines/pegasus/items/inventorypicture.cpp b/engines/pegasus/items/inventorypicture.cpp
index 04bac4472e..7be095c499 100755
--- a/engines/pegasus/items/inventorypicture.cpp
+++ b/engines/pegasus/items/inventorypicture.cpp
@@ -31,7 +31,7 @@
 
 namespace Pegasus {
 
-InventoryPicture::InventoryPicture(const tDisplayElementID id, InputHandler *nextHandler, Inventory *inventory) :
+InventoryPicture::InventoryPicture(const DisplayElementID id, InputHandler *nextHandler, Inventory *inventory) :
 		InputHandler(nextHandler), Picture(id), _panelMovie(kNoDisplayElement){
 	_inventory = inventory;
 	_lastReferenceCount = 0xffffffff;
@@ -71,7 +71,7 @@ void InventoryPicture::throwAwayInventoryImage() {
 	}
 }
 
-void InventoryPicture::getItemXY(uint32 index, tCoordType &x, tCoordType &y) {
+void InventoryPicture::getItemXY(uint32 index, CoordType &x, CoordType &y) {
 	x = (index % _itemsPerRow) * _itemWidth + _itemX;
 	y = (index / _itemsPerRow) * _itemHeight + _itemY;
 }
@@ -130,14 +130,14 @@ void InventoryPicture::setCurrentItemIndex(int32 index) {
 	}
 }
 
-void InventoryPicture::setCurrentItemID(tItemID id) {
+void InventoryPicture::setCurrentItemID(ItemID id) {
 	int32 index = _inventory->findIndexOf(id);
 	if (index >= 0)
 		setCurrentItemIndex(index);
 }
 
-tInventoryResult InventoryPicture::addInventoryItem(Item *item) {
-	tInventoryResult result = _inventory->addItem(item);
+InventoryResult InventoryPicture::addInventoryItem(Item *item) {
+	InventoryResult result = _inventory->addItem(item);
 
 	if (result == kInventoryOK)
 		setCurrentItemIndex(_inventory->findIndexOf(item));
@@ -145,8 +145,8 @@ tInventoryResult InventoryPicture::addInventoryItem(Item *item) {
 	return result;
 }
 
-tInventoryResult InventoryPicture::removeInventoryItem(Item *item) {	
-	tInventoryResult result = _inventory->removeItem(item);
+InventoryResult InventoryPicture::removeInventoryItem(Item *item) {	
+	InventoryResult result = _inventory->removeItem(item);
 
 	if (result == kInventoryOK)
 		setCurrentItemIndex(getCurrentItemIndex());
@@ -163,7 +163,7 @@ bool InventoryPicture::itemInInventory(Item *item) {
 	return _inventory->itemInInventory(item);
 }
 
-bool InventoryPicture::itemInInventory(const tItemID id) {
+bool InventoryPicture::itemInInventory(const ItemID id) {
 	return _inventory->itemInInventory(id);
 }
 
@@ -181,7 +181,7 @@ void InventoryPicture::activateInventoryPicture() {
 	if (_lastReferenceCount != _inventory->getReferenceCount()) {
 		uint32 numItems = _inventory->getNumItems();
 
-		tCoordType x, y;
+		CoordType x, y;
 		getItemXY(0, x, y);
 		_panelMovie.moveMovieBoxTo(x, y);
 		_panelMovie.show();
@@ -251,12 +251,12 @@ void InventoryPicture::handleInput(const Input &input, const Hotspot *cursorSpot
 }
 
 void InventoryPicture::highlightCurrentItem() {
-	tCoordType x, y;
+	CoordType x, y;
 	getItemXY(_currentItemIndex, x, y);
 	_highlightBounds.moveTo(x, y);
 }
 
-InventoryItemsPicture::InventoryItemsPicture(const tDisplayElementID id, InputHandler *nextHandler, Inventory *inventory) :
+InventoryItemsPicture::InventoryItemsPicture(const DisplayElementID id, InputHandler *nextHandler, Inventory *inventory) :
 		InventoryPicture(id, nextHandler, inventory) {
 	_pictName = "Images/Items/Inventory/Inventory Panel";
 	_movieName = "Images/Items/Inventory/Inventory Panel Movie";
@@ -273,7 +273,7 @@ InventoryItemsPicture::InventoryItemsPicture(const tDisplayElementID id, InputHa
 
 void InventoryItemsPicture::loopCurrentItem() {
 	if (_isLooping) {
-		tCoordType x, y;
+		CoordType x, y;
 		getItemXY(_currentItemIndex, x, y);
 		_panelMovie.moveMovieBoxTo(x, y);
 		_highlightBounds.moveTo(x, y);
@@ -339,7 +339,7 @@ void InventoryItemsPicture::playEndMessage(DisplayElement *pushElement) {
 	endMessage.stop();
 }
 
-BiochipPicture::BiochipPicture(const tDisplayElementID id, InputHandler *nextHandler, Inventory *inventory) :
+BiochipPicture::BiochipPicture(const DisplayElementID id, InputHandler *nextHandler, Inventory *inventory) :
 		InventoryPicture(id, nextHandler, inventory) {
 	_pictName = "Images/Items/Biochips/Biochip Panel";
 	_movieName = "Images/Items/Biochips/Biochip Panel Movie";
@@ -355,7 +355,7 @@ BiochipPicture::BiochipPicture(const tDisplayElementID id, InputHandler *nextHan
 
 void BiochipPicture::unhighlightCurrentItem() {
 	InventoryPicture::unhighlightCurrentItem();
-	tCoordType x, y;
+	CoordType x, y;
 	getItemXY(_currentItemIndex, x, y);
 	_panelMovie.show();
 	_panelMovie.moveMovieBoxTo(x, y);
diff --git a/engines/pegasus/items/inventorypicture.h b/engines/pegasus/items/inventorypicture.h
index 034354df09..18e85ef988 100755
--- a/engines/pegasus/items/inventorypicture.h
+++ b/engines/pegasus/items/inventorypicture.h
@@ -39,7 +39,7 @@ class Transition;
 
 class InventoryPicture : public InputHandler, public Picture {
 public:
-	InventoryPicture(const tDisplayElementID, InputHandler *, Inventory *);
+	InventoryPicture(const DisplayElementID, InputHandler *, Inventory *);
 	virtual ~InventoryPicture() {}
 	
 	void initInventoryImage(Transition *);
@@ -51,18 +51,18 @@ public:
 	void handleInput(const Input &, const Hotspot *);
 	bool wantsCursor() { return false; }
 	
-	tInventoryResult addInventoryItem(Item *);
-	tInventoryResult removeInventoryItem(Item *);
+	InventoryResult addInventoryItem(Item *);
+	InventoryResult removeInventoryItem(Item *);
 	void removeAllItems();
 	Item *getCurrentItem() { return _currentItem; }
 	void setCurrentItemIndex(int32);
-	void setCurrentItemID(tItemID);
+	void setCurrentItemID(ItemID);
 	int32 getCurrentItemIndex() { return _currentItemIndex; }
 	bool itemInInventory(Item *);
-	bool itemInInventory(const tItemID);
+	bool itemInInventory(const ItemID);
 
 protected:
-	void getItemXY(uint32, tCoordType &, tCoordType &);
+	void getItemXY(uint32, CoordType &, CoordType &);
 	void draw(const Common::Rect &);
 	void drawItemHighlight(const Common::Rect &);
 	virtual void highlightCurrentItem();
@@ -91,7 +91,7 @@ protected:
 
 class InventoryItemsPicture : public InventoryPicture {
 public:
-	InventoryItemsPicture(const tDisplayElementID, InputHandler *, Inventory *);
+	InventoryItemsPicture(const DisplayElementID, InputHandler *, Inventory *);
 	virtual ~InventoryItemsPicture() {}
 
 	void deactivateInventoryPicture();
@@ -112,7 +112,7 @@ protected:
 
 class BiochipPicture : public InventoryPicture {
 public:
-	BiochipPicture(const tDisplayElementID, InputHandler *, Inventory *);
+	BiochipPicture(const DisplayElementID, InputHandler *, Inventory *);
 	virtual ~BiochipPicture() {}
 	
 protected:
diff --git a/engines/pegasus/items/item.cpp b/engines/pegasus/items/item.cpp
index bcb85defae..83e3b0231e 100755
--- a/engines/pegasus/items/item.cpp
+++ b/engines/pegasus/items/item.cpp
@@ -38,7 +38,7 @@
 
 namespace Pegasus {
 
-Item::Item(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) : IDObject(id) {
+Item::Item(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) : IDObject(id) {
 	_itemNeighborhood = neighborhood;
 	_itemRoom = room;
 	_itemDirection = direction;
@@ -147,11 +147,11 @@ void Item::readFromStream(Common::ReadStream *stream) {
 	_itemState = stream->readUint16BE();
 }
 
-tActorID Item::getItemOwner() const {
+ActorID Item::getItemOwner() const {
 	return _itemOwnerID;
 }
 
-void Item::setItemOwner(const tActorID owner) {
+void Item::setItemOwner(const ActorID owner) {
 	_itemOwnerID = owner;
 
 	if (owner == kNoActorID) {
@@ -163,15 +163,15 @@ void Item::setItemOwner(const tActorID owner) {
 	}
 }
 
-tWeightType Item::getItemWeight() {
+WeightType Item::getItemWeight() {
 	return _itemWeight;
 }
 
-tItemState Item::getItemState() const {
+ItemState Item::getItemState() const {
 	return _itemState;
 }
 
-void Item::setItemState(const tItemState state) {
+void Item::setItemState(const ItemState state) {
 	if (state != _itemState) {
 		_itemState = state;
 
@@ -182,13 +182,13 @@ void Item::setItemState(const tItemState state) {
 	}
 }
 
-void Item::getItemRoom(tNeighborhoodID &neighborhood, tRoomID &room, tDirectionConstant &direction) const {
+void Item::getItemRoom(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction) const {
 	neighborhood = _itemNeighborhood;
 	room = _itemRoom;
 	direction = _itemDirection;
 }
 
-void Item::setItemRoom(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) {
+void Item::setItemRoom(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) {
 	_itemNeighborhood = neighborhood;
 	_itemRoom = room;
 	_itemDirection = direction;
@@ -199,7 +199,7 @@ void Item::setItemRoom(const tNeighborhoodID neighborhood, const tRoomID room, c
 		dropped();
 }
 
-tNeighborhoodID Item::getItemNeighborhood() const {
+NeighborhoodID Item::getItemNeighborhood() const {
 	return _itemNeighborhood;
 }
 
@@ -208,7 +208,7 @@ TimeValue Item::getSharedAreaTime() const {
 		return 0xffffffff;
 
 	TimeValue time;
-	tItemState state;
+	ItemState state;
 
 	findItemStateEntryByState(_sharedAreaInfo, _itemState, time);
 	if (time == 0xffffffff)
@@ -241,7 +241,7 @@ void Item::deselect() {
 	}
 }
 
-void Item::getItemStateEntry(ItemStateInfo info, uint32 index, tItemState &state, TimeValue &time) {	
+void Item::getItemStateEntry(ItemStateInfo info, uint32 index, ItemState &state, TimeValue &time) {	
 	if (index < info.numEntries) {
 		state = info.entries[index].itemState;
 		time = info.entries[index].itemTime;
@@ -251,7 +251,7 @@ void Item::getItemStateEntry(ItemStateInfo info, uint32 index, tItemState &state
 	}
 }
 
-void Item::findItemStateEntryByState(ItemStateInfo info, tItemState state, TimeValue &time) {
+void Item::findItemStateEntryByState(ItemStateInfo info, ItemState state, TimeValue &time) {
 	for (uint16 i = 0; i < info.numEntries; i++) {
 		if (info.entries[i].itemState == state) {
 			time = info.entries[i].itemTime;
@@ -275,7 +275,7 @@ ItemStateInfo Item::readItemState(Common::SeekableReadStream *stream) {
 	return info;
 }
 
-Sprite *Item::getDragSprite(const tDisplayElementID id) const {
+Sprite *Item::getDragSprite(const DisplayElementID id) const {
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
 	Sprite *result = new Sprite(id);
 	SpriteFrame *frame = new SpriteFrame();
diff --git a/engines/pegasus/items/item.h b/engines/pegasus/items/item.h
index b74dfc4e96..6d743c3408 100755
--- a/engines/pegasus/items/item.h
+++ b/engines/pegasus/items/item.h
@@ -55,7 +55,7 @@ struct JMPItemInfo {
 //	state of an inventory item.
 
 struct ItemStateEntry {
-	tItemState itemState;
+	ItemState itemState;
 	TimeValue itemTime;
 };
 
@@ -100,158 +100,158 @@ const uint16 kItemBaseResID = 128;
 
 //	Item IDs.
 
-const tItemID kAirMask = 7;
-const tItemID kAntidote = 8;
-const tItemID kArgonCanister = 9;
-const tItemID kCardBomb = 10;
-const tItemID kCrowbar = 11;
-const tItemID kGasCanister = 12;
-const tItemID kHistoricalLog = 13;
-const tItemID kJourneymanKey = 14;
-const tItemID kKeyCard = 15;
-const tItemID kMachineGun = 16;
-const tItemID kMarsCard = 17;
-const tItemID kNitrogenCanister = 18;
-const tItemID kOrangeJuiceGlassFull = 19;
-const tItemID kOrangeJuiceGlassEmpty = 20;
-const tItemID kPoisonDart = 21;
-const tItemID kSinclairKey = 22;
-const tItemID kStunGun = 23;
-const tItemID kArgonPickup = 24;
+const ItemID kAirMask = 7;
+const ItemID kAntidote = 8;
+const ItemID kArgonCanister = 9;
+const ItemID kCardBomb = 10;
+const ItemID kCrowbar = 11;
+const ItemID kGasCanister = 12;
+const ItemID kHistoricalLog = 13;
+const ItemID kJourneymanKey = 14;
+const ItemID kKeyCard = 15;
+const ItemID kMachineGun = 16;
+const ItemID kMarsCard = 17;
+const ItemID kNitrogenCanister = 18;
+const ItemID kOrangeJuiceGlassFull = 19;
+const ItemID kOrangeJuiceGlassEmpty = 20;
+const ItemID kPoisonDart = 21;
+const ItemID kSinclairKey = 22;
+const ItemID kStunGun = 23;
+const ItemID kArgonPickup = 24;
 
 //	Biochips.
 
-const tItemID kAIBiochip = 0;
-const tItemID kInterfaceBiochip = 1;
-const tItemID kMapBiochip = 2;
-const tItemID kOpticalBiochip = 3;
-const tItemID kPegasusBiochip = 4;
-const tItemID kRetinalScanBiochip = 5;
-const tItemID kShieldBiochip = 6;
+const ItemID kAIBiochip = 0;
+const ItemID kInterfaceBiochip = 1;
+const ItemID kMapBiochip = 2;
+const ItemID kOpticalBiochip = 3;
+const ItemID kPegasusBiochip = 4;
+const ItemID kRetinalScanBiochip = 5;
+const ItemID kShieldBiochip = 6;
 
-const tItemID kNumItems = 25;
+const ItemID kNumItems = 25;
 
 //	Item States.
 
-const tItemState kAI000 = 0;
-const tItemState kAI005 = 1;
-const tItemState kAI006 = 2;
-const tItemState kAI010 = 3;
-const tItemState kAI015 = 4;
-const tItemState kAI016 = 5;
-const tItemState kAI020 = 6;
-const tItemState kAI024 = 7;
-const tItemState kAI100 = 8;
-const tItemState kAI101 = 9;
-const tItemState kAI105 = 10;
-const tItemState kAI106 = 11;
-const tItemState kAI110 = 12;
-const tItemState kAI111 = 13;
-const tItemState kAI115 = 14;
-const tItemState kAI116 = 15;
-const tItemState kAI120 = 16;
-const tItemState kAI121 = 17;
-const tItemState kAI124 = 18;
-const tItemState kAI125 = 19;
-const tItemState kAI126 = 20;
-const tItemState kAI200 = 21;
-const tItemState kAI201 = 22;
-const tItemState kAI202 = 23;
-const tItemState kAI205 = 24;
-const tItemState kAI206 = 25;
-const tItemState kAI210 = 26;
-const tItemState kAI211 = 27;
-const tItemState kAI212 = 28;
-const tItemState kAI215 = 29;
-const tItemState kAI216 = 30;
-const tItemState kAI220 = 31;
-const tItemState kAI221 = 32;
-const tItemState kAI222 = 33;
-const tItemState kAI224 = 34;
-const tItemState kAI225 = 35;
-const tItemState kAI226 = 36;
-const tItemState kAI300 = 37;
-const tItemState kAI301 = 38;
-const tItemState kAI302 = 39;
-const tItemState kAI303 = 40;
-const tItemState kAI305 = 41;
-const tItemState kAI306 = 42;
-const tItemState kAI310 = 43;
-const tItemState kAI311 = 44;
-const tItemState kAI312 = 45;
-const tItemState kAI313 = 46;
-const tItemState kAI315 = 47;
-const tItemState kAI316 = 48;
-const tItemState kAI320 = 49;
-const tItemState kAI321 = 50;
-const tItemState kAI322 = 51;
-const tItemState kAI323 = 52;
-const tItemState kAI324 = 53;
-const tItemState kAI325 = 54;
-const tItemState kAI326 = 55;
-const tItemState kNormalItem = 56;
-const tItemState kMapUnavailable = 57;
-const tItemState kMapEngaged = 58;
-const tItemState kOptical000 = 59;
-const tItemState kOptical001 = 60;
-const tItemState kOptical002 = 61;
-const tItemState kOptical010 = 62;
-const tItemState kOptical011 = 63;
-const tItemState kOptical012 = 64;
-const tItemState kOptical020 = 65;
-const tItemState kOptical021 = 66;
-const tItemState kOptical100 = 67;
-const tItemState kOptical101 = 68;
-const tItemState kOptical102 = 69;
-const tItemState kOptical110 = 70;
-const tItemState kOptical111 = 71;
-const tItemState kOptical112 = 72;
-const tItemState kOptical120 = 73;
-const tItemState kOptical121 = 74;
-const tItemState kOptical200 = 75;
-const tItemState kOptical201 = 76;
-const tItemState kOptical210 = 77;
-const tItemState kOptical211 = 78;
-const tItemState kPegasusTSA00 = 79;
-const tItemState kPegasusTSA10 = 80;
-const tItemState kPegasusPrehistoric00 = 81;
-const tItemState kPegasusPrehistoric01 = 82;
-const tItemState kPegasusPrehistoric10 = 83;
-const tItemState kPegasusPrehistoric11 = 84;
-const tItemState kPegasusMars00 = 85;
-const tItemState kPegasusMars01 = 86;
-const tItemState kPegasusMars10 = 87;
-const tItemState kPegasusMars11 = 88;
-const tItemState kPegasusNorad00 = 89;
-const tItemState kPegasusNorad01 = 90;
-const tItemState kPegasusNorad10 = 91;
-const tItemState kPegasusNorad11 = 92;
-const tItemState kPegasusWSC00 = 93;
-const tItemState kPegasusWSC01 = 94;
-const tItemState kPegasusWSC10 = 95;
-const tItemState kPegasusWSC11 = 96;
-const tItemState kPegasusCaldoria = 97;
-const tItemState kRetinalSimulating = 98;
-const tItemState kShieldNormal = 99;
-const tItemState kShieldRadiation = 100;
-const tItemState kShieldPlasma = 101;
-const tItemState kShieldCardBomb = 102;
-const tItemState kShieldDraining = 103;
-const tItemState kAirMaskEmptyOff = 104;
-const tItemState kAirMaskEmptyFilter = 105;
-const tItemState kAirMaskLowOff = 106;
-const tItemState kAirMaskLowFilter = 107;
-const tItemState kAirMaskLowOn = 108;
-const tItemState kAirMaskFullOff = 109;
-const tItemState kAirMaskFullFilter = 110;
-const tItemState kAirMaskFullOn = 111;
-const tItemState kArgonEmpty = 112;
-const tItemState kArgonFull = 113;
-const tItemState kFlashlightOff = 114;
-const tItemState kFlashlightOn = 115;
-const tItemState kNitrogenEmpty = 116;
-const tItemState kNitrogenFull = 117;
-const tItemState kFullGlass = 118;
+const ItemState kAI000 = 0;
+const ItemState kAI005 = 1;
+const ItemState kAI006 = 2;
+const ItemState kAI010 = 3;
+const ItemState kAI015 = 4;
+const ItemState kAI016 = 5;
+const ItemState kAI020 = 6;
+const ItemState kAI024 = 7;
+const ItemState kAI100 = 8;
+const ItemState kAI101 = 9;
+const ItemState kAI105 = 10;
+const ItemState kAI106 = 11;
+const ItemState kAI110 = 12;
+const ItemState kAI111 = 13;
+const ItemState kAI115 = 14;
+const ItemState kAI116 = 15;
+const ItemState kAI120 = 16;
+const ItemState kAI121 = 17;
+const ItemState kAI124 = 18;
+const ItemState kAI125 = 19;
+const ItemState kAI126 = 20;
+const ItemState kAI200 = 21;
+const ItemState kAI201 = 22;
+const ItemState kAI202 = 23;
+const ItemState kAI205 = 24;
+const ItemState kAI206 = 25;
+const ItemState kAI210 = 26;
+const ItemState kAI211 = 27;
+const ItemState kAI212 = 28;
+const ItemState kAI215 = 29;
+const ItemState kAI216 = 30;
+const ItemState kAI220 = 31;
+const ItemState kAI221 = 32;
+const ItemState kAI222 = 33;
+const ItemState kAI224 = 34;
+const ItemState kAI225 = 35;
+const ItemState kAI226 = 36;
+const ItemState kAI300 = 37;
+const ItemState kAI301 = 38;
+const ItemState kAI302 = 39;
+const ItemState kAI303 = 40;
+const ItemState kAI305 = 41;
+const ItemState kAI306 = 42;
+const ItemState kAI310 = 43;
+const ItemState kAI311 = 44;
+const ItemState kAI312 = 45;
+const ItemState kAI313 = 46;
+const ItemState kAI315 = 47;
+const ItemState kAI316 = 48;
+const ItemState kAI320 = 49;
+const ItemState kAI321 = 50;
+const ItemState kAI322 = 51;
+const ItemState kAI323 = 52;
+const ItemState kAI324 = 53;
+const ItemState kAI325 = 54;
+const ItemState kAI326 = 55;
+const ItemState kNormalItem = 56;
+const ItemState kMapUnavailable = 57;
+const ItemState kMapEngaged = 58;
+const ItemState kOptical000 = 59;
+const ItemState kOptical001 = 60;
+const ItemState kOptical002 = 61;
+const ItemState kOptical010 = 62;
+const ItemState kOptical011 = 63;
+const ItemState kOptical012 = 64;
+const ItemState kOptical020 = 65;
+const ItemState kOptical021 = 66;
+const ItemState kOptical100 = 67;
+const ItemState kOptical101 = 68;
+const ItemState kOptical102 = 69;
+const ItemState kOptical110 = 70;
+const ItemState kOptical111 = 71;
+const ItemState kOptical112 = 72;
+const ItemState kOptical120 = 73;
+const ItemState kOptical121 = 74;
+const ItemState kOptical200 = 75;
+const ItemState kOptical201 = 76;
+const ItemState kOptical210 = 77;
+const ItemState kOptical211 = 78;
+const ItemState kPegasusTSA00 = 79;
+const ItemState kPegasusTSA10 = 80;
+const ItemState kPegasusPrehistoric00 = 81;
+const ItemState kPegasusPrehistoric01 = 82;
+const ItemState kPegasusPrehistoric10 = 83;
+const ItemState kPegasusPrehistoric11 = 84;
+const ItemState kPegasusMars00 = 85;
+const ItemState kPegasusMars01 = 86;
+const ItemState kPegasusMars10 = 87;
+const ItemState kPegasusMars11 = 88;
+const ItemState kPegasusNorad00 = 89;
+const ItemState kPegasusNorad01 = 90;
+const ItemState kPegasusNorad10 = 91;
+const ItemState kPegasusNorad11 = 92;
+const ItemState kPegasusWSC00 = 93;
+const ItemState kPegasusWSC01 = 94;
+const ItemState kPegasusWSC10 = 95;
+const ItemState kPegasusWSC11 = 96;
+const ItemState kPegasusCaldoria = 97;
+const ItemState kRetinalSimulating = 98;
+const ItemState kShieldNormal = 99;
+const ItemState kShieldRadiation = 100;
+const ItemState kShieldPlasma = 101;
+const ItemState kShieldCardBomb = 102;
+const ItemState kShieldDraining = 103;
+const ItemState kAirMaskEmptyOff = 104;
+const ItemState kAirMaskEmptyFilter = 105;
+const ItemState kAirMaskLowOff = 106;
+const ItemState kAirMaskLowFilter = 107;
+const ItemState kAirMaskLowOn = 108;
+const ItemState kAirMaskFullOff = 109;
+const ItemState kAirMaskFullFilter = 110;
+const ItemState kAirMaskFullOn = 111;
+const ItemState kArgonEmpty = 112;
+const ItemState kArgonFull = 113;
+const ItemState kFlashlightOff = 114;
+const ItemState kFlashlightOn = 115;
+const ItemState kNitrogenEmpty = 116;
+const ItemState kNitrogenFull = 117;
+const ItemState kFullGlass = 118;
 
 //	Extra IDs.
 
@@ -269,7 +269,7 @@ const uint32 kRemoveGlass = 10;
 const uint32 kRemoveDart = 11;
 const uint32 kRemoveSinclairKey = 12;
 
-enum tItemType {
+enum ItemType {
 	kInventoryItemType,
 	kBiochipItemType
 };
@@ -289,7 +289,7 @@ class Sprite;
 
 class Item : public IDObject {
 public:
-	Item(const tItemID id, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction);
+	Item(const ItemID id, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction);
 	virtual ~Item();
 	
 	// WriteToStream writes everything EXCEPT the item's ID.
@@ -297,25 +297,25 @@ public:
 	virtual void writeToStream(Common::WriteStream *stream);
 	virtual void readFromStream(Common::ReadStream *stream);
 	
-	virtual tActorID getItemOwner() const;
-	virtual void setItemOwner(const tActorID owner);
+	virtual ActorID getItemOwner() const;
+	virtual void setItemOwner(const ActorID owner);
 	
-	void getItemRoom(tNeighborhoodID &neighborhood, tRoomID &room, tDirectionConstant &direction) const;
-	void setItemRoom(const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction);
-	tNeighborhoodID getItemNeighborhood() const;
+	void getItemRoom(NeighborhoodID &neighborhood, RoomID &room, DirectionConstant &direction) const;
+	void setItemRoom(const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction);
+	NeighborhoodID getItemNeighborhood() const;
 	
-	virtual tWeightType getItemWeight();
+	virtual WeightType getItemWeight();
 	
-	virtual void setItemState(const tItemState state);
-	virtual tItemState getItemState() const;
+	virtual void setItemState(const ItemState state);
+	virtual ItemState getItemState() const;
 
-	virtual tItemType getItemType() = 0;
+	virtual ItemType getItemType() = 0;
 	
 	TimeValue getInfoLeftTime() const;
 	void getInfoRightTimes(TimeValue &, TimeValue &) const;
 	TimeValue getSharedAreaTime() const;
 
-	Sprite *getDragSprite(const tDisplayElementID) const;
+	Sprite *getDragSprite(const DisplayElementID) const;
 	
 	/*
 		select		--	called when this item becomes current. Also called when the inventory
@@ -344,12 +344,12 @@ public:
 	void findItemExtra(const uint32 extraID, ItemExtraEntry &entry);
 
 protected:
-	tNeighborhoodID _itemNeighborhood;
-	tRoomID	_itemRoom;
-	tDirectionConstant _itemDirection;
-	tActorID _itemOwnerID;
-	tWeightType _itemWeight;
-	tItemState _itemState;
+	NeighborhoodID _itemNeighborhood;
+	RoomID	_itemRoom;
+	DirectionConstant _itemDirection;
+	ActorID _itemOwnerID;
+	WeightType _itemWeight;
+	ItemState _itemState;
 
 	JMPItemInfo _itemInfo;
 	ItemStateInfo _sharedAreaInfo;
@@ -357,8 +357,8 @@ protected:
 	bool _isActive;
 	bool _isSelected;
 
-	static void getItemStateEntry(ItemStateInfo, uint32, tItemState&, TimeValue&);
-	static void findItemStateEntryByState(ItemStateInfo, tItemState, TimeValue&);
+	static void getItemStateEntry(ItemStateInfo, uint32, ItemState &, TimeValue &);
+	static void findItemStateEntryByState(ItemStateInfo, ItemState, TimeValue &);
 	static ItemStateInfo readItemState(Common::SeekableReadStream *stream);
 };
 
diff --git a/engines/pegasus/items/itemlist.cpp b/engines/pegasus/items/itemlist.cpp
index cbe48285e9..4c30975589 100755
--- a/engines/pegasus/items/itemlist.cpp
+++ b/engines/pegasus/items/itemlist.cpp
@@ -53,12 +53,12 @@ void ItemList::readFromStream(Common::ReadStream *stream) {
 	uint32 itemCount = stream->readUint32BE();
 
 	for (uint32 i = 0; i < itemCount; i++) {
-		tItemID itemID = stream->readUint16BE();
+		ItemID itemID = stream->readUint16BE();
 		g_allItems.findItemByID(itemID)->readFromStream(stream);
 	}
 }
 
-Item *ItemList::findItemByID(const tItemID id) {
+Item *ItemList::findItemByID(const ItemID id) {
 	for (ItemIterator it = begin(); it != end(); it++)
 		if ((*it)->getObjectID() == id)
 			return *it;
diff --git a/engines/pegasus/items/itemlist.h b/engines/pegasus/items/itemlist.h
index df31b5c262..b5a1d489be 100755
--- a/engines/pegasus/items/itemlist.h
+++ b/engines/pegasus/items/itemlist.h
@@ -47,7 +47,7 @@ public:
 	virtual void writeToStream(Common::WriteStream *stream);
 	virtual void readFromStream(Common::ReadStream *stream);
 	
-	Item *findItemByID(const tItemID id);
+	Item *findItemByID(const ItemID id);
 };
 
 typedef ItemList::iterator ItemIterator;
diff --git a/engines/pegasus/menu.cpp b/engines/pegasus/menu.cpp
index 50a208e717..82bafbc033 100755
--- a/engines/pegasus/menu.cpp
+++ b/engines/pegasus/menu.cpp
@@ -43,8 +43,8 @@ void GameMenu::restorePreviousHandler() {
 	InputHandler::setInputHandler(_previousHandler);
 }
 
-void GameMenu::drawScore(tGameScoreType score, tGameScoreType total, const Common::Rect &scoreBounds, Surface *numbers) {
-	tCoordType x = scoreBounds.right;
+void GameMenu::drawScore(GameScoreType score, GameScoreType total, const Common::Rect &scoreBounds, Surface *numbers) {
+	CoordType x = scoreBounds.right;
 	drawNumber(total, x, scoreBounds.top, numbers);
 
 	x -= 12;
@@ -55,7 +55,7 @@ void GameMenu::drawScore(tGameScoreType score, tGameScoreType total, const Commo
 	drawNumber(score, x, scoreBounds.top, numbers);
 }
 
-void GameMenu::drawNumber(tGameScoreType number, tCoordType &x, tCoordType y, Surface *numbers) {
+void GameMenu::drawNumber(GameScoreType number, CoordType &x, CoordType y, Surface *numbers) {
 	Common::Rect r1(0, 0, 12, 12); // Width, height of one digit
 	Common::Rect r2 = r1;
 	r2.moveTo(x - 12, y);
@@ -88,59 +88,59 @@ enum {
 	kLastSelection = kMainMenuQuit
 };
 
-static const tCoordType kStartLeftDemo = 44;
-static const tCoordType kStartTopDemo = 336;
+static const CoordType kStartLeftDemo = 44;
+static const CoordType kStartTopDemo = 336;
 
-static const tCoordType kStartSelectLeftDemo = 40;
-static const tCoordType kStartSelectTopDemo = 331;
+static const CoordType kStartSelectLeftDemo = 40;
+static const CoordType kStartSelectTopDemo = 331;
 
-static const tCoordType kCreditsLeftDemo = 44;
-static const tCoordType kCreditsTopDemo = 372;
+static const CoordType kCreditsLeftDemo = 44;
+static const CoordType kCreditsTopDemo = 372;
 
-static const tCoordType kCreditsSelectLeftDemo = 40;
-static const tCoordType kCreditsSelectTopDemo = 367;
+static const CoordType kCreditsSelectLeftDemo = 40;
+static const CoordType kCreditsSelectTopDemo = 367;
 
-static const tCoordType kMainMenuQuitLeftDemo = 32;
-static const tCoordType kMainMenuQuitTopDemo = 412;
+static const CoordType kMainMenuQuitLeftDemo = 32;
+static const CoordType kMainMenuQuitTopDemo = 412;
 
-static const tCoordType kMainMenuQuitSelectLeftDemo = 28;
-static const tCoordType kMainMenuQuitSelectTopDemo = 408;
+static const CoordType kMainMenuQuitSelectLeftDemo = 28;
+static const CoordType kMainMenuQuitSelectTopDemo = 408;
 
-static const tCoordType kOverviewLeft = 200;
-static const tCoordType kOverviewTop = 208;
+static const CoordType kOverviewLeft = 200;
+static const CoordType kOverviewTop = 208;
 
-static const tCoordType kOverviewSelectLeft = 152;
-static const tCoordType kOverviewSelectTop = 204;
+static const CoordType kOverviewSelectLeft = 152;
+static const CoordType kOverviewSelectTop = 204;
 
-static const tCoordType kStartLeft = 212;
-static const tCoordType kStartTop = 256;
+static const CoordType kStartLeft = 212;
+static const CoordType kStartTop = 256;
 
-static const tCoordType kStartSelectLeft = 152;
-static const tCoordType kStartSelectTop = 252;
+static const CoordType kStartSelectLeft = 152;
+static const CoordType kStartSelectTop = 252;
 
-static const tCoordType kRestoreLeft = 212;
-static const tCoordType kRestoreTop = 296;
+static const CoordType kRestoreLeft = 212;
+static const CoordType kRestoreTop = 296;
 
-static const tCoordType kRestoreSelectLeft = 152;
-static const tCoordType kRestoreSelectTop = 292;
+static const CoordType kRestoreSelectLeft = 152;
+static const CoordType kRestoreSelectTop = 292;
 
-static const tCoordType kDifficultyLeft = 320;
-static const tCoordType kDifficultyTop = 340;
+static const CoordType kDifficultyLeft = 320;
+static const CoordType kDifficultyTop = 340;
 
-static const tCoordType kDifficultySelectLeft = 152;
-static const tCoordType kDifficultySelectTop = 336;
+static const CoordType kDifficultySelectLeft = 152;
+static const CoordType kDifficultySelectTop = 336;
 
-static const tCoordType kCreditsLeft = 212;
-static const tCoordType kCreditsTop = 388;
+static const CoordType kCreditsLeft = 212;
+static const CoordType kCreditsTop = 388;
 
-static const tCoordType kCreditsSelectLeft = 152;
-static const tCoordType kCreditsSelectTop = 384;
+static const CoordType kCreditsSelectLeft = 152;
+static const CoordType kCreditsSelectTop = 384;
 
-static const tCoordType kMainMenuQuitLeft = 212;
-static const tCoordType kMainMenuQuitTop = 428;
+static const CoordType kMainMenuQuitLeft = 212;
+static const CoordType kMainMenuQuitTop = 428;
 
-static const tCoordType kMainMenuQuitSelectLeft = 152;
-static const tCoordType kMainMenuQuitSelectTop = 424;
+static const CoordType kMainMenuQuitSelectLeft = 152;
+static const CoordType kMainMenuQuitSelectTop = 424;
 
 //	Never set the current input handler to the MainMenu.
 MainMenu::MainMenu() : GameMenu(kMainMenuID), _menuBackground(0), _overviewButton(0),
@@ -417,29 +417,29 @@ enum {
 	kCreditsLastSelection = kCreditsMenuMainMenu
 };
 
-static const tCoordType kCreditsMovieLeft = 288;
-static const tCoordType kCreditsMovieTop = 0;
+static const CoordType kCreditsMovieLeft = 288;
+static const CoordType kCreditsMovieTop = 0;
 
-static const tCoordType kCoreTeamSelectLeft = 40;
-static const tCoordType kCoreTeamSelectTop = 223;
+static const CoordType kCoreTeamSelectLeft = 40;
+static const CoordType kCoreTeamSelectTop = 223;
 
-static const tCoordType kSupportTeamSelectLeft = 40;
-static const tCoordType kSupportTeamSelectTop = 259;
+static const CoordType kSupportTeamSelectLeft = 40;
+static const CoordType kSupportTeamSelectTop = 259;
 
-static const tCoordType kOriginalTeamSelectLeft = 40;
-static const tCoordType kOriginalTeamSelectTop = 295;
+static const CoordType kOriginalTeamSelectLeft = 40;
+static const CoordType kOriginalTeamSelectTop = 295;
 
-static const tCoordType kTalentSelectLeft = 40;
-static const tCoordType kTalentSelectTop = 331;
+static const CoordType kTalentSelectLeft = 40;
+static const CoordType kTalentSelectTop = 331;
 
-static const tCoordType kOtherTitlesSelectLeft = 40;
-static const tCoordType kOtherTitlesSelectTop = 367;
+static const CoordType kOtherTitlesSelectLeft = 40;
+static const CoordType kOtherTitlesSelectTop = 367;
 
-static const tCoordType kCreditsMainMenuLeft = 32;
-static const tCoordType kCreditsMainMenuTop = 412;
+static const CoordType kCreditsMainMenuLeft = 32;
+static const CoordType kCreditsMainMenuTop = 412;
 
-static const tCoordType kCreditsMainMenuSelectLeft = 30;
-static const tCoordType kCreditsMainMenuSelectTop = 408;
+static const CoordType kCreditsMainMenuSelectLeft = 30;
+static const CoordType kCreditsMainMenuSelectTop = 408;
 
 static const TimeValue kCoreTeamTime = 0;
 static const TimeValue kSupportTeamTime = 1920;
@@ -578,36 +578,36 @@ void CreditsMenu::handleInput(const Input &input, const Hotspot *cursorSpot) {
 	InputHandler::handleInput(input, cursorSpot);
 }
 
-static const tCoordType kContinueLeft = 44;
-static const tCoordType kContinueTop = 336;
+static const CoordType kContinueLeft = 44;
+static const CoordType kContinueTop = 336;
 
-static const tCoordType kContinueSelectLeft = 40;
-static const tCoordType kContinueSelectTopDemo = 331;
-static const tCoordType kContinueSelectTop = 332;
+static const CoordType kContinueSelectLeft = 40;
+static const CoordType kContinueSelectTopDemo = 331;
+static const CoordType kContinueSelectTop = 332;
 
-static const tCoordType kMainMenuLeftDemo = 44;
-static const tCoordType kMainMenuTopDemo = 372;
+static const CoordType kMainMenuLeftDemo = 44;
+static const CoordType kMainMenuTopDemo = 372;
 
-static const tCoordType kMainMenuSelectLeftDemo = 40;
-static const tCoordType kMainMenuSelectTopDemo = 367;
+static const CoordType kMainMenuSelectLeftDemo = 40;
+static const CoordType kMainMenuSelectTopDemo = 367;
 
-static const tCoordType kQuitLeftDemo = 32;
-static const tCoordType kQuitTopDemo = 412;
+static const CoordType kQuitLeftDemo = 32;
+static const CoordType kQuitTopDemo = 412;
 
-static const tCoordType kQuitSelectLeftDemo = 28;
-static const tCoordType kQuitSelectTopDemo = 408;
+static const CoordType kQuitSelectLeftDemo = 28;
+static const CoordType kQuitSelectTopDemo = 408;
 
-static const tCoordType kRestoreLeftDeath = 44;
-static const tCoordType kRestoreTopDeath = 372;
+static const CoordType kRestoreLeftDeath = 44;
+static const CoordType kRestoreTopDeath = 372;
 
-static const tCoordType kRestoreSelectLeftDeath = 40;
-static const tCoordType kRestoreSelectTopDeath = 368;
+static const CoordType kRestoreSelectLeftDeath = 40;
+static const CoordType kRestoreSelectTopDeath = 368;
 
-static const tCoordType kMainMenuLeft = 32;
-static const tCoordType kMainMenuTop = 412;
+static const CoordType kMainMenuLeft = 32;
+static const CoordType kMainMenuTop = 412;
 
-static const tCoordType kMainMenuSelectLeft = 28;
-static const tCoordType kMainMenuSelectTop = 408;
+static const CoordType kMainMenuSelectLeft = 28;
+static const CoordType kMainMenuSelectTop = 408;
 
 enum {
 	kDeathScreenContinueDemo = 0,
@@ -626,7 +626,7 @@ enum {
 };
 
 // Never set the current input handler to the DeathMenu.
-DeathMenu::DeathMenu(const tDeathReason deathReason) : GameMenu(kDeathMenuID), _deathBackground(0), _continueButton(0),
+DeathMenu::DeathMenu(const DeathReason deathReason) : GameMenu(kDeathMenuID), _deathBackground(0), _continueButton(0),
 		_mainMenuButton(0), _quitButton(0), _restoreButton(0), _largeSelect(0), _smallSelect(0) {
 	PegasusEngine *vm = (PegasusEngine *)g_engine;
 	bool isDemo = vm->isDemo();
@@ -848,7 +848,7 @@ void DeathMenu::drawAllScores() {
 	numbers.getImageFromPICTFile("Images/Death Screens/Numbers.pict");
 
 	Common::Rect scoreBounds;
-	tGameScoreType caldoriaTotal = 0;
+	GameScoreType caldoriaTotal = 0;
 
 	switch (_deathReason) {
 	case kDeathCardBomb:
@@ -930,60 +930,60 @@ enum {
 	kLastPauseSelection = kPauseMenuQuitToMainMenu
 };
 
-const tCoordType kPauseLeft = 194;
-const tCoordType kPauseTop = 68;
+const CoordType kPauseLeft = 194;
+const CoordType kPauseTop = 68;
 
-const tCoordType kSaveGameLeft = kPauseLeft + 6;
-const tCoordType kSaveGameTop = kPauseTop + 56;
+const CoordType kSaveGameLeft = kPauseLeft + 6;
+const CoordType kSaveGameTop = kPauseTop + 56;
 
-const tCoordType kSaveGameSelectLeft = kPauseLeft - 44;
-const tCoordType kSaveGameSelectTop = kPauseTop + 52;
+const CoordType kSaveGameSelectLeft = kPauseLeft - 44;
+const CoordType kSaveGameSelectTop = kPauseTop + 52;
 
-const tCoordType kPauseContinueLeft = kPauseLeft + 18;
-const tCoordType kPauseContinueTop = kPauseTop + 100;
+const CoordType kPauseContinueLeft = kPauseLeft + 18;
+const CoordType kPauseContinueTop = kPauseTop + 100;
 
-const tCoordType kPauseContinueSelectLeft = kPauseLeft - 44;
-const tCoordType kPauseContinueSelectTop = kPauseTop + 95;
+const CoordType kPauseContinueSelectLeft = kPauseLeft - 44;
+const CoordType kPauseContinueSelectTop = kPauseTop + 95;
 
-const tCoordType kPauseRestoreLeft = kPauseLeft + 18;
-const tCoordType kPauseRestoreTop = kPauseTop + 136;
+const CoordType kPauseRestoreLeft = kPauseLeft + 18;
+const CoordType kPauseRestoreTop = kPauseTop + 136;
 
-const tCoordType kPauseRestoreSelectLeft = kPauseLeft - 44;
-const tCoordType kPauseRestoreSelectTop = kPauseTop + 131;
+const CoordType kPauseRestoreSelectLeft = kPauseLeft - 44;
+const CoordType kPauseRestoreSelectTop = kPauseTop + 131;
 
-const tCoordType kSoundFXLeft = kPauseLeft + 128;
-const tCoordType kSoundFXTop = kPauseTop + 187;
-const tCoordType kSoundFXRight = kSoundFXLeft + 96;
-const tCoordType kSoundFXBottom = kSoundFXTop + 14;
+const CoordType kSoundFXLeft = kPauseLeft + 128;
+const CoordType kSoundFXTop = kPauseTop + 187;
+const CoordType kSoundFXRight = kSoundFXLeft + 96;
+const CoordType kSoundFXBottom = kSoundFXTop + 14;
 
-const tCoordType kSoundFXSelectLeft = kPauseLeft - 44;
-const tCoordType kSoundFXSelectTop = kPauseTop + 172;
+const CoordType kSoundFXSelectLeft = kPauseLeft - 44;
+const CoordType kSoundFXSelectTop = kPauseTop + 172;
 
-const tCoordType kAmbienceLeft = kPauseLeft + 128;
-const tCoordType kAmbienceTop = kPauseTop + 227;
-const tCoordType kAmbienceRight = kAmbienceLeft + 96;
-const tCoordType kAmbienceBottom = kAmbienceTop + 14;
+const CoordType kAmbienceLeft = kPauseLeft + 128;
+const CoordType kAmbienceTop = kPauseTop + 227;
+const CoordType kAmbienceRight = kAmbienceLeft + 96;
+const CoordType kAmbienceBottom = kAmbienceTop + 14;
 
-const tCoordType kAmbienceSelectLeft = kPauseLeft - 44;
-const tCoordType kAmbienceSelectTop = kPauseTop + 212;
+const CoordType kAmbienceSelectLeft = kPauseLeft - 44;
+const CoordType kAmbienceSelectTop = kPauseTop + 212;
 
-const tCoordType kWalkthruLeft = kPauseLeft + 128;
-const tCoordType kWalkthruTop = kPauseTop + 264;
+const CoordType kWalkthruLeft = kPauseLeft + 128;
+const CoordType kWalkthruTop = kPauseTop + 264;
 
-const tCoordType kWalkthruSelectLeft = kPauseLeft - 44;
-const tCoordType kWalkthruSelectTop = kPauseTop + 255;
+const CoordType kWalkthruSelectLeft = kPauseLeft - 44;
+const CoordType kWalkthruSelectTop = kPauseTop + 255;
 
-const tCoordType kQuitLeft = kPauseLeft + 18;
-const tCoordType kQuitTop = kPauseTop + 302;
+const CoordType kQuitLeft = kPauseLeft + 18;
+const CoordType kQuitTop = kPauseTop + 302;
 
-const tCoordType kQuitSelectLeft = kPauseLeft - 44;
-const tCoordType kQuitSelectTop = kPauseTop + 297;
+const CoordType kQuitSelectLeft = kPauseLeft - 44;
+const CoordType kQuitSelectTop = kPauseTop + 297;
 
 //	These are relative to the pause background.
-const tCoordType kPauseScoreLeft = 130;
-const tCoordType kPauseScoreTop = 34;
-const tCoordType kPauseScoreRight = kPauseScoreLeft + 108;
-const tCoordType kPauseScoreBottom = kPauseScoreTop + 12;
+const CoordType kPauseScoreLeft = 130;
+const CoordType kPauseScoreTop = 34;
+const CoordType kPauseScoreRight = kPauseScoreLeft + 108;
+const CoordType kPauseScoreBottom = kPauseScoreTop + 12;
 
 // Never set the current input handler to the CPauseMenu.
 PauseMenu::PauseMenu() : GameMenu(kPauseMenuID), _pauseBackground(0), _saveButton(0), _restoreButton(0),
diff --git a/engines/pegasus/menu.h b/engines/pegasus/menu.h
index 741662336d..8b0169adaa 100755
--- a/engines/pegasus/menu.h
+++ b/engines/pegasus/menu.h
@@ -44,19 +44,19 @@ public:
 	virtual void becomeCurrentHandler();
 	virtual void restorePreviousHandler();
 	
-	tGameMenuCommand getLastCommand() { return _lastCommand; }
+	GameMenuCommand getLastCommand() { return _lastCommand; }
 	void clearLastCommand() { _lastCommand = kMenuCmdNoCommand; }
 
 protected:
-	void setLastCommand(const tGameMenuCommand command) { _lastCommand = command; }
+	void setLastCommand(const GameMenuCommand command) { _lastCommand = command; }
 
 	InputHandler *_previousHandler;
-	tGameMenuCommand _lastCommand;
+	GameMenuCommand _lastCommand;
 
-	void drawScore(tGameScoreType, tGameScoreType, const Common::Rect &, Surface *);
+	void drawScore(GameScoreType, GameScoreType, const Common::Rect &, Surface *);
 
 private:
-	void drawNumber(tGameScoreType, tCoordType &, tCoordType, Surface *);
+	void drawNumber(GameScoreType, CoordType &, CoordType, Surface *);
 };
 
 class Hotspot;
@@ -115,7 +115,7 @@ protected:
 
 class DeathMenu : public GameMenu {
 public:
-	DeathMenu(const tDeathReason);
+	DeathMenu(const DeathReason);
 	virtual ~DeathMenu() {}
 
 	virtual void handleInput(const Input &input, const Hotspot *);
@@ -129,7 +129,7 @@ protected:
 
 	bool _playerWon;
 	int _menuSelection;
-	tDeathReason _deathReason;
+	DeathReason _deathReason;
 
 	Picture _deathBackground;
 	Picture _continueButton;
diff --git a/engines/pegasus/movie.cpp b/engines/pegasus/movie.cpp
index 8d6f0fab51..14e6f25c39 100755
--- a/engines/pegasus/movie.cpp
+++ b/engines/pegasus/movie.cpp
@@ -32,7 +32,7 @@
 
 namespace Pegasus {
 
-Movie::Movie(const tDisplayElementID id) : Animation(id) {
+Movie::Movie(const DisplayElementID id) : Animation(id) {
 	_video = 0;
 	setScale(600);
 }
@@ -117,7 +117,7 @@ void Movie::draw(const Common::Rect &r) {
 	drawImage(r2, r1);
 }
 
-void Movie::moveMovieBoxTo(const tCoordType h, const tCoordType v) {
+void Movie::moveMovieBoxTo(const CoordType h, const CoordType v) {
 	_movieBox.moveTo(h, v);
 }
 
@@ -203,7 +203,7 @@ void Movie::updateTime() {
 	}
 }
 
-GlowingMovie::GlowingMovie(const tDisplayElementID id) : Movie(id) {
+GlowingMovie::GlowingMovie(const DisplayElementID id) : Movie(id) {
 	_glowing = false;
 }
 
@@ -231,7 +231,7 @@ void GlowingMovie::setBounds(const Common::Rect &r) {
 	}
 }
 
-ScalingMovie::ScalingMovie(const tDisplayElementID id) : GlowingMovie(id) {
+ScalingMovie::ScalingMovie(const DisplayElementID id) : GlowingMovie(id) {
 }
 
 void ScalingMovie::draw(const Common::Rect &) {
diff --git a/engines/pegasus/movie.h b/engines/pegasus/movie.h
index db7b640ba8..593442fa44 100755
--- a/engines/pegasus/movie.h
+++ b/engines/pegasus/movie.h
@@ -39,7 +39,7 @@ namespace Pegasus {
 
 class Movie : public Animation, public PixelImage {
 public:
-	Movie(const tDisplayElementID);
+	Movie(const DisplayElementID);
 	virtual ~Movie();
 
 	virtual void initFromMovieFile(const Common::String &fileName, bool transparent = false);
@@ -60,7 +60,7 @@ public:
 	virtual void resume();
 	virtual void pause();
 
-	virtual void moveMovieBoxTo(const tCoordType, const tCoordType);
+	virtual void moveMovieBoxTo(const CoordType, const CoordType);
 
 	virtual TimeValue getDuration(const TimeScale = 0) const;
 
@@ -77,7 +77,7 @@ protected:
 
 class GlowingMovie : public Movie {
 public:
-	GlowingMovie(tDisplayElementID);
+	GlowingMovie(DisplayElementID);
 	virtual ~GlowingMovie() {}
 
 	virtual void draw(const Common::Rect &);
@@ -92,7 +92,7 @@ protected:
 
 class ScalingMovie : public GlowingMovie {
 public:
-	ScalingMovie(tDisplayElementID);
+	ScalingMovie(DisplayElementID);
 	virtual ~ScalingMovie() {}
 
 	virtual void draw(const Common::Rect &);
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.cpp b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
index 878b0c3d86..6f512fa8aa 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.cpp
@@ -53,8 +53,8 @@ const TimeValue kSinclairInterruptionTime2 = 6835;
 const TimeValue kSinclairInterruptionTime3 = 9835;
 const TimeValue kSinclairInterruptionTime4 = 12555;
 
-const tInputBits kPullbackInterruptFilter = kFilterAllInput;
-const tInputBits kRecalibrationInterruptFilter = kFilterAllInput;
+const InputBits kPullbackInterruptFilter = kFilterAllInput;
+const InputBits kRecalibrationInterruptFilter = kFilterAllInput;
 
 const TimeValue kCaldoriaReplicatorIntroIn = 4933;
 const TimeValue kCaldoriaReplicatorIntroOut = 6557;
@@ -146,9 +146,9 @@ const TimeValue k5To2Time = 41240;
 
 const TimeValue k5To3Time = 41280;
 
-//	MMFuseFunction functions...
+//	FuseFunction functions...
 
-const tNotificationFlags kSinclairLoopDoneFlag = kLastNeighborhoodNotificationFlag << 1;
+const NotificationFlags kSinclairLoopDoneFlag = kLastNeighborhoodNotificationFlag << 1;
 
 void doorBombTimerExpiredFunction(FunctionPtr *, void *caldoria) {
 	((Caldoria *)caldoria)->doorBombTimerExpired();
@@ -341,7 +341,7 @@ uint16 Caldoria::getDateResID() const {
 	return kDate2318ID;
 }
 
-TimeValue Caldoria::getViewTime(const tRoomID room, const tDirectionConstant direction) {
+TimeValue Caldoria::getViewTime(const RoomID room, const DirectionConstant direction) {
 	ExtraTable::Entry extra;	
 	uint32 extraID = 0xffffffff;
 
@@ -444,7 +444,7 @@ void Caldoria::startSpotOnceOnly(TimeValue startTime, TimeValue stopTime) {
 	}
 }
 
-void Caldoria::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &entry) {	
+void Caldoria::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &entry) {	
 	Neighborhood::findSpotEntry(room, direction, flags, entry);
 
 	switch (room) {
@@ -506,7 +506,7 @@ void Caldoria::startDoorOpenMovie(const TimeValue startTime, const TimeValue sto
 		Neighborhood::startDoorOpenMovie(startTime, stopTime);
 }
 
-void Caldoria::startTurnPush(const tTurnDirection turnDirection, const TimeValue newViewTime, const tDirectionConstant destDirection) {
+void Caldoria::startTurnPush(const TurnDirection turnDirection, const TimeValue newViewTime, const DirectionConstant destDirection) {
 	switch (GameState.getCurrentRoom()) {
 	case kCaldoria05:
 	case kCaldoria07:
@@ -540,7 +540,7 @@ void Caldoria::bumpIntoWall() {
 	Neighborhood::bumpIntoWall();
 }
 
-void Caldoria::closeDoorOffScreen(const tRoomID room, const tDirectionConstant direction) {
+void Caldoria::closeDoorOffScreen(const RoomID room, const DirectionConstant direction) {
 	switch (room) {
 	case kCaldoria08:
 		if (direction == kNorth)
@@ -570,7 +570,7 @@ void Caldoria::closeDoorOffScreen(const tRoomID room, const tDirectionConstant d
 	}
 }
 
-int16 Caldoria::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) {
+int16 Caldoria::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) {
 	int16 result = Neighborhood::getStaticCompassAngle(room, dir);
 
 	switch (room) {
@@ -668,7 +668,7 @@ void Caldoria::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSpec
 }
 
 void Caldoria::loadAmbientLoops() {
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 
 	if (room == kCaldoria00 && GameState.getCaldoriaWokenUp())
 		loadLoopSound1("Sounds/Caldoria/Apartment Music.AIFF", 0x100 / 4);
@@ -684,7 +684,7 @@ void Caldoria::loadAmbientLoops() {
 		loadLoopSound1("Sounds/Caldoria/A50NLB00.22K.AIFF", 0x100 / 4);
 }
 
-void Caldoria::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) {
+void Caldoria::checkContinuePoint(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kCaldoria06, kSouth):
 	case MakeRoomView(kCaldoria13, kNorth):
@@ -706,7 +706,7 @@ void Caldoria::spotCompleted() {
 		startExtraSequence(kBinocularsZoomInOnShip, kExtraCompletedFlag, kFilterNoInput);
 }
 
-void Caldoria::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void Caldoria::arriveAt(const RoomID room, const DirectionConstant direction) {
 	switch (room) {
 	case kCaldoria56:
 		if (!GameState.getCaldoriaGunAimed())
@@ -981,7 +981,7 @@ void Caldoria::downButton(const Input &input) {
 	}
 }
 
-void Caldoria::turnTo(const tDirectionConstant direction) {
+void Caldoria::turnTo(const DirectionConstant direction) {
 	Neighborhood::turnTo(direction);
 
 	switch (GameState.getCurrentRoom()) {
@@ -1106,7 +1106,7 @@ void Caldoria::zoomToSinclair() {
 	startExtraSequence(kCa53EastZoomToSinclair, kExtraCompletedFlag, kFilterAllInput);
 }
 
-void Caldoria::receiveNotification(Notification *notification, const tNotificationFlags flags) {	
+void Caldoria::receiveNotification(Notification *notification, const NotificationFlags flags) {	
 	Neighborhood::receiveNotification(notification, flags);
 
 	if ((flags & kExtraCompletedFlag) != 0) {
@@ -1255,8 +1255,8 @@ void Caldoria::receiveNotification(Notification *notification, const tNotificati
 	g_AIArea->checkMiddleArea();
 }
 
-tInputBits Caldoria::getInputFilter() {
-	tInputBits result = Neighborhood::getInputFilter();
+InputBits Caldoria::getInputFilter() {
+	InputBits result = Neighborhood::getInputFilter();
 
 	switch (GameState.getCurrentRoom()) {
 	case kCaldoria00:
@@ -1471,7 +1471,7 @@ void Caldoria::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void Caldoria::clickOnDoorbell(const tHotSpotID doorBellSpotID) {
+void Caldoria::clickOnDoorbell(const HotSpotID doorBellSpotID) {
 	uint32 extra;
 	ExtraTable::Entry entry;
 
@@ -1501,7 +1501,7 @@ void Caldoria::clickOnDoorbell(const tHotSpotID doorBellSpotID) {
 	requestSpotSound(kCaldoriaNobodyHomeIn, kCaldoriaNobodyHomeOut, kFilterNoInput, kSpotSoundCompletedFlag);
 }
 
-tCanOpenDoorReason Caldoria::canOpenDoor(DoorTable::Entry &entry) {
+CanOpenDoorReason Caldoria::canOpenDoor(DoorTable::Entry &entry) {
 	switch (GameState.getCurrentRoom()) {
 	case kCaldoria16:
 	case kCaldoria38:
@@ -1519,7 +1519,7 @@ void Caldoria::doorOpened() {
 	_privateFlags.setFlag(kCaldoriaPrivateCanOpenElevatorDoorFlag, false);
 }
 
-GameInteraction *Caldoria::makeInteraction(const tInteractionID interactionID) {
+GameInteraction *Caldoria::makeInteraction(const InteractionID interactionID) {
 	switch (interactionID) {
 	case kCaldoria4DInteractionID:
 		return new Caldoria4DSystem(this);
@@ -1534,7 +1534,7 @@ GameInteraction *Caldoria::makeInteraction(const tInteractionID interactionID) {
 	return 0;
 }
 
-void Caldoria::newInteraction(const tInteractionID interactionID) {
+void Caldoria::newInteraction(const InteractionID interactionID) {
 	Neighborhood::newInteraction(interactionID);
 
 	if (!_currentInteraction) {
@@ -1552,7 +1552,7 @@ void Caldoria::newInteraction(const tInteractionID interactionID) {
 //	the inventory is too full or because the player lets go of the item before
 //	dropping it into the inventory).
 Hotspot *Caldoria::getItemScreenSpot(Item *item, DisplayElement *element) {
-	tHotSpotID destSpotID = kNoHotSpotID;
+	HotSpotID destSpotID = kNoHotSpotID;
 	
 	switch (item->getObjectID()) {
 	case kKeyCard:
@@ -1853,7 +1853,7 @@ Common::String Caldoria::getEnvScanMovie() {
 	Common::String movieName = Neighborhood::getEnvScanMovie();
 
 	if (movieName.empty()) {
-		tRoomID room = GameState.getCurrentRoom();
+		RoomID room = GameState.getCurrentRoom();
 
 		if (room >= kCaldoria00 && room <= kCaldoria14) {
 			// Inside apartment.
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria.h b/engines/pegasus/neighborhood/caldoria/caldoria.h
index 538eaafc01..c1e2a2c29d 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoria.h
@@ -36,352 +36,352 @@ const TimeScale kCaldoriaFrameDuration = 40;
 
 //	Alternate IDs.
 
-const tAlternateID kAltCaldoriaNormal = 0;
-const tAlternateID kAltCaldoriaRoofDoorBlown = 2;
-const tAlternateID kAltCaldoriaSinclairDown = 3;
+const AlternateID kAltCaldoriaNormal = 0;
+const AlternateID kAltCaldoriaRoofDoorBlown = 2;
+const AlternateID kAltCaldoriaSinclairDown = 3;
 
 //	Room IDs.
 
-const tRoomID kCaldoria00 = 1;
-const tRoomID kCaldoria01 = 2;
-const tRoomID kCaldoria02 = 3;
-const tRoomID kCaldoria03 = 4;
-const tRoomID kCaldoria04 = 5;
-const tRoomID kCaldoria05 = 6;
-const tRoomID kCaldoria06 = 7;
-const tRoomID kCaldoria07 = 8;
-const tRoomID kCaldoria08 = 9;
-const tRoomID kCaldoria09 = 10;
-const tRoomID kCaldoria10 = 11;
-const tRoomID kCaldoriaToilet = 12;
-const tRoomID kCaldoria11 = 13;
-const tRoomID kCaldoria12 = 14;
-const tRoomID kCaldoriaVidPhone = 15;
-const tRoomID kCaldoriaReplicator = 16;
-const tRoomID kCaldoriaDrawers = 17;
-const tRoomID kCaldoria13 = 18;
-const tRoomID kCaldoria14 = 19;
-const tRoomID kCaldoria15 = 20;
-const tRoomID kCaldoria16 = 21;
-const tRoomID kCaldoria17 = 22;
-const tRoomID kCaldoria18 = 23;
-const tRoomID kCaldoria19 = 24;
-const tRoomID kCaldoria20 = 25;
-const tRoomID kCaldoria21 = 26;
-const tRoomID kCaldoria22 = 27;
-const tRoomID kCaldoria23 = 28;
-const tRoomID kCaldoria24 = 29;
-const tRoomID kCaldoria25 = 30;
-const tRoomID kCaldoria26 = 31;
-const tRoomID kCaldoria27 = 32;
-const tRoomID kCaldoria28 = 33;
-const tRoomID kCaldoria29 = 34;
-const tRoomID kCaldoria30 = 35;
-const tRoomID kCaldoria31 = 36;
-const tRoomID kCaldoria32 = 37;
-const tRoomID kCaldoria33 = 38;
-const tRoomID kCaldoria34 = 39;
-const tRoomID kCaldoria35 = 40;
-const tRoomID kCaldoria36 = 41;
-const tRoomID kCaldoria37 = 42;
-const tRoomID kCaldoria38 = 43;
-const tRoomID kCaldoria39 = 44;
-const tRoomID kCaldoria40 = 45;
-const tRoomID kCaldoria41 = 46;
-const tRoomID kCaldoriaBinoculars = 47;
-const tRoomID kCaldoria42 = 48;
-const tRoomID kCaldoriaKiosk = 49;
-const tRoomID kCaldoria44 = 50;
-const tRoomID kCaldoria45 = 51;
-const tRoomID kCaldoria46 = 52;
-const tRoomID kCaldoria47 = 53;
-const tRoomID kCaldoria48 = 54;
-const tRoomID kCaldoria49 = 55;
-const tRoomID kCaldoria50 = 56;
-const tRoomID kCaldoria51 = 57;
-const tRoomID kCaldoria52 = 58;
-const tRoomID kCaldoria53 = 59;
-const tRoomID kCaldoria54 = 60;
-const tRoomID kCaldoria55 = 61;
-const tRoomID kCaldoria56 = 62;
-const tRoomID kCaldoriaDeathRoom = 0;
+const RoomID kCaldoria00 = 1;
+const RoomID kCaldoria01 = 2;
+const RoomID kCaldoria02 = 3;
+const RoomID kCaldoria03 = 4;
+const RoomID kCaldoria04 = 5;
+const RoomID kCaldoria05 = 6;
+const RoomID kCaldoria06 = 7;
+const RoomID kCaldoria07 = 8;
+const RoomID kCaldoria08 = 9;
+const RoomID kCaldoria09 = 10;
+const RoomID kCaldoria10 = 11;
+const RoomID kCaldoriaToilet = 12;
+const RoomID kCaldoria11 = 13;
+const RoomID kCaldoria12 = 14;
+const RoomID kCaldoriaVidPhone = 15;
+const RoomID kCaldoriaReplicator = 16;
+const RoomID kCaldoriaDrawers = 17;
+const RoomID kCaldoria13 = 18;
+const RoomID kCaldoria14 = 19;
+const RoomID kCaldoria15 = 20;
+const RoomID kCaldoria16 = 21;
+const RoomID kCaldoria17 = 22;
+const RoomID kCaldoria18 = 23;
+const RoomID kCaldoria19 = 24;
+const RoomID kCaldoria20 = 25;
+const RoomID kCaldoria21 = 26;
+const RoomID kCaldoria22 = 27;
+const RoomID kCaldoria23 = 28;
+const RoomID kCaldoria24 = 29;
+const RoomID kCaldoria25 = 30;
+const RoomID kCaldoria26 = 31;
+const RoomID kCaldoria27 = 32;
+const RoomID kCaldoria28 = 33;
+const RoomID kCaldoria29 = 34;
+const RoomID kCaldoria30 = 35;
+const RoomID kCaldoria31 = 36;
+const RoomID kCaldoria32 = 37;
+const RoomID kCaldoria33 = 38;
+const RoomID kCaldoria34 = 39;
+const RoomID kCaldoria35 = 40;
+const RoomID kCaldoria36 = 41;
+const RoomID kCaldoria37 = 42;
+const RoomID kCaldoria38 = 43;
+const RoomID kCaldoria39 = 44;
+const RoomID kCaldoria40 = 45;
+const RoomID kCaldoria41 = 46;
+const RoomID kCaldoriaBinoculars = 47;
+const RoomID kCaldoria42 = 48;
+const RoomID kCaldoriaKiosk = 49;
+const RoomID kCaldoria44 = 50;
+const RoomID kCaldoria45 = 51;
+const RoomID kCaldoria46 = 52;
+const RoomID kCaldoria47 = 53;
+const RoomID kCaldoria48 = 54;
+const RoomID kCaldoria49 = 55;
+const RoomID kCaldoria50 = 56;
+const RoomID kCaldoria51 = 57;
+const RoomID kCaldoria52 = 58;
+const RoomID kCaldoria53 = 59;
+const RoomID kCaldoria54 = 60;
+const RoomID kCaldoria55 = 61;
+const RoomID kCaldoria56 = 62;
+const RoomID kCaldoriaDeathRoom = 0;
 
 //	Hot Spot Activation IDs.
 
-const tHotSpotActivationID kActivate4DClosed = 1;
-const tHotSpotActivationID kActivate4DOpen = 2;
-const tHotSpotActivationID kActivateMirrorReady = 3;
-const tHotSpotActivationID kActivateStylistReady = 4;
-const tHotSpotActivationID kActivateReplicatorReady = 5;
-const tHotSpotActivationID kActivateOJOnThePad = 6;
-const tHotSpotActivationID kActivateDrawersClosed = 7;
-const tHotSpotActivationID kActivateRightOpen = 8;
-const tHotSpotActivationID kActivateLeftOpen = 9;
-const tHotSpotActivationID kActivateFocusedOnShip = 10;
-const tHotSpotActivationID kActivateNotFocusedOnShip = 11;
-const tHotSpotActivationID kActivateReadyForCard = 12;
-const tHotSpotActivationID kActivateReadyToTransport = 13;
-const tHotSpotActivationID kActivateRoofSlotEmpty = 14;
-const tHotSpotActivationID kActivateZoomedOnSinclair = 15;
+const HotSpotActivationID kActivate4DClosed = 1;
+const HotSpotActivationID kActivate4DOpen = 2;
+const HotSpotActivationID kActivateMirrorReady = 3;
+const HotSpotActivationID kActivateStylistReady = 4;
+const HotSpotActivationID kActivateReplicatorReady = 5;
+const HotSpotActivationID kActivateOJOnThePad = 6;
+const HotSpotActivationID kActivateDrawersClosed = 7;
+const HotSpotActivationID kActivateRightOpen = 8;
+const HotSpotActivationID kActivateLeftOpen = 9;
+const HotSpotActivationID kActivateFocusedOnShip = 10;
+const HotSpotActivationID kActivateNotFocusedOnShip = 11;
+const HotSpotActivationID kActivateReadyForCard = 12;
+const HotSpotActivationID kActivateReadyToTransport = 13;
+const HotSpotActivationID kActivateRoofSlotEmpty = 14;
+const HotSpotActivationID kActivateZoomedOnSinclair = 15;
 
 //	Hot Spot IDs.
 
-const tHotSpotID kCa4DEnvironOpenSpotID = 5000;
-const tHotSpotID kCa4DEnvironCloseSpotID = 5001;
-const tHotSpotID kCa4DVisualSpotID = 5002;
-const tHotSpotID kCa4DAudioSpotID = 5003;
-const tHotSpotID kCa4DChoice1SpotID = 5004;
-const tHotSpotID kCa4DChoice2SpotID = 5005;
-const tHotSpotID kCa4DChoice3SpotID = 5006;
-const tHotSpotID kCa4DChoice4SpotID = 5007;
-const tHotSpotID kCaBathroomMirrorSpotID = 5008;
-const tHotSpotID kCaHairStyle1SpotID = 5009;
-const tHotSpotID kCaHairStyle2SpotID = 5010;
-const tHotSpotID kCaHairStyle3SpotID = 5011;
-const tHotSpotID kCaShowerSpotID = 5012;
-const tHotSpotID kCaBathroomToiletSpotID = 5013;
-const tHotSpotID kCaldoriaVidPhoneSpotID = 5014;
-const tHotSpotID kCaldoriaReplicatorSpotID = 5015;
-const tHotSpotID kCaldoriaDrawersSpotID = 5016;
-const tHotSpotID kCaldoriaVidPhoneOutSpotID = 5017;
-const tHotSpotID kCaBedroomVidPhoneActivationSpotID = 5018;
-const tHotSpotID kCaldoriaReplicatorOutSpotID = 5019;
-const tHotSpotID kCaldoriaMakeOJSpotID = 5020;
-const tHotSpotID kCaldoriaMakeStickyBunsSpotID = 5021;
-const tHotSpotID kCaldoriaOrangeJuiceSpotID = 5022;
-const tHotSpotID kCaldoriaOrangeJuiceDropSpotID = 5023;
-const tHotSpotID kCaldoriaDrawersOutSpotID = 5024;
-const tHotSpotID kCaldoriaLeftDrawerOpenSpotID = 5025;
-const tHotSpotID kCaldoriaRightDrawerOpenSpotID = 5026;
-const tHotSpotID kCaldoriaKeyCardSpotID = 5027;
-const tHotSpotID kCaldoriaLeftDrawerCloseSpotID = 5028;
-const tHotSpotID kCaldoriaRightDrawerWithKeysCloseSpotID = 5029;
-const tHotSpotID kCaldoriaRightDrawerNoKeysCloseSpotID = 5030;
-const tHotSpotID kCaldoriaFourthFloorElevatorSpotID = 5031;
-const tHotSpotID kCaldoria20DoorbellSpotID = 5032;
-const tHotSpotID kCaldoria21DoorbellSpotID = 5033;
-const tHotSpotID kCaldoria26DoorbellSpotID = 5034;
-const tHotSpotID kCaldoriaFourthFloorElevator1 = 5035;
-const tHotSpotID kCaldoriaFourthFloorElevator2 = 5036;
-const tHotSpotID kCaldoriaFourthFloorElevator3 = 5037;
-const tHotSpotID kCaldoriaFourthFloorElevator4 = 5038;
-const tHotSpotID kCaldoriaFourthFloorElevator5 = 5039;
-const tHotSpotID kCaldoriaGroundElevator1 = 5040;
-const tHotSpotID kCaldoriaGroundElevator2 = 5041;
-const tHotSpotID kCaldoriaGroundElevator3 = 5042;
-const tHotSpotID kCaldoriaGroundElevator4 = 5043;
-const tHotSpotID kCaldoriaGroundElevator5 = 5044;
-const tHotSpotID kCaldoria29DoorbellSpotID = 5045;
-const tHotSpotID kCaldoria34DoorbellSpotID = 5046;
-const tHotSpotID kCaldoria35DoorbellSpotID = 5047;
-const tHotSpotID kCaldoriaGroundElevatorSpotID = 5048;
-const tHotSpotID kCaldoriaBinocularZoomInSpotID = 5049;
-const tHotSpotID kCaldoriaBinocularsOutSpotID = 5050;
-const tHotSpotID kCaldoriaZoomInOnShipSpotID = 5051;
-const tHotSpotID kCaldoriaKioskSpotID = 5052;
-const tHotSpotID kCaldoriaKioskOutSpotID = 5053;
-const tHotSpotID kCaldoriaKioskInfoSpotID = 5054;
-const tHotSpotID kCaldoriaGTCardDropSpotID = 5055;
-const tHotSpotID kCaldoriaGTTokyoSpotID = 5056;
-const tHotSpotID kCaldoriaGTTSASpotID = 5057;
-const tHotSpotID kCaldoriaGTBeachSpotID = 5058;
-const tHotSpotID kCaldoriaGTOtherSpotID = 5059;
-const tHotSpotID kCaldoriaRoofElevator1 = 5060;
-const tHotSpotID kCaldoriaRoofElevator2 = 5061;
-const tHotSpotID kCaldoriaRoofElevator3 = 5062;
-const tHotSpotID kCaldoriaRoofElevator4 = 5063;
-const tHotSpotID kCaldoriaRoofElevator5 = 5064;
-const tHotSpotID kCaldoriaRoofElevatorSpotID = 5065;
-const tHotSpotID kCaldoriaRoofDoorSpotID = 5066;
-const tHotSpotID kCaldoriaRoofCardDropSpotID = 5067;
-const tHotSpotID kCaldoria53EastSinclairTargetSpotID = 5068;
+const HotSpotID kCa4DEnvironOpenSpotID = 5000;
+const HotSpotID kCa4DEnvironCloseSpotID = 5001;
+const HotSpotID kCa4DVisualSpotID = 5002;
+const HotSpotID kCa4DAudioSpotID = 5003;
+const HotSpotID kCa4DChoice1SpotID = 5004;
+const HotSpotID kCa4DChoice2SpotID = 5005;
+const HotSpotID kCa4DChoice3SpotID = 5006;
+const HotSpotID kCa4DChoice4SpotID = 5007;
+const HotSpotID kCaBathroomMirrorSpotID = 5008;
+const HotSpotID kCaHairStyle1SpotID = 5009;
+const HotSpotID kCaHairStyle2SpotID = 5010;
+const HotSpotID kCaHairStyle3SpotID = 5011;
+const HotSpotID kCaShowerSpotID = 5012;
+const HotSpotID kCaBathroomToiletSpotID = 5013;
+const HotSpotID kCaldoriaVidPhoneSpotID = 5014;
+const HotSpotID kCaldoriaReplicatorSpotID = 5015;
+const HotSpotID kCaldoriaDrawersSpotID = 5016;
+const HotSpotID kCaldoriaVidPhoneOutSpotID = 5017;
+const HotSpotID kCaBedroomVidPhoneActivationSpotID = 5018;
+const HotSpotID kCaldoriaReplicatorOutSpotID = 5019;
+const HotSpotID kCaldoriaMakeOJSpotID = 5020;
+const HotSpotID kCaldoriaMakeStickyBunsSpotID = 5021;
+const HotSpotID kCaldoriaOrangeJuiceSpotID = 5022;
+const HotSpotID kCaldoriaOrangeJuiceDropSpotID = 5023;
+const HotSpotID kCaldoriaDrawersOutSpotID = 5024;
+const HotSpotID kCaldoriaLeftDrawerOpenSpotID = 5025;
+const HotSpotID kCaldoriaRightDrawerOpenSpotID = 5026;
+const HotSpotID kCaldoriaKeyCardSpotID = 5027;
+const HotSpotID kCaldoriaLeftDrawerCloseSpotID = 5028;
+const HotSpotID kCaldoriaRightDrawerWithKeysCloseSpotID = 5029;
+const HotSpotID kCaldoriaRightDrawerNoKeysCloseSpotID = 5030;
+const HotSpotID kCaldoriaFourthFloorElevatorSpotID = 5031;
+const HotSpotID kCaldoria20DoorbellSpotID = 5032;
+const HotSpotID kCaldoria21DoorbellSpotID = 5033;
+const HotSpotID kCaldoria26DoorbellSpotID = 5034;
+const HotSpotID kCaldoriaFourthFloorElevator1 = 5035;
+const HotSpotID kCaldoriaFourthFloorElevator2 = 5036;
+const HotSpotID kCaldoriaFourthFloorElevator3 = 5037;
+const HotSpotID kCaldoriaFourthFloorElevator4 = 5038;
+const HotSpotID kCaldoriaFourthFloorElevator5 = 5039;
+const HotSpotID kCaldoriaGroundElevator1 = 5040;
+const HotSpotID kCaldoriaGroundElevator2 = 5041;
+const HotSpotID kCaldoriaGroundElevator3 = 5042;
+const HotSpotID kCaldoriaGroundElevator4 = 5043;
+const HotSpotID kCaldoriaGroundElevator5 = 5044;
+const HotSpotID kCaldoria29DoorbellSpotID = 5045;
+const HotSpotID kCaldoria34DoorbellSpotID = 5046;
+const HotSpotID kCaldoria35DoorbellSpotID = 5047;
+const HotSpotID kCaldoriaGroundElevatorSpotID = 5048;
+const HotSpotID kCaldoriaBinocularZoomInSpotID = 5049;
+const HotSpotID kCaldoriaBinocularsOutSpotID = 5050;
+const HotSpotID kCaldoriaZoomInOnShipSpotID = 5051;
+const HotSpotID kCaldoriaKioskSpotID = 5052;
+const HotSpotID kCaldoriaKioskOutSpotID = 5053;
+const HotSpotID kCaldoriaKioskInfoSpotID = 5054;
+const HotSpotID kCaldoriaGTCardDropSpotID = 5055;
+const HotSpotID kCaldoriaGTTokyoSpotID = 5056;
+const HotSpotID kCaldoriaGTTSASpotID = 5057;
+const HotSpotID kCaldoriaGTBeachSpotID = 5058;
+const HotSpotID kCaldoriaGTOtherSpotID = 5059;
+const HotSpotID kCaldoriaRoofElevator1 = 5060;
+const HotSpotID kCaldoriaRoofElevator2 = 5061;
+const HotSpotID kCaldoriaRoofElevator3 = 5062;
+const HotSpotID kCaldoriaRoofElevator4 = 5063;
+const HotSpotID kCaldoriaRoofElevator5 = 5064;
+const HotSpotID kCaldoriaRoofElevatorSpotID = 5065;
+const HotSpotID kCaldoriaRoofDoorSpotID = 5066;
+const HotSpotID kCaldoriaRoofCardDropSpotID = 5067;
+const HotSpotID kCaldoria53EastSinclairTargetSpotID = 5068;
 
 //	Extra sequence IDs.
 
-const tExtraID kCaldoriaWakeUpView1 = 0;
-const tExtraID kCaldoria00WakeUp1 = 1;
-const tExtraID kCaldoria00WakeUp2 = 2;
-const tExtraID kCaldoria00SitDown = 3;
-const tExtraID k4DEnvironOpenToINN = 4;
-const tExtraID k4DINNInterruption = 5;
-const tExtraID k4DINNIntro = 6;
-const tExtraID k4DINNMarkJohnson = 7;
-const tExtraID k4DINNMeganLove = 8;
-const tExtraID k4DINNFadeOut = 9;
-const tExtraID k4DEnvironOpenFromINN = 10;
-const tExtraID k4DEnvironOpen = 11;
-const tExtraID k4DEnvironOpenView = 12;
-const tExtraID k4DEnvironClose = 13;
-const tExtraID k4DIslandLoop = 14;
-const tExtraID k4DDesertLoop = 15;
-const tExtraID k4DMountainLoop = 16;
-const tExtraID k4DIsland1ToIsland0 = 17;
-const tExtraID k4DIsland2ToIsland0 = 18;
-const tExtraID k4DIsland0ToDesert0 = 19;
-const tExtraID k4DIsland1ToDesert0 = 20;
-const tExtraID k4DIsland2ToDesert0 = 21;
-const tExtraID k4DIsland0ToMountain0 = 22;
-const tExtraID k4DIsland1ToMountain0 = 23;
-const tExtraID k4DIsland2ToMountain0 = 24;
-const tExtraID k4DDesert0ToIsland0 = 25;
-const tExtraID k4DDesert1ToIsland0 = 26;
-const tExtraID k4DDesert2ToIsland0 = 27;
-const tExtraID k4DDesert0ToMountain0 = 28;
-const tExtraID k4DDesert1ToMountain0 = 29;
-const tExtraID k4DDesert2ToMountain0 = 30;
-const tExtraID k4DMountain0ToIsland0 = 31;
-const tExtraID k4DMountain1ToIsland0 = 32;
-const tExtraID k4DMountain2ToIsland0 = 33;
-const tExtraID k4DMountain0ToDesert0 = 34;
-const tExtraID k4DMountain1ToDesert0 = 35;
-const tExtraID k4DMountain2ToDesert0 = 36;
-const tExtraID kCaBathroomGreeting = 37;
-const tExtraID kCaBathroomBodyFat = 38;
-const tExtraID kCaBathroomStylistIntro = 39;
-const tExtraID kCaBathroomRetrothrash = 40;
-const tExtraID kCaBathroomRetrothrashReturn = 41;
-const tExtraID kCaBathroomGeoWave = 42;
-const tExtraID kCaBathroomGeoWaveReturn = 43;
-const tExtraID kCaBathroomAgencyStandard = 44;
-const tExtraID kCaldoriaShowerTitle = 45;
-const tExtraID kCaldoriaShowerButton = 46;
-const tExtraID kCaldoriaShowerDown = 47;
-const tExtraID kCaldoriaShowerUp = 48;
-const tExtraID kCaBedroomVidPhone = 49;
-const tExtraID kCaBedroomMessage1 = 50;
-const tExtraID kCaBedroomMessage2 = 51;
-const tExtraID kCreateOrangeJuice = 52;
-const tExtraID kDisposeOrangeJuice = 53;
-const tExtraID kReplicatorNorthViewWithOJ = 54;
-const tExtraID kLeftDrawerOpen = 55;
-const tExtraID kLeftDrawerClose = 56;
-const tExtraID kRightDrawerOpenWithKeys = 57;
-const tExtraID kRightDrawerCloseWithKeys = 58;
-const tExtraID kRightDrawerOpenNoKeys = 59;
-const tExtraID kRightDrawerCloseNoKeys = 60;
-const tExtraID kRightDrawerOpenViewWithKeys = 61;
-const tExtraID kRightDrawerOpenViewNoKeys = 62;
-const tExtraID kCaldoria16ElevatorUp = 63;
-const tExtraID kCaldoria16ElevatorDown = 64;
-const tExtraID kCaldoria16SouthViewWithElevator = 65;
-const tExtraID kCaldoria20Doorbell = 66;
-const tExtraID kCaldoria21Doorbell = 67;
-const tExtraID kCaldoria26Doorbell = 68;
-const tExtraID kCaldoriaFourthToGround = 69;
-const tExtraID kCaldoriaRoofToFourth = 70;
-const tExtraID kCaldoriaRoofToGround = 71;
-const tExtraID kCaldoriaGroundToFourth = 72;
-const tExtraID kCaldoriaGroundToRoof = 73;
-const tExtraID kCaldoriaFourthToRoof = 74;
-const tExtraID kCaldoria29Doorbell = 75;
-const tExtraID kCaldoria34Doorbell = 76;
-const tExtraID kCaldoria35Doorbell = 77;
-const tExtraID kBinocularsZoomInOnShip = 78;
-const tExtraID kCaldoriaKioskVideo = 79;
-const tExtraID kCaldoriaTransporterArrowLoop = 80;
-const tExtraID kArriveAtCaldoriaFromTSA = 81;
-const tExtraID kCaGTOtherChoice = 82;
-const tExtraID kCaGTCardSwipe = 83;
-const tExtraID kCaGTSelectTSA = 84;
-const tExtraID kCaGTFryTheFly = 85;
-const tExtraID kCaGTGoToTSA = 86;
-const tExtraID kCaGTSelectBeach = 87;
-const tExtraID kCaGTGoToBeach = 88;
-const tExtraID kCaGTArriveAtBeach = 89;
-const tExtraID kCaGTSelectTokyo = 90;
-const tExtraID kCaGTGoToTokyo = 91;
-const tExtraID kCaGTArriveAtTokyo = 92;
-const tExtraID kCa48NorthRooftopClosed = 93;
-const tExtraID kCa48NorthExplosion = 94;
-const tExtraID kCa48NorthExplosionDeath = 95;
-const tExtraID kCa49NorthVoiceAnalysis = 96;
-const tExtraID kCa50SinclairShoots = 97;
-const tExtraID kCa53EastZoomToSinclair = 98;
-const tExtraID kCa53EastDeath2 = 99;
-const tExtraID kCa53EastShootSinclair = 100;
-const tExtraID kCa53EastZoomOutFromSinclair = 101;
-const tExtraID kCa54SouthDeath = 102;
-const tExtraID kCaldoria56BombStage1 = 103;
-const tExtraID kCaldoria56BombStage2 = 104;
-const tExtraID kCaldoria56BombStage3 = 105;
-const tExtraID kCaldoria56BombStage4 = 106;
-const tExtraID kCaldoria56BombStage5 = 107;
-const tExtraID kCaldoria56BombStage6 = 108;
-const tExtraID kCaldoria56BombStage7 = 109;
-const tExtraID kCaldoria56BombExplodes = 110;
+const ExtraID kCaldoriaWakeUpView1 = 0;
+const ExtraID kCaldoria00WakeUp1 = 1;
+const ExtraID kCaldoria00WakeUp2 = 2;
+const ExtraID kCaldoria00SitDown = 3;
+const ExtraID k4DEnvironOpenToINN = 4;
+const ExtraID k4DINNInterruption = 5;
+const ExtraID k4DINNIntro = 6;
+const ExtraID k4DINNMarkJohnson = 7;
+const ExtraID k4DINNMeganLove = 8;
+const ExtraID k4DINNFadeOut = 9;
+const ExtraID k4DEnvironOpenFromINN = 10;
+const ExtraID k4DEnvironOpen = 11;
+const ExtraID k4DEnvironOpenView = 12;
+const ExtraID k4DEnvironClose = 13;
+const ExtraID k4DIslandLoop = 14;
+const ExtraID k4DDesertLoop = 15;
+const ExtraID k4DMountainLoop = 16;
+const ExtraID k4DIsland1ToIsland0 = 17;
+const ExtraID k4DIsland2ToIsland0 = 18;
+const ExtraID k4DIsland0ToDesert0 = 19;
+const ExtraID k4DIsland1ToDesert0 = 20;
+const ExtraID k4DIsland2ToDesert0 = 21;
+const ExtraID k4DIsland0ToMountain0 = 22;
+const ExtraID k4DIsland1ToMountain0 = 23;
+const ExtraID k4DIsland2ToMountain0 = 24;
+const ExtraID k4DDesert0ToIsland0 = 25;
+const ExtraID k4DDesert1ToIsland0 = 26;
+const ExtraID k4DDesert2ToIsland0 = 27;
+const ExtraID k4DDesert0ToMountain0 = 28;
+const ExtraID k4DDesert1ToMountain0 = 29;
+const ExtraID k4DDesert2ToMountain0 = 30;
+const ExtraID k4DMountain0ToIsland0 = 31;
+const ExtraID k4DMountain1ToIsland0 = 32;
+const ExtraID k4DMountain2ToIsland0 = 33;
+const ExtraID k4DMountain0ToDesert0 = 34;
+const ExtraID k4DMountain1ToDesert0 = 35;
+const ExtraID k4DMountain2ToDesert0 = 36;
+const ExtraID kCaBathroomGreeting = 37;
+const ExtraID kCaBathroomBodyFat = 38;
+const ExtraID kCaBathroomStylistIntro = 39;
+const ExtraID kCaBathroomRetrothrash = 40;
+const ExtraID kCaBathroomRetrothrashReturn = 41;
+const ExtraID kCaBathroomGeoWave = 42;
+const ExtraID kCaBathroomGeoWaveReturn = 43;
+const ExtraID kCaBathroomAgencyStandard = 44;
+const ExtraID kCaldoriaShowerTitle = 45;
+const ExtraID kCaldoriaShowerButton = 46;
+const ExtraID kCaldoriaShowerDown = 47;
+const ExtraID kCaldoriaShowerUp = 48;
+const ExtraID kCaBedroomVidPhone = 49;
+const ExtraID kCaBedroomMessage1 = 50;
+const ExtraID kCaBedroomMessage2 = 51;
+const ExtraID kCreateOrangeJuice = 52;
+const ExtraID kDisposeOrangeJuice = 53;
+const ExtraID kReplicatorNorthViewWithOJ = 54;
+const ExtraID kLeftDrawerOpen = 55;
+const ExtraID kLeftDrawerClose = 56;
+const ExtraID kRightDrawerOpenWithKeys = 57;
+const ExtraID kRightDrawerCloseWithKeys = 58;
+const ExtraID kRightDrawerOpenNoKeys = 59;
+const ExtraID kRightDrawerCloseNoKeys = 60;
+const ExtraID kRightDrawerOpenViewWithKeys = 61;
+const ExtraID kRightDrawerOpenViewNoKeys = 62;
+const ExtraID kCaldoria16ElevatorUp = 63;
+const ExtraID kCaldoria16ElevatorDown = 64;
+const ExtraID kCaldoria16SouthViewWithElevator = 65;
+const ExtraID kCaldoria20Doorbell = 66;
+const ExtraID kCaldoria21Doorbell = 67;
+const ExtraID kCaldoria26Doorbell = 68;
+const ExtraID kCaldoriaFourthToGround = 69;
+const ExtraID kCaldoriaRoofToFourth = 70;
+const ExtraID kCaldoriaRoofToGround = 71;
+const ExtraID kCaldoriaGroundToFourth = 72;
+const ExtraID kCaldoriaGroundToRoof = 73;
+const ExtraID kCaldoriaFourthToRoof = 74;
+const ExtraID kCaldoria29Doorbell = 75;
+const ExtraID kCaldoria34Doorbell = 76;
+const ExtraID kCaldoria35Doorbell = 77;
+const ExtraID kBinocularsZoomInOnShip = 78;
+const ExtraID kCaldoriaKioskVideo = 79;
+const ExtraID kCaldoriaTransporterArrowLoop = 80;
+const ExtraID kArriveAtCaldoriaFromTSA = 81;
+const ExtraID kCaGTOtherChoice = 82;
+const ExtraID kCaGTCardSwipe = 83;
+const ExtraID kCaGTSelectTSA = 84;
+const ExtraID kCaGTFryTheFly = 85;
+const ExtraID kCaGTGoToTSA = 86;
+const ExtraID kCaGTSelectBeach = 87;
+const ExtraID kCaGTGoToBeach = 88;
+const ExtraID kCaGTArriveAtBeach = 89;
+const ExtraID kCaGTSelectTokyo = 90;
+const ExtraID kCaGTGoToTokyo = 91;
+const ExtraID kCaGTArriveAtTokyo = 92;
+const ExtraID kCa48NorthRooftopClosed = 93;
+const ExtraID kCa48NorthExplosion = 94;
+const ExtraID kCa48NorthExplosionDeath = 95;
+const ExtraID kCa49NorthVoiceAnalysis = 96;
+const ExtraID kCa50SinclairShoots = 97;
+const ExtraID kCa53EastZoomToSinclair = 98;
+const ExtraID kCa53EastDeath2 = 99;
+const ExtraID kCa53EastShootSinclair = 100;
+const ExtraID kCa53EastZoomOutFromSinclair = 101;
+const ExtraID kCa54SouthDeath = 102;
+const ExtraID kCaldoria56BombStage1 = 103;
+const ExtraID kCaldoria56BombStage2 = 104;
+const ExtraID kCaldoria56BombStage3 = 105;
+const ExtraID kCaldoria56BombStage4 = 106;
+const ExtraID kCaldoria56BombStage5 = 107;
+const ExtraID kCaldoria56BombStage6 = 108;
+const ExtraID kCaldoria56BombStage7 = 109;
+const ExtraID kCaldoria56BombExplodes = 110;
 
 //	Caldoria interactions.
 
-const tInteractionID kCaldoria4DInteractionID = 0;
-const tInteractionID kCaldoriaBombInteractionID = 1;
-const tInteractionID kCaldoriaMessagesInteractionID = 2;
-const tInteractionID kCaldoriaMirrorInteractionID = 3;
+const InteractionID kCaldoria4DInteractionID = 0;
+const InteractionID kCaldoriaBombInteractionID = 1;
+const InteractionID kCaldoriaMessagesInteractionID = 2;
+const InteractionID kCaldoriaMirrorInteractionID = 3;
 
 //	Caldoria:
 
-const tDisplayOrder kVidPhoneOrder = kMonitorLayer;
-const tDisplayOrder k4DSpritesOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaMessagesOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaElevatorOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaA05LightLoopOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaA07LightLoopOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaBombGridOrder = kMonitorLayer;
-const tDisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1;
+const DisplayOrder kVidPhoneOrder = kMonitorLayer;
+const DisplayOrder k4DSpritesOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaMessagesOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaElevatorOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaA05LightLoopOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaA07LightLoopOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaBombGridOrder = kMonitorLayer;
+const DisplayOrder kCaldoriaBombTimerOrder = kCaldoriaBombGridOrder + 1;
 
 /////////////////////////////////////////////
 //
 //	Caldoria
 
-const tCoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105;
-const tCoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28;
+const CoordType kCaldoriaVidPhoneLeft = kNavAreaLeft + 105;
+const CoordType kCaldoriaVidPhoneTop = kNavAreaTop + 28;
 
-const tCoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10;
-const tCoordType kCaldoria4DSpritesTop = kNavAreaTop + 142;
+const CoordType kCaldoria4DSpritesLeft = kNavAreaLeft + 10;
+const CoordType kCaldoria4DSpritesTop = kNavAreaTop + 142;
 
-const tCoordType kCaldoriaMessageLeft = kNavAreaLeft + 202;
-const tCoordType kCaldoriaMessageTop = kNavAreaTop + 26;
+const CoordType kCaldoriaMessageLeft = kNavAreaLeft + 202;
+const CoordType kCaldoriaMessageTop = kNavAreaTop + 26;
 
-const tCoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407;
-const tCoordType kCaldoriaElevatorTop = kNavAreaTop + 138;
+const CoordType kCaldoriaElevatorLeft = kNavAreaLeft + 407;
+const CoordType kCaldoriaElevatorTop = kNavAreaTop + 138;
 
-const tCoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213;
-const tCoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215;
+const CoordType kCaldoriaA05LightLoopLeft = kNavAreaLeft + 213;
+const CoordType kCaldoriaA05LightLoopTop = kNavAreaTop + 215;
 
-const tCoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414;
-const tCoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215;
+const CoordType kCaldoriaA07LightLoopLeft = kNavAreaLeft + 414;
+const CoordType kCaldoriaA07LightLoopTop = kNavAreaTop + 215;
 
-const tCoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276;
-const tCoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115;
+const CoordType kCaldoriaGunSpriteLeft = kNavAreaLeft + 276;
+const CoordType kCaldoriaGunSpriteTop = kNavAreaTop + 115;
 
-const tCoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135;
-const tCoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214;
+const CoordType kCaldoria11MessageLoopLeft = kNavAreaLeft + 135;
+const CoordType kCaldoria11MessageLoopTop = kNavAreaTop + 214;
 
-const tCoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209;
-const tCoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170;
+const CoordType kCaldoria12MessageLoopLeft = kNavAreaLeft + 209;
+const CoordType kCaldoria12MessageLoopTop = kNavAreaTop + 170;
 
-const tCoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480;
-const tCoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191;
+const CoordType kCaldoria13MessageLoopLeft = kNavAreaLeft + 480;
+const CoordType kCaldoria13MessageLoopTop = kNavAreaTop + 191;
 
-const tCoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248;
-const tCoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191;
+const CoordType kCaldoria14MessageLoopLeft = kNavAreaLeft + 248;
+const CoordType kCaldoria14MessageLoopTop = kNavAreaTop + 191;
 
-const tCoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337;
-const tCoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205;
+const CoordType kCaldoria48CardBombLoopLeft = kNavAreaLeft + 337;
+const CoordType kCaldoria48CardBombLoopTop = kNavAreaTop + 205;
 
-const tCoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290;
-const tCoordType kCaldoriaBombGridTop = kNavAreaTop + 58;
+const CoordType kCaldoriaBombGridLeft = kNavAreaLeft + 290;
+const CoordType kCaldoriaBombGridTop = kNavAreaTop + 58;
 
-const tCoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58;
-const tCoordType kCaldoriaBombTimerTop = kNavAreaTop + 204;
+const CoordType kCaldoriaBombTimerLeft = kNavAreaLeft + 58;
+const CoordType kCaldoriaBombTimerTop = kNavAreaTop + 204;
 
 //	Caldoria display IDs.
 
-const tDisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID;
-const tDisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1;
-const tDisplayElementID kCaldoriaMessagesID = kCaldoria4DSpritesID + 1;
-const tDisplayElementID kCaldoriaUtilityID = kCaldoriaMessagesID + 1;
-const tDisplayElementID kCaldoriaBombGridID = kCaldoriaUtilityID + 1;
-const tDisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1;
+const DisplayElementID kCaldoriaVidPhoneID = kNeighborhoodDisplayID;
+const DisplayElementID kCaldoria4DSpritesID = kCaldoriaVidPhoneID + 1;
+const DisplayElementID kCaldoriaMessagesID = kCaldoria4DSpritesID + 1;
+const DisplayElementID kCaldoriaUtilityID = kCaldoriaMessagesID + 1;
+const DisplayElementID kCaldoriaBombGridID = kCaldoriaUtilityID + 1;
+const DisplayElementID kCaldoriaBombTimerID = kCaldoriaBombGridID + 1;
 
 const TimeValue kCaldoria4DBlankChoiceIn = 29730;
 const TimeValue kCaldoria4DBlankChoiceOut = 33910;
@@ -412,7 +412,7 @@ public:
 	
 	void pickedUpItem(Item *);
 	
-	virtual GameInteraction *makeInteraction(const tInteractionID);
+	virtual GameInteraction *makeInteraction(const InteractionID);
 	
 	virtual Common::String getBriefingMovie();
 	virtual Common::String getEnvScanMovie();
@@ -422,7 +422,7 @@ public:
 	bool wantsCursor();
 	void flushGameState();
 
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 
 protected:
 	enum {
@@ -452,36 +452,36 @@ protected:
 
 	void setUpAIRules();
 	void doAIRecalibration();
-	TimeValue getViewTime(const tRoomID, const tDirectionConstant);
-	void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &);
+	TimeValue getViewTime(const RoomID, const DirectionConstant);
+	void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &);
 	void startSpotOnceOnly(TimeValue, TimeValue);
 	void startExitMovie(const ExitTable::Entry &);
 	void startZoomMovie(const ZoomTable::Entry &);
 	void startDoorOpenMovie(const TimeValue, const TimeValue);
-	void startTurnPush(const tTurnDirection, const TimeValue, const tDirectionConstant);
+	void startTurnPush(const TurnDirection, const TimeValue, const DirectionConstant);
 	void bumpIntoWall();
-	int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant);
+	int16 getStaticCompassAngle(const RoomID, const DirectionConstant);
 	void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &);
 	void getZoomCompassMove(const ZoomTable::Entry &, FaderMoveSpec &);
 	void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec &);
 	void spotCompleted();
-	void arriveAt(const tRoomID, const tDirectionConstant);
+	void arriveAt(const RoomID, const DirectionConstant);
 	void arriveAtCaldoria00();
 	void arriveAtCaldoriaToilet();
 	void arriveAtCaldoria44();
 	void arriveAtCaldoria49();
 	void arriveAtCaldoria56();
 	void arriveAtCaldoriaDeath();
-	void turnTo(const tDirectionConstant);
+	void turnTo(const DirectionConstant);
 	void zoomTo(const Hotspot *);
 	void downButton(const Input &);
-	void receiveNotification(Notification *, const tNotificationFlags);
-	tInputBits getInputFilter();
+	void receiveNotification(Notification *, const NotificationFlags);
+	InputBits getInputFilter();
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
-	void newInteraction(const tInteractionID);
+	void newInteraction(const InteractionID);
 	
-	void clickOnDoorbell(const tHotSpotID);
+	void clickOnDoorbell(const HotSpotID);
 	
 	Hotspot *getItemScreenSpot(Item *, DisplayElement *);
 	void dropItemIntoRoom(Item *, Hotspot *);
@@ -489,7 +489,7 @@ protected:
 	void updateElevatorMovie();
 	void openElevatorMovie();
 	void emptyOJGlass();
-	void closeDoorOffScreen(const tRoomID, const tDirectionConstant);
+	void closeDoorOffScreen(const RoomID, const DirectionConstant);
 	void doorBombTimerExpired();
 	void sinclairTimerExpired();
 	void checkSinclairShootsOS();
@@ -498,7 +498,7 @@ protected:
 	void playEndMessage();
 	void checkInterruptSinclair();
 	
-	tCanOpenDoorReason canOpenDoor(DoorTable::Entry &);
+	CanOpenDoorReason canOpenDoor(DoorTable::Entry &);
 	void doorOpened();
 	
 	void updateCursor(const Common::Point, const Hotspot *);
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
index 252979a0fb..31a102a061 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.cpp
@@ -44,7 +44,7 @@ const TimeValue kSwitchable2Stop = kSwitchable2Start + kSwitchableDuration;
 const TimeValue kSwitchable3Start = kSwitchable2Stop + kNonswitchableDuration;
 const TimeValue kSwitchable3Stop = kSwitchable3Start + kSwitchableDuration;
 
-const tNotificationFlags kVidPhoneDoneFlag = 1;
+const NotificationFlags kVidPhoneDoneFlag = 1;
 
 const TimeValue kRockMusicLoopIn = 0;
 const TimeValue kRockMusicLoopOut = 2088;
@@ -75,28 +75,28 @@ enum {
 	k4DFirstVideoChoice = k4DIslandChoice
 };
 
-tExtraID s_transitionExtras0[3][3] = {
-	{0xffffffff, k4DIsland0ToDesert0, k4DIsland0ToMountain0},
-	{k4DDesert0ToIsland0, 0xffffffff, k4DDesert0ToMountain0},
-	{k4DMountain0ToIsland0, k4DMountain0ToDesert0, 0xffffffff}
+static const ExtraID s_transitionExtras0[3][3] = {
+	{ 0xffffffff, k4DIsland0ToDesert0, k4DIsland0ToMountain0 },
+	{ k4DDesert0ToIsland0, 0xffffffff, k4DDesert0ToMountain0 },
+	{ k4DMountain0ToIsland0, k4DMountain0ToDesert0, 0xffffffff }
 };
 
-tExtraID s_transitionExtras1[3][3] = {
-	{0xffffffff, k4DIsland1ToDesert0, k4DIsland1ToMountain0},
-	{k4DDesert1ToIsland0, 0xffffffff, k4DDesert1ToMountain0},
-	{k4DMountain1ToIsland0, k4DMountain1ToDesert0, 0xffffffff}
+static const ExtraID s_transitionExtras1[3][3] = {
+	{ 0xffffffff, k4DIsland1ToDesert0, k4DIsland1ToMountain0 },
+	{ k4DDesert1ToIsland0, 0xffffffff, k4DDesert1ToMountain0 },
+	{ k4DMountain1ToIsland0, k4DMountain1ToDesert0, 0xffffffff }
 };
 
-tExtraID s_transitionExtras2[3][3] = {
-	{0xffffffff, k4DIsland2ToDesert0, k4DIsland2ToMountain0},
-	{k4DDesert2ToIsland0, 0xffffffff, k4DDesert2ToMountain0},
-	{k4DMountain2ToIsland0, k4DMountain2ToDesert0, 0xffffffff}
+static const ExtraID s_transitionExtras2[3][3] = {
+	{ 0xffffffff, k4DIsland2ToDesert0, k4DIsland2ToMountain0 },
+	{ k4DDesert2ToIsland0, 0xffffffff, k4DDesert2ToMountain0 },
+	{ k4DMountain2ToIsland0, k4DMountain2ToDesert0, 0xffffffff }
 };
 
-tExtraID s_shutDownExtras[3][3] = {
-	{0xffffffff, k4DIsland1ToIsland0, k4DIsland2ToIsland0},
-	{k4DDesert0ToIsland0, k4DDesert1ToIsland0, k4DDesert2ToIsland0},
-	{k4DMountain0ToIsland0, k4DMountain1ToIsland0, k4DMountain2ToIsland0}
+static const ExtraID s_shutDownExtras[3][3] = {
+	{ 0xffffffff, k4DIsland1ToIsland0, k4DIsland2ToIsland0 },
+	{ k4DDesert0ToIsland0, k4DDesert1ToIsland0, k4DDesert2ToIsland0 },
+	{ k4DMountain0ToIsland0, k4DMountain1ToIsland0, k4DMountain2ToIsland0 }
 };
 
 Caldoria4DSystem::Caldoria4DSystem(Neighborhood *owner) : GameInteraction(kCaldoria4DInteractionID, owner),
@@ -128,7 +128,7 @@ void Caldoria4DSystem::openInteraction() {
 	startIdling();
 }
 
-void Caldoria4DSystem::loopExtra(const tExtraID extraID) {
+void Caldoria4DSystem::loopExtra(const ExtraID extraID) {
 	ExtraTable::Entry extraEntry;
 	
 	_owner->getExtraEntry(extraID, extraEntry);
@@ -139,7 +139,7 @@ void Caldoria4DSystem::loopExtra(const tExtraID extraID) {
 void Caldoria4DSystem::useIdleTime() {
 	if (_whichMenu == k4DShuttingDown) {
 		TimeValue movieTime = _owner->getNavMovie()->getTime() - _loopStart;
-		tExtraID extraID;
+		ExtraID extraID;
 
 		if (movieTime < kSwitchable1Stop)
 			extraID = s_shutDownExtras[_videoChoice - k4DFirstVideoChoice][0];
@@ -157,7 +157,7 @@ void Caldoria4DSystem::useIdleTime() {
 		}
 	} else if (_clickedHotspotID != kNoHotSpotID) {
 		TimeValue movieTime = _owner->getNavMovie()->getTime() - _loopStart;
-		tExtraID extraID;
+		ExtraID extraID;
 
 		if (movieTime < kSwitchable1Stop) {
 			extraID = s_transitionExtras0[_videoChoice - k4DFirstVideoChoice][_clickedHotspotID - kCa4DChoice1SpotID];
@@ -289,7 +289,7 @@ void Caldoria4DSystem::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void Caldoria4DSystem::receiveNotification(Notification *, const tNotificationFlags) {
+void Caldoria4DSystem::receiveNotification(Notification *, const NotificationFlags) {
 	if (_whichMenu == k4DShuttingDown) {
 		_owner->requestDeleteCurrentInteraction();
 	} else {
@@ -364,7 +364,6 @@ void Caldoria4DSystem::makeAcousticChoice() {
 
 void Caldoria4DSystem::shutDown4DSystem() {
 	_whichMenu = k4DShuttingDown;
-
 }
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.h b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.h
index e0217918fa..63de7e1c4e 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoria4dsystem.h
@@ -50,7 +50,7 @@ protected:
 	void handleInput(const Input &, const Hotspot *);
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void setSpritesMovie();
 	void makeIslandChoice();
 	void makeRockChoice();
@@ -61,7 +61,7 @@ protected:
 	void makeAcousticChoice();
 	
 	void useIdleTime();
-	void loopExtra(const tExtraID);
+	void loopExtra(const ExtraID);
 	
 	Movie _4DSpritesMovie;
 	TimeScale _4DSpritesScale;
@@ -70,7 +70,7 @@ protected:
 	uint _audioChoice;
 	Notification *_neighborhoodNotification;
 	TimeValue _loopStart;
-	tHotSpotID _clickedHotspotID;
+	HotSpotID _clickedHotspotID;
 };
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
index 9ec3124251..c9ee68aefb 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriabomb.cpp
@@ -48,12 +48,12 @@ static const uint32 kOnTime3 = kOffTime2 + kFlashOnTime;
 static const uint32 kOffTime3 = kOnTime3 + kFlashOffTime;
 static const uint32 kOnTime4 = kOffTime3 + kFlashOnTime;
 
-static const tHotSpotID kVertextHotSpotBaseID = 10000;
+static const HotSpotID kVertextHotSpotBaseID = 10000;
 
-static const tCoordType kVertextHotSpotWidth = 24;
-static const tCoordType kVertextHotSpotHeight = 24;
+static const CoordType kVertextHotSpotWidth = 24;
+static const CoordType kVertextHotSpotHeight = 24;
 
-static const tNotificationFlags kBombTimerExpiredFlag = 1;
+static const NotificationFlags kBombTimerExpiredFlag = 1;
 
 static const VertexType kBombLevelOne[] = {
 	0, 1, 0, 1, 0,			// hot vertices first.
@@ -696,20 +696,20 @@ static const VertexType kBombLevelSix[] = {
 	0, 0
 };
 
-static const tCoordType kBombGridWidth = 140;
-static const tCoordType kBombGridHeight = 140;
+static const CoordType kBombGridWidth = 140;
+static const CoordType kBombGridHeight = 140;
 
-static const tCoordType kDotOriginX = 0;
-static const tCoordType kDotOriginY = 0;
+static const CoordType kDotOriginX = 0;
+static const CoordType kDotOriginY = 0;
 
-static const tCoordType kVertOriginX = 2;
-static const tCoordType kVertOriginY = 6;
+static const CoordType kVertOriginX = 2;
+static const CoordType kVertOriginY = 6;
 
-static const tCoordType kHorizOriginX = 6;
-static const tCoordType kHorizOriginY = 2;
+static const CoordType kHorizOriginX = 6;
+static const CoordType kHorizOriginY = 2;
 
-static const tCoordType kDiagOriginX = 6;
-static const tCoordType kDiagOriginY = 6;
+static const CoordType kDiagOriginX = 6;
+static const CoordType kDiagOriginY = 6;
 
 static const int g_originsX[] = {
 	kDiagOriginX,
@@ -738,11 +738,11 @@ struct HotVerticesList {
 	VertexType hotVerts[25];
 };
 
-tCoordType vertToX(VertexType vertex) {
+CoordType vertToX(VertexType vertex) {
 	return (vertex % 5) * 32;
 }
 
-tCoordType vertToY(VertexType vertex) {
+CoordType vertToY(VertexType vertex) {
 	return (vertex / 5) * 32;
 }
 
@@ -1000,7 +1000,7 @@ bool allEdgesUsed(BombEdgeList edges) {
 	return true;
 }
 
-BombGrid::BombGrid(const tDisplayElementID id) : Picture(id) {
+BombGrid::BombGrid(const DisplayElementID id) : Picture(id) {
 	Common::Rect bounds(0, 0, kBombGridWidth, kBombGridHeight);
 
 	allocateSurface(bounds);
@@ -1098,7 +1098,7 @@ void BombGrid::drawEdges(BombEdgeList edges) {
 	gfx->setCurSurface(gfx->getWorkArea());
 }
 
-BombTimer::BombTimer(const tDisplayElementID id) : IdlerAnimation(id) {	
+BombTimer::BombTimer(const DisplayElementID id) : IdlerAnimation(id) {	
 	_middle = -1;
 	_leftImage.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kTimerLeftPICTID);
 	_rightImage.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kTimerRightPICTID);
@@ -1224,7 +1224,7 @@ void CaldoriaBomb::startBombAmbient(Common::String ambient) {
 	_owner->loadLoopSound1(ambient);
 }
 
-void CaldoriaBomb::receiveNotification(Notification *notification, const tNotificationFlags) {	
+void CaldoriaBomb::receiveNotification(Notification *notification, const NotificationFlags) {	
 	if (notification == _neighborhoodNotification) {
 		switch (_owner->getLastExtra()) {
 		case kCaldoria56BombStage1:
@@ -1297,7 +1297,7 @@ void CaldoriaBomb::clickInHotspot(const Input &input, const Hotspot *hotspot) {
 	}
 }
 
-tInputBits CaldoriaBomb::getInputFilter() {
+InputBits CaldoriaBomb::getInputFilter() {
 	// Disallow arrow buttons.
 	return GameInteraction::getInputFilter() & kFilterAllButtons;
 }
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriabomb.h b/engines/pegasus/neighborhood/caldoria/caldoriabomb.h
index fc48231708..55d0409dec 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriabomb.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoriabomb.h
@@ -75,7 +75,7 @@ static const VertexType kEdgeOneHalf = 7;
 
 class BombTimer : public IdlerAnimation {
 public:
-	BombTimer(const tDisplayElementID);
+	BombTimer(const DisplayElementID);
 	virtual ~BombTimer() {}
 
 	void draw(const Common::Rect &);
@@ -89,7 +89,7 @@ protected:
 
 class BombGrid : public Picture {
 public:
-	BombGrid(const tDisplayElementID);
+	BombGrid(const DisplayElementID);
 	virtual ~BombGrid() {}
 
 	void drawEdges(BombEdgeList);
@@ -131,11 +131,11 @@ protected:
 	void openInteraction();
 	void initInteraction();
 	void closeInteraction();
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
 	void handleInput(const Input &, const Hotspot *);
-	tInputBits getInputFilter();
+	InputBits getInputFilter();
 	void startBombAmbient(Common::String);
 	
 	Notification *_neighborhoodNotification;
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
index bd5480de0e..3e97f97904 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamessages.cpp
@@ -30,9 +30,9 @@
 
 namespace Pegasus {
 
-const tNotificationFlags kMessageDoneFlag = 1;
+const NotificationFlags kMessageDoneFlag = 1;
 
-CaldoriaMessages::CaldoriaMessages(Neighborhood *owner, const tNotificationID id, NotificationManager *manager) :
+CaldoriaMessages::CaldoriaMessages(Neighborhood *owner, const NotificationID id, NotificationManager *manager) :
 		GameInteraction(kCaldoriaMessagesInteractionID, owner), Notification(id, manager), _messageMovie(kCaldoriaMessagesID) {
 }
 
@@ -54,7 +54,7 @@ void CaldoriaMessages::closeInteraction() {
 	_neighborhoodNotification->cancelNotification(this);
 }
 
-void CaldoriaMessages::receiveNotification(Notification *notification, const tNotificationFlags) {	
+void CaldoriaMessages::receiveNotification(Notification *notification, const NotificationFlags) {	
 	if (notification == _neighborhoodNotification) {
 		switch (GameInteraction::_owner->getLastExtra()) {
 		case kCaBedroomVidPhone:
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamessages.h b/engines/pegasus/neighborhood/caldoria/caldoriamessages.h
index 1ef0ab0692..04079b52be 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriamessages.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamessages.h
@@ -38,14 +38,14 @@ class Neighborhood;
 
 class CaldoriaMessages : public GameInteraction, public Notification, public NotificationReceiver {
 public:
-	CaldoriaMessages(Neighborhood *, const tNotificationID, NotificationManager *);
+	CaldoriaMessages(Neighborhood *, const NotificationID, NotificationManager *);
 	virtual ~CaldoriaMessages() {}
 
 protected:
 	void openInteraction();
 	void initInteraction();
 	void closeInteraction();
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void clickInHotspot(const Input &, const Hotspot *);
 	void play1Message(uint);
 	
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
index 4d6dc6b758..2b70ead442 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamirror.cpp
@@ -109,7 +109,7 @@ void CaldoriaMirror::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void CaldoriaMirror::receiveNotification(Notification *, const tNotificationFlags) {
+void CaldoriaMirror::receiveNotification(Notification *, const NotificationFlags) {
 	switch (_owner->getLastExtra()) {
 	case kCaBathroomRetrothrash:
 	case kCaBathroomGeoWave:
diff --git a/engines/pegasus/neighborhood/caldoria/caldoriamirror.h b/engines/pegasus/neighborhood/caldoria/caldoriamirror.h
index 6b4339e69f..1ca47ec774 100755
--- a/engines/pegasus/neighborhood/caldoria/caldoriamirror.h
+++ b/engines/pegasus/neighborhood/caldoria/caldoriamirror.h
@@ -44,7 +44,7 @@ protected:
 	void handleInput(const Input &, const Hotspot *);
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 
 	Notification *_neighborhoodNotification;
 };
diff --git a/engines/pegasus/neighborhood/door.cpp b/engines/pegasus/neighborhood/door.cpp
index 82c83f19b1..f7ec7559fc 100755
--- a/engines/pegasus/neighborhood/door.cpp
+++ b/engines/pegasus/neighborhood/door.cpp
@@ -53,7 +53,7 @@ void DoorTable::clear() {
 	_entries.clear();
 }
 
-DoorTable::Entry DoorTable::findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode) {
+DoorTable::Entry DoorTable::findEntry(RoomID room, DirectionConstant direction, AlternateID altCode) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].altCode == altCode)
 			return _entries[i];
diff --git a/engines/pegasus/neighborhood/door.h b/engines/pegasus/neighborhood/door.h
index db05e22ac8..74e9ac8441 100755
--- a/engines/pegasus/neighborhood/door.h
+++ b/engines/pegasus/neighborhood/door.h
@@ -37,16 +37,16 @@ namespace Common {
 
 namespace Pegasus {
 
-typedef byte tDoorFlags;
+typedef byte DoorFlags;
 
 enum {
 	kDoorPresentBit,				//	Bit set if there is a door here.
 	kDoorLockedBit					//	Bit set if door is locked, clear if unlocked.
 };
 
-const tDoorFlags kNoDoorFlags = 0;
-const tDoorFlags kDoorPresentMask = 1 << kDoorPresentBit;
-const tDoorFlags kDoorLockedMask = 1 << kDoorLockedBit;
+const DoorFlags kNoDoorFlags = 0;
+const DoorFlags kDoorPresentMask = 1 << kDoorPresentBit;
+const DoorFlags kDoorLockedMask = 1 << kDoorLockedBit;
 
 class DoorTable {
 public:
@@ -70,15 +70,15 @@ public:
 			flags = kNoDoorFlags;
 		}
 
-		tRoomID room;
-		tDirectionConstant direction;
-		tAlternateID altCode;
+		RoomID room;
+		DirectionConstant direction;
+		AlternateID altCode;
 		TimeValue movieStart;
 		TimeValue movieEnd;
-		tDoorFlags flags;
+		DoorFlags flags;
 	};
 
-	Entry findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode);
+	Entry findEntry(RoomID room, DirectionConstant direction, AlternateID altCode);
 
 private:
 	Common::Array<Entry> _entries;
diff --git a/engines/pegasus/neighborhood/exit.cpp b/engines/pegasus/neighborhood/exit.cpp
index 0ef12cc7e3..f0dfff12d3 100755
--- a/engines/pegasus/neighborhood/exit.cpp
+++ b/engines/pegasus/neighborhood/exit.cpp
@@ -59,7 +59,7 @@ void ExitTable::clear() {
 	_entries.clear();
 }
 
-ExitTable::Entry ExitTable::findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode) {
+ExitTable::Entry ExitTable::findEntry(RoomID room, DirectionConstant direction, AlternateID altCode) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].altCode == altCode)
 			return _entries[i];
diff --git a/engines/pegasus/neighborhood/exit.h b/engines/pegasus/neighborhood/exit.h
index d3e8d50446..10b1b5938e 100755
--- a/engines/pegasus/neighborhood/exit.h
+++ b/engines/pegasus/neighborhood/exit.h
@@ -63,9 +63,9 @@ public:
 			exitDirection = kNoDirection;
 		}
 
-		tRoomID room;
-		tDirectionConstant direction;
-		tAlternateID altCode;
+		RoomID room;
+		DirectionConstant direction;
+		AlternateID altCode;
 		TimeValue movieStart;
 		TimeValue movieEnd;
 		//	fExitEnd is the end of the optimized run of walks.
@@ -74,11 +74,11 @@ public:
 		//	fExitLoop is the loop start time of the optimized run of walks if the run
 		//	loops back on itself (so far, only in TSA).
 		TimeValue exitLoop;
-		tRoomID exitRoom;
-		tDirectionConstant exitDirection;
+		RoomID exitRoom;
+		DirectionConstant exitDirection;
 	};
 
-	Entry findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode);
+	Entry findEntry(RoomID room, DirectionConstant direction, AlternateID altCode);
 
 	typedef Common::Array<Entry>::iterator iterator;
 	iterator begin() { return _entries.begin(); }
diff --git a/engines/pegasus/neighborhood/extra.cpp b/engines/pegasus/neighborhood/extra.cpp
index 44235ffa96..b8c4e5b510 100755
--- a/engines/pegasus/neighborhood/extra.cpp
+++ b/engines/pegasus/neighborhood/extra.cpp
@@ -47,7 +47,7 @@ void ExtraTable::clear() {
 	_entries.clear();
 }
 
-ExtraTable::Entry ExtraTable::findEntry(tExtraID extra) {
+ExtraTable::Entry ExtraTable::findEntry(ExtraID extra) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].extra == extra)
 			return _entries[i];
diff --git a/engines/pegasus/neighborhood/extra.h b/engines/pegasus/neighborhood/extra.h
index 3320f51289..9ac858e352 100755
--- a/engines/pegasus/neighborhood/extra.h
+++ b/engines/pegasus/neighborhood/extra.h
@@ -51,12 +51,12 @@ public:
 		Entry() { movieStart = 0xffffffff; }
 		bool isEmpty() { return movieStart == 0xffffffff; }
 
-		tExtraID extra;
+		ExtraID extra;
 		TimeValue movieStart;
 		TimeValue movieEnd;
 	};
 
-	Entry findEntry(tExtraID extra);
+	Entry findEntry(ExtraID extra);
 
 private:
 	Common::Array<Entry> _entries;
diff --git a/engines/pegasus/neighborhood/hotspotinfo.cpp b/engines/pegasus/neighborhood/hotspotinfo.cpp
index 1cd241612c..c7524f3a0f 100755
--- a/engines/pegasus/neighborhood/hotspotinfo.cpp
+++ b/engines/pegasus/neighborhood/hotspotinfo.cpp
@@ -54,7 +54,7 @@ void HotspotInfoTable::clear() {
 	_entries.clear();
 }
 
-HotspotInfoTable::Entry HotspotInfoTable::findEntry(tHotSpotID hotspot) {
+HotspotInfoTable::Entry HotspotInfoTable::findEntry(HotSpotID hotspot) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].hotspot == hotspot)
 			return _entries[i];
diff --git a/engines/pegasus/neighborhood/hotspotinfo.h b/engines/pegasus/neighborhood/hotspotinfo.h
index 3c958c9e35..d75e5e9bc7 100755
--- a/engines/pegasus/neighborhood/hotspotinfo.h
+++ b/engines/pegasus/neighborhood/hotspotinfo.h
@@ -51,18 +51,18 @@ public:
 		Entry() { hotspotRoom = kNoRoomID; }
 		bool isEmpty() { return hotspotRoom == kNoRoomID; }
 
-		tHotSpotID hotspot;
-		tHotSpotActivationID hotspotActivation;
+		HotSpotID hotspot;
+		HotSpotActivationID hotspotActivation;
 		//	Location hot spot lives in:
-		tRoomID hotspotRoom;
-		tDirectionConstant hotspotDirection;
+		RoomID hotspotRoom;
+		DirectionConstant hotspotDirection;
 		//	Extra to play if this is a "play extra" hot spot.
-		tExtraID hotspotExtra;
+		ExtraID hotspotExtra;
 		//	Item corresponding to this hot spot if it is an item-related hot spot.
-		tItemID hotspotItem;
+		ItemID hotspotItem;
 	};
 
-	Entry findEntry(tHotSpotID hotspot);
+	Entry findEntry(HotSpotID hotspot);
 
 	typedef Common::Array<Entry>::iterator iterator;
 	iterator begin() { return _entries.begin(); }
diff --git a/engines/pegasus/neighborhood/mars/constants.h b/engines/pegasus/neighborhood/mars/constants.h
index c96a8a1522..103518664c 100755
--- a/engines/pegasus/neighborhood/mars/constants.h
+++ b/engines/pegasus/neighborhood/mars/constants.h
@@ -32,99 +32,99 @@ namespace Pegasus {
 
 //	Element Coordinates
 
-const tCoordType kUndoHiliteLeft = kNavAreaLeft + 140;
-const tCoordType kUndoHiliteTop = kNavAreaTop + 36;
+const CoordType kUndoHiliteLeft = kNavAreaLeft + 140;
+const CoordType kUndoHiliteTop = kNavAreaTop + 36;
 
-const tCoordType kCurrentGuessLeft = kNavAreaLeft + 146;
-const tCoordType kCurrentGuessTop = kNavAreaTop + 90;
+const CoordType kCurrentGuessLeft = kNavAreaLeft + 146;
+const CoordType kCurrentGuessTop = kNavAreaTop + 90;
 
-const tCoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116;
-const tCoordType kReactorChoiceHiliteTop = kNavAreaTop + 158;
+const CoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116;
+const CoordType kReactorChoiceHiliteTop = kNavAreaTop + 158;
 
-const tCoordType kReactorHistoryLeft = kNavAreaLeft + 302;
-const tCoordType kReactorHistoryTop = kNavAreaTop + 39;
+const CoordType kReactorHistoryLeft = kNavAreaLeft + 302;
+const CoordType kReactorHistoryTop = kNavAreaTop + 39;
 
-const tCoordType kAnswerLeft = kNavAreaLeft + 304;
-const tCoordType kAnswerTop = kNavAreaTop + 180;
+const CoordType kAnswerLeft = kNavAreaLeft + 304;
+const CoordType kAnswerTop = kNavAreaTop + 180;
 
-const tCoordType kShuttle1Left = 0;
-const tCoordType kShuttle1Top = 0;
+const CoordType kShuttle1Left = 0;
+const CoordType kShuttle1Top = 0;
 
-const tCoordType kShuttle2Left = 0;
-const tCoordType kShuttle2Top = 96;
+const CoordType kShuttle2Left = 0;
+const CoordType kShuttle2Top = 96;
 
-const tCoordType kShuttle3Left = 500;
-const tCoordType kShuttle3Top = 96;
+const CoordType kShuttle3Left = 500;
+const CoordType kShuttle3Top = 96;
 
-const tCoordType kShuttle4Left = 0;
-const tCoordType kShuttle4Top = 320;
+const CoordType kShuttle4Left = 0;
+const CoordType kShuttle4Top = 320;
 
-const tCoordType kShuttleWindowLeft = 140;
-const tCoordType kShuttleWindowTop = 96;
-const tCoordType kShuttleWindowWidth = 360;
-const tCoordType kShuttleWindowHeight = 224;
+const CoordType kShuttleWindowLeft = 140;
+const CoordType kShuttleWindowTop = 96;
+const CoordType kShuttleWindowWidth = 360;
+const CoordType kShuttleWindowHeight = 224;
 
-const tCoordType kShuttleWindowMidH = (kShuttleWindowLeft * 2 + kShuttleWindowWidth) / 2;
-const tCoordType kShuttleWindowMidV = (kShuttleWindowTop * 2 + kShuttleWindowHeight) / 2;
+const CoordType kShuttleWindowMidH = (kShuttleWindowLeft * 2 + kShuttleWindowWidth) / 2;
+const CoordType kShuttleWindowMidV = (kShuttleWindowTop * 2 + kShuttleWindowHeight) / 2;
 
-const tCoordType kShuttleLeftLeft = 0;
-const tCoordType kShuttleLeftTop = 128;
+const CoordType kShuttleLeftLeft = 0;
+const CoordType kShuttleLeftTop = 128;
 
-const tCoordType kShuttleRightLeft = 506;
-const tCoordType kShuttleRightTop = 128;
+const CoordType kShuttleRightLeft = 506;
+const CoordType kShuttleRightTop = 128;
 
-const tCoordType kShuttleLowerLeftLeft = 74;
-const tCoordType kShuttleLowerLeftTop = 358;
+const CoordType kShuttleLowerLeftLeft = 74;
+const CoordType kShuttleLowerLeftTop = 358;
 
-const tCoordType kShuttleLowerRightLeft = 486;
-const tCoordType kShuttleLowerRightTop = 354;
+const CoordType kShuttleLowerRightLeft = 486;
+const CoordType kShuttleLowerRightTop = 354;
 
-const tCoordType kShuttleCenterLeft = 260;
-const tCoordType kShuttleCenterTop = 336;
+const CoordType kShuttleCenterLeft = 260;
+const CoordType kShuttleCenterTop = 336;
 
-const tCoordType kShuttleUpperLeftLeft = 30;
-const tCoordType kShuttleUpperLeftTop = 32;
+const CoordType kShuttleUpperLeftLeft = 30;
+const CoordType kShuttleUpperLeftTop = 32;
 
-const tCoordType kShuttleUpperRightLeft = 506;
-const tCoordType kShuttleUpperRightTop = 52;
+const CoordType kShuttleUpperRightLeft = 506;
+const CoordType kShuttleUpperRightTop = 52;
 
-const tCoordType kShuttleLeftEnergyLeft = 110;
-const tCoordType kShuttleLeftEnergyTop = 186;
+const CoordType kShuttleLeftEnergyLeft = 110;
+const CoordType kShuttleLeftEnergyTop = 186;
 
-const tCoordType kShuttleRightEnergyLeft = 510;
-const tCoordType kShuttleRightEnergyTop = 186;
+const CoordType kShuttleRightEnergyLeft = 510;
+const CoordType kShuttleRightEnergyTop = 186;
 
-const tCoordType kShuttleEnergyLeft = 186;
-const tCoordType kShuttleEnergyTop = 60;
-const tCoordType kShuttleEnergyWidth = 252;
-const tCoordType kShuttleEnergyHeight = 22;
+const CoordType kShuttleEnergyLeft = 186;
+const CoordType kShuttleEnergyTop = 60;
+const CoordType kShuttleEnergyWidth = 252;
+const CoordType kShuttleEnergyHeight = 22;
 
-const tCoordType kPlanetStartLeft = kShuttleWindowLeft;
-const tCoordType kPlanetStartTop = kShuttleWindowTop + kShuttleWindowHeight;
+const CoordType kPlanetStartLeft = kShuttleWindowLeft;
+const CoordType kPlanetStartTop = kShuttleWindowTop + kShuttleWindowHeight;
 
-const tCoordType kPlanetStopLeft = kShuttleWindowLeft;
-const tCoordType kPlanetStopTop = kShuttleWindowTop + kShuttleWindowHeight - 100;
+const CoordType kPlanetStopLeft = kShuttleWindowLeft;
+const CoordType kPlanetStopTop = kShuttleWindowTop + kShuttleWindowHeight - 100;
 
-const tCoordType kShuttleTractorLeft = kShuttleWindowLeft + 6;
-const tCoordType kShuttleTractorTop = kShuttleWindowTop + 56;
-const tCoordType kShuttleTractorWidth = 348;
-const tCoordType kShuttleTractorHeight = 112;
+const CoordType kShuttleTractorLeft = kShuttleWindowLeft + 6;
+const CoordType kShuttleTractorTop = kShuttleWindowTop + 56;
+const CoordType kShuttleTractorWidth = 348;
+const CoordType kShuttleTractorHeight = 112;
 
-const tCoordType kShuttleJunkLeft = kShuttleWindowLeft + 6;
-const tCoordType kShuttleJunkTop = kShuttleWindowTop + 6;
+const CoordType kShuttleJunkLeft = kShuttleWindowLeft + 6;
+const CoordType kShuttleJunkTop = kShuttleWindowTop + 6;
 
-const tDisplayOrder kShuttlePlanetOrder = kInterfaceLayer;
-const tDisplayOrder kShuttleAlienShipOrder = kShuttlePlanetOrder + 1;
-const tDisplayOrder kShuttleRobotShipOrder = kShuttleAlienShipOrder + 1;
-const tDisplayOrder kShuttleTractorBeamMovieOrder = kShuttleRobotShipOrder + 1;
-const tDisplayOrder kShuttleWeaponBackOrder = kShuttleTractorBeamMovieOrder + 1;
-const tDisplayOrder kShuttleJunkOrder = kShuttleWeaponBackOrder + 1;
-const tDisplayOrder kShuttleWeaponFrontOrder = kShuttleJunkOrder + 1;
-const tDisplayOrder kShuttleTractorBeamOrder = kShuttleWeaponFrontOrder + 1;
-const tDisplayOrder kShuttleHUDOrder = kShuttleTractorBeamOrder + 1;
-const tDisplayOrder kShuttleBackgroundOrder = kShuttleHUDOrder + 1;
-const tDisplayOrder kShuttleMonitorOrder = kShuttleBackgroundOrder + 1;
-const tDisplayOrder kShuttleStatusOrder = kShuttleMonitorOrder + 1;
+const DisplayOrder kShuttlePlanetOrder = kInterfaceLayer;
+const DisplayOrder kShuttleAlienShipOrder = kShuttlePlanetOrder + 1;
+const DisplayOrder kShuttleRobotShipOrder = kShuttleAlienShipOrder + 1;
+const DisplayOrder kShuttleTractorBeamMovieOrder = kShuttleRobotShipOrder + 1;
+const DisplayOrder kShuttleWeaponBackOrder = kShuttleTractorBeamMovieOrder + 1;
+const DisplayOrder kShuttleJunkOrder = kShuttleWeaponBackOrder + 1;
+const DisplayOrder kShuttleWeaponFrontOrder = kShuttleJunkOrder + 1;
+const DisplayOrder kShuttleTractorBeamOrder = kShuttleWeaponFrontOrder + 1;
+const DisplayOrder kShuttleHUDOrder = kShuttleTractorBeamOrder + 1;
+const DisplayOrder kShuttleBackgroundOrder = kShuttleHUDOrder + 1;
+const DisplayOrder kShuttleMonitorOrder = kShuttleBackgroundOrder + 1;
+const DisplayOrder kShuttleStatusOrder = kShuttleMonitorOrder + 1;
 
 const TimeValue kShuttleSwingStart = 0;
 const TimeValue kShuttleSwingStop = 5 * 600;
@@ -471,465 +471,465 @@ const TimeScale kMarsFrameDuration = 40;
 
 //	Alternate IDs.
 
-const tAlternateID kAltMarsNormal = 0;
-const tAlternateID kAltMarsPodAtMars34 = 1;
-const tAlternateID kAltMarsTookCard = 2;
-const tAlternateID kAltMars35AirlockEast = 3;
-const tAlternateID kAltMars35AirlockWest = 4;
-const tAlternateID kAltMarsPodAtMars45 = 5;
-const tAlternateID kAltMarsTookMask = 6;
-const tAlternateID kAltMarsMaskOnFiller = 7;
-const tAlternateID kAltMars60AirlockEast = 8;
-const tAlternateID kAltMars60AirlockWest = 9;
+const AlternateID kAltMarsNormal = 0;
+const AlternateID kAltMarsPodAtMars34 = 1;
+const AlternateID kAltMarsTookCard = 2;
+const AlternateID kAltMars35AirlockEast = 3;
+const AlternateID kAltMars35AirlockWest = 4;
+const AlternateID kAltMarsPodAtMars45 = 5;
+const AlternateID kAltMarsTookMask = 6;
+const AlternateID kAltMarsMaskOnFiller = 7;
+const AlternateID kAltMars60AirlockEast = 8;
+const AlternateID kAltMars60AirlockWest = 9;
 
 //	Room IDs.
 
-const tRoomID kMars0A = 0;
-const tRoomID kMars00 = 1;
-const tRoomID kMars01 = 2;
-const tRoomID kMars02 = 3;
-const tRoomID kMars03 = 4;
-const tRoomID kMars04 = 5;
-const tRoomID kMars05 = 6;
-const tRoomID kMars06 = 7;
-const tRoomID kMars07 = 8;
-const tRoomID kMars08 = 9;
-const tRoomID kMars09 = 10;
-const tRoomID kMars10 = 11;
-const tRoomID kMars11 = 12;
-const tRoomID kMars12 = 13;
-const tRoomID kMars13 = 14;
-const tRoomID kMars14 = 15;
-const tRoomID kMars15 = 16;
-const tRoomID kMars16 = 17;
-const tRoomID kMars17 = 18;
-const tRoomID kMars18 = 19;
-const tRoomID kMars19 = 20;
-const tRoomID kMars20 = 21;
-const tRoomID kMars21 = 22;
-const tRoomID kMars22 = 23;
-const tRoomID kMars23 = 24;
-const tRoomID kMars24 = 25;
-const tRoomID kMars25 = 26;
-const tRoomID kMars26 = 27;
-const tRoomID kMars27 = 28;
-const tRoomID kMars28 = 29;
-const tRoomID kMars29 = 30;
-const tRoomID kMars30 = 31;
-const tRoomID kMars31 = 32;
-const tRoomID kMars31South = 33;
-const tRoomID kMars32 = 34;
-const tRoomID kMars33 = 35;
-const tRoomID kMars33North = 36;
-const tRoomID kMars34 = 37;
-const tRoomID kMars35 = 38;
-const tRoomID kMars36 = 39;
-const tRoomID kMars37 = 40;
-const tRoomID kMars38 = 41;
-const tRoomID kMars39 = 42;
-const tRoomID kMars41 = 43;
-const tRoomID kMars42 = 44;
-const tRoomID kMars43 = 45;
-const tRoomID kMars44 = 46;
-const tRoomID kMars45 = 47;
-const tRoomID kMars46 = 48;
-const tRoomID kMars47 = 49;
-const tRoomID kMars48 = 50;
-const tRoomID kMars49 = 51;
-const tRoomID kMars50 = 52;
-const tRoomID kMars51 = 53;
-const tRoomID kMars52 = 54;
-const tRoomID kMars54 = 55;
-const tRoomID kMars56 = 56;
-const tRoomID kMars58 = 57;
-const tRoomID kMars60 = 58;
-const tRoomID kMarsRobotShuttle = 59;
-const tRoomID kMarsMaze004 = 60;
-const tRoomID kMarsMaze005 = 61;
-const tRoomID kMarsMaze006 = 62;
-const tRoomID kMarsMaze007 = 63;
-const tRoomID kMarsMaze008 = 64;
-const tRoomID kMarsMaze009 = 65;
-const tRoomID kMarsMaze010 = 66;
-const tRoomID kMarsMaze011 = 67;
-const tRoomID kMarsMaze012 = 68;
-const tRoomID kMarsMaze015 = 69;
-const tRoomID kMarsMaze016 = 70;
-const tRoomID kMarsMaze017 = 71;
-const tRoomID kMarsMaze018 = 72;
-const tRoomID kMarsMaze019 = 73;
-const tRoomID kMarsMaze020 = 74;
-const tRoomID kMarsMaze021 = 75;
-const tRoomID kMarsMaze022 = 76;
-const tRoomID kMarsMaze023 = 77;
-const tRoomID kMarsMaze024 = 78;
-const tRoomID kMarsMaze025 = 79;
-const tRoomID kMarsMaze026 = 80;
-const tRoomID kMarsMaze027 = 81;
-const tRoomID kMarsMaze028 = 82;
-const tRoomID kMarsMaze031 = 83;
-const tRoomID kMarsMaze032 = 84;
-const tRoomID kMarsMaze033 = 85;
-const tRoomID kMarsMaze034 = 86;
-const tRoomID kMarsMaze035 = 87;
-const tRoomID kMarsMaze036 = 88;
-const tRoomID kMarsMaze037 = 89;
-const tRoomID kMarsMaze038 = 90;
-const tRoomID kMarsMaze039 = 91;
-const tRoomID kMarsMaze042 = 92;
-const tRoomID kMarsMaze043 = 93;
-const tRoomID kMarsMaze044 = 94;
-const tRoomID kMarsMaze045 = 95;
-const tRoomID kMarsMaze046 = 96;
-const tRoomID kMarsMaze047 = 97;
-const tRoomID kMarsMaze049 = 98;
-const tRoomID kMarsMaze050 = 99;
-const tRoomID kMarsMaze051 = 100;
-const tRoomID kMarsMaze052 = 101;
-const tRoomID kMarsMaze053 = 102;
-const tRoomID kMarsMaze054 = 103;
-const tRoomID kMarsMaze055 = 104;
-const tRoomID kMarsMaze056 = 105;
-const tRoomID kMarsMaze057 = 106;
-const tRoomID kMarsMaze058 = 107;
-const tRoomID kMarsMaze059 = 108;
-const tRoomID kMarsMaze060 = 109;
-const tRoomID kMarsMaze061 = 110;
-const tRoomID kMarsMaze063 = 111;
-const tRoomID kMarsMaze064 = 112;
-const tRoomID kMarsMaze065 = 113;
-const tRoomID kMarsMaze066 = 114;
-const tRoomID kMarsMaze067 = 115;
-const tRoomID kMarsMaze068 = 116;
-const tRoomID kMarsMaze069 = 117;
-const tRoomID kMarsMaze070 = 118;
-const tRoomID kMarsMaze071 = 119;
-const tRoomID kMarsMaze072 = 120;
-const tRoomID kMarsMaze074 = 121;
-const tRoomID kMarsMaze076 = 122;
-const tRoomID kMarsMaze078 = 123;
-const tRoomID kMarsMaze079 = 124;
-const tRoomID kMarsMaze081 = 125;
-const tRoomID kMarsMaze083 = 126;
-const tRoomID kMarsMaze084 = 127;
-const tRoomID kMarsMaze085 = 128;
-const tRoomID kMarsMaze086 = 129;
-const tRoomID kMarsMaze087 = 130;
-const tRoomID kMarsMaze088 = 131;
-const tRoomID kMarsMaze089 = 132;
-const tRoomID kMarsMaze090 = 133;
-const tRoomID kMarsMaze091 = 134;
-const tRoomID kMarsMaze092 = 135;
-const tRoomID kMarsMaze093 = 136;
-const tRoomID kMarsMaze098 = 137;
-const tRoomID kMarsMaze099 = 138;
-const tRoomID kMarsMaze100 = 139;
-const tRoomID kMarsMaze101 = 140;
-const tRoomID kMarsMaze104 = 141;
-const tRoomID kMarsMaze105 = 142;
-const tRoomID kMarsMaze106 = 143;
-const tRoomID kMarsMaze107 = 144;
-const tRoomID kMarsMaze108 = 145;
-const tRoomID kMarsMaze111 = 146;
-const tRoomID kMarsMaze113 = 147;
-const tRoomID kMarsMaze114 = 148;
-const tRoomID kMarsMaze115 = 149;
-const tRoomID kMarsMaze116 = 150;
-const tRoomID kMarsMaze117 = 151;
-const tRoomID kMarsMaze118 = 152;
-const tRoomID kMarsMaze119 = 153;
-const tRoomID kMarsMaze120 = 154;
-const tRoomID kMarsMaze121 = 155;
-const tRoomID kMarsMaze122 = 156;
-const tRoomID kMarsMaze123 = 157;
-const tRoomID kMarsMaze124 = 158;
-const tRoomID kMarsMaze125 = 159;
-const tRoomID kMarsMaze126 = 160;
-const tRoomID kMarsMaze127 = 161;
-const tRoomID kMarsMaze128 = 162;
-const tRoomID kMarsMaze129 = 163;
-const tRoomID kMarsMaze130 = 164;
-const tRoomID kMarsMaze131 = 165;
-const tRoomID kMarsMaze132 = 166;
-const tRoomID kMarsMaze133 = 167;
-const tRoomID kMarsMaze136 = 168;
-const tRoomID kMarsMaze137 = 169;
-const tRoomID kMarsMaze138 = 170;
-const tRoomID kMarsMaze139 = 171;
-const tRoomID kMarsMaze140 = 172;
-const tRoomID kMarsMaze141 = 173;
-const tRoomID kMarsMaze142 = 174;
-const tRoomID kMarsMaze143 = 175;
-const tRoomID kMarsMaze144 = 176;
-const tRoomID kMarsMaze145 = 177;
-const tRoomID kMarsMaze146 = 178;
-const tRoomID kMarsMaze147 = 179;
-const tRoomID kMarsMaze148 = 180;
-const tRoomID kMarsMaze149 = 181;
-const tRoomID kMarsMaze152 = 182;
-const tRoomID kMarsMaze153 = 183;
-const tRoomID kMarsMaze154 = 184;
-const tRoomID kMarsMaze155 = 185;
-const tRoomID kMarsMaze156 = 186;
-const tRoomID kMarsMaze157 = 187;
-const tRoomID kMarsMaze159 = 188;
-const tRoomID kMarsMaze160 = 189;
-const tRoomID kMarsMaze161 = 190;
-const tRoomID kMarsMaze162 = 191;
-const tRoomID kMarsMaze163 = 192;
-const tRoomID kMarsMaze164 = 193;
-const tRoomID kMarsMaze165 = 194;
-const tRoomID kMarsMaze166 = 195;
-const tRoomID kMarsMaze167 = 196;
-const tRoomID kMarsMaze168 = 197;
-const tRoomID kMarsMaze169 = 198;
-const tRoomID kMarsMaze170 = 199;
-const tRoomID kMarsMaze171 = 200;
-const tRoomID kMarsMaze172 = 201;
-const tRoomID kMarsMaze173 = 202;
-const tRoomID kMarsMaze174 = 203;
-const tRoomID kMarsMaze175 = 204;
-const tRoomID kMarsMaze177 = 205;
-const tRoomID kMarsMaze178 = 206;
-const tRoomID kMarsMaze179 = 207;
-const tRoomID kMarsMaze180 = 208;
-const tRoomID kMarsMaze181 = 209;
-const tRoomID kMarsMaze182 = 210;
-const tRoomID kMarsMaze183 = 211;
-const tRoomID kMarsMaze184 = 212;
-const tRoomID kMarsMaze187 = 213;
-const tRoomID kMarsMaze188 = 214;
-const tRoomID kMarsMaze189 = 215;
-const tRoomID kMarsMaze190 = 216;
-const tRoomID kMarsMaze191 = 217;
-const tRoomID kMarsMaze192 = 218;
-const tRoomID kMarsMaze193 = 219;
-const tRoomID kMarsMaze194 = 220;
-const tRoomID kMarsMaze195 = 221;
-const tRoomID kMarsMaze198 = 222;
-const tRoomID kMarsMaze199 = 223;
-const tRoomID kMarsMaze200 = 224;
-const tRoomID kMarsDeathRoom = 225;
+const RoomID kMars0A = 0;
+const RoomID kMars00 = 1;
+const RoomID kMars01 = 2;
+const RoomID kMars02 = 3;
+const RoomID kMars03 = 4;
+const RoomID kMars04 = 5;
+const RoomID kMars05 = 6;
+const RoomID kMars06 = 7;
+const RoomID kMars07 = 8;
+const RoomID kMars08 = 9;
+const RoomID kMars09 = 10;
+const RoomID kMars10 = 11;
+const RoomID kMars11 = 12;
+const RoomID kMars12 = 13;
+const RoomID kMars13 = 14;
+const RoomID kMars14 = 15;
+const RoomID kMars15 = 16;
+const RoomID kMars16 = 17;
+const RoomID kMars17 = 18;
+const RoomID kMars18 = 19;
+const RoomID kMars19 = 20;
+const RoomID kMars20 = 21;
+const RoomID kMars21 = 22;
+const RoomID kMars22 = 23;
+const RoomID kMars23 = 24;
+const RoomID kMars24 = 25;
+const RoomID kMars25 = 26;
+const RoomID kMars26 = 27;
+const RoomID kMars27 = 28;
+const RoomID kMars28 = 29;
+const RoomID kMars29 = 30;
+const RoomID kMars30 = 31;
+const RoomID kMars31 = 32;
+const RoomID kMars31South = 33;
+const RoomID kMars32 = 34;
+const RoomID kMars33 = 35;
+const RoomID kMars33North = 36;
+const RoomID kMars34 = 37;
+const RoomID kMars35 = 38;
+const RoomID kMars36 = 39;
+const RoomID kMars37 = 40;
+const RoomID kMars38 = 41;
+const RoomID kMars39 = 42;
+const RoomID kMars41 = 43;
+const RoomID kMars42 = 44;
+const RoomID kMars43 = 45;
+const RoomID kMars44 = 46;
+const RoomID kMars45 = 47;
+const RoomID kMars46 = 48;
+const RoomID kMars47 = 49;
+const RoomID kMars48 = 50;
+const RoomID kMars49 = 51;
+const RoomID kMars50 = 52;
+const RoomID kMars51 = 53;
+const RoomID kMars52 = 54;
+const RoomID kMars54 = 55;
+const RoomID kMars56 = 56;
+const RoomID kMars58 = 57;
+const RoomID kMars60 = 58;
+const RoomID kMarsRobotShuttle = 59;
+const RoomID kMarsMaze004 = 60;
+const RoomID kMarsMaze005 = 61;
+const RoomID kMarsMaze006 = 62;
+const RoomID kMarsMaze007 = 63;
+const RoomID kMarsMaze008 = 64;
+const RoomID kMarsMaze009 = 65;
+const RoomID kMarsMaze010 = 66;
+const RoomID kMarsMaze011 = 67;
+const RoomID kMarsMaze012 = 68;
+const RoomID kMarsMaze015 = 69;
+const RoomID kMarsMaze016 = 70;
+const RoomID kMarsMaze017 = 71;
+const RoomID kMarsMaze018 = 72;
+const RoomID kMarsMaze019 = 73;
+const RoomID kMarsMaze020 = 74;
+const RoomID kMarsMaze021 = 75;
+const RoomID kMarsMaze022 = 76;
+const RoomID kMarsMaze023 = 77;
+const RoomID kMarsMaze024 = 78;
+const RoomID kMarsMaze025 = 79;
+const RoomID kMarsMaze026 = 80;
+const RoomID kMarsMaze027 = 81;
+const RoomID kMarsMaze028 = 82;
+const RoomID kMarsMaze031 = 83;
+const RoomID kMarsMaze032 = 84;
+const RoomID kMarsMaze033 = 85;
+const RoomID kMarsMaze034 = 86;
+const RoomID kMarsMaze035 = 87;
+const RoomID kMarsMaze036 = 88;
+const RoomID kMarsMaze037 = 89;
+const RoomID kMarsMaze038 = 90;
+const RoomID kMarsMaze039 = 91;
+const RoomID kMarsMaze042 = 92;
+const RoomID kMarsMaze043 = 93;
+const RoomID kMarsMaze044 = 94;
+const RoomID kMarsMaze045 = 95;
+const RoomID kMarsMaze046 = 96;
+const RoomID kMarsMaze047 = 97;
+const RoomID kMarsMaze049 = 98;
+const RoomID kMarsMaze050 = 99;
+const RoomID kMarsMaze051 = 100;
+const RoomID kMarsMaze052 = 101;
+const RoomID kMarsMaze053 = 102;
+const RoomID kMarsMaze054 = 103;
+const RoomID kMarsMaze055 = 104;
+const RoomID kMarsMaze056 = 105;
+const RoomID kMarsMaze057 = 106;
+const RoomID kMarsMaze058 = 107;
+const RoomID kMarsMaze059 = 108;
+const RoomID kMarsMaze060 = 109;
+const RoomID kMarsMaze061 = 110;
+const RoomID kMarsMaze063 = 111;
+const RoomID kMarsMaze064 = 112;
+const RoomID kMarsMaze065 = 113;
+const RoomID kMarsMaze066 = 114;
+const RoomID kMarsMaze067 = 115;
+const RoomID kMarsMaze068 = 116;
+const RoomID kMarsMaze069 = 117;
+const RoomID kMarsMaze070 = 118;
+const RoomID kMarsMaze071 = 119;
+const RoomID kMarsMaze072 = 120;
+const RoomID kMarsMaze074 = 121;
+const RoomID kMarsMaze076 = 122;
+const RoomID kMarsMaze078 = 123;
+const RoomID kMarsMaze079 = 124;
+const RoomID kMarsMaze081 = 125;
+const RoomID kMarsMaze083 = 126;
+const RoomID kMarsMaze084 = 127;
+const RoomID kMarsMaze085 = 128;
+const RoomID kMarsMaze086 = 129;
+const RoomID kMarsMaze087 = 130;
+const RoomID kMarsMaze088 = 131;
+const RoomID kMarsMaze089 = 132;
+const RoomID kMarsMaze090 = 133;
+const RoomID kMarsMaze091 = 134;
+const RoomID kMarsMaze092 = 135;
+const RoomID kMarsMaze093 = 136;
+const RoomID kMarsMaze098 = 137;
+const RoomID kMarsMaze099 = 138;
+const RoomID kMarsMaze100 = 139;
+const RoomID kMarsMaze101 = 140;
+const RoomID kMarsMaze104 = 141;
+const RoomID kMarsMaze105 = 142;
+const RoomID kMarsMaze106 = 143;
+const RoomID kMarsMaze107 = 144;
+const RoomID kMarsMaze108 = 145;
+const RoomID kMarsMaze111 = 146;
+const RoomID kMarsMaze113 = 147;
+const RoomID kMarsMaze114 = 148;
+const RoomID kMarsMaze115 = 149;
+const RoomID kMarsMaze116 = 150;
+const RoomID kMarsMaze117 = 151;
+const RoomID kMarsMaze118 = 152;
+const RoomID kMarsMaze119 = 153;
+const RoomID kMarsMaze120 = 154;
+const RoomID kMarsMaze121 = 155;
+const RoomID kMarsMaze122 = 156;
+const RoomID kMarsMaze123 = 157;
+const RoomID kMarsMaze124 = 158;
+const RoomID kMarsMaze125 = 159;
+const RoomID kMarsMaze126 = 160;
+const RoomID kMarsMaze127 = 161;
+const RoomID kMarsMaze128 = 162;
+const RoomID kMarsMaze129 = 163;
+const RoomID kMarsMaze130 = 164;
+const RoomID kMarsMaze131 = 165;
+const RoomID kMarsMaze132 = 166;
+const RoomID kMarsMaze133 = 167;
+const RoomID kMarsMaze136 = 168;
+const RoomID kMarsMaze137 = 169;
+const RoomID kMarsMaze138 = 170;
+const RoomID kMarsMaze139 = 171;
+const RoomID kMarsMaze140 = 172;
+const RoomID kMarsMaze141 = 173;
+const RoomID kMarsMaze142 = 174;
+const RoomID kMarsMaze143 = 175;
+const RoomID kMarsMaze144 = 176;
+const RoomID kMarsMaze145 = 177;
+const RoomID kMarsMaze146 = 178;
+const RoomID kMarsMaze147 = 179;
+const RoomID kMarsMaze148 = 180;
+const RoomID kMarsMaze149 = 181;
+const RoomID kMarsMaze152 = 182;
+const RoomID kMarsMaze153 = 183;
+const RoomID kMarsMaze154 = 184;
+const RoomID kMarsMaze155 = 185;
+const RoomID kMarsMaze156 = 186;
+const RoomID kMarsMaze157 = 187;
+const RoomID kMarsMaze159 = 188;
+const RoomID kMarsMaze160 = 189;
+const RoomID kMarsMaze161 = 190;
+const RoomID kMarsMaze162 = 191;
+const RoomID kMarsMaze163 = 192;
+const RoomID kMarsMaze164 = 193;
+const RoomID kMarsMaze165 = 194;
+const RoomID kMarsMaze166 = 195;
+const RoomID kMarsMaze167 = 196;
+const RoomID kMarsMaze168 = 197;
+const RoomID kMarsMaze169 = 198;
+const RoomID kMarsMaze170 = 199;
+const RoomID kMarsMaze171 = 200;
+const RoomID kMarsMaze172 = 201;
+const RoomID kMarsMaze173 = 202;
+const RoomID kMarsMaze174 = 203;
+const RoomID kMarsMaze175 = 204;
+const RoomID kMarsMaze177 = 205;
+const RoomID kMarsMaze178 = 206;
+const RoomID kMarsMaze179 = 207;
+const RoomID kMarsMaze180 = 208;
+const RoomID kMarsMaze181 = 209;
+const RoomID kMarsMaze182 = 210;
+const RoomID kMarsMaze183 = 211;
+const RoomID kMarsMaze184 = 212;
+const RoomID kMarsMaze187 = 213;
+const RoomID kMarsMaze188 = 214;
+const RoomID kMarsMaze189 = 215;
+const RoomID kMarsMaze190 = 216;
+const RoomID kMarsMaze191 = 217;
+const RoomID kMarsMaze192 = 218;
+const RoomID kMarsMaze193 = 219;
+const RoomID kMarsMaze194 = 220;
+const RoomID kMarsMaze195 = 221;
+const RoomID kMarsMaze198 = 222;
+const RoomID kMarsMaze199 = 223;
+const RoomID kMarsMaze200 = 224;
+const RoomID kMarsDeathRoom = 225;
 
 //	Hot Spot Activation IDs.
 
-const tHotSpotActivationID kActivationReadyForKiosk = 1;
-const tHotSpotActivationID kActivationKioskChoice = 2;
-const tHotSpotActivationID kActivationTunnelMapReady = 3;
-const tHotSpotActivationID kActivateMarsPodClosed = 4;
-const tHotSpotActivationID kActivateMarsPodOpen = 5;
-const tHotSpotActivationID kActivateReadyToPressurizeAirlock = 6;
-const tHotSpotActivationID kActivateAirlockPressurized = 7;
-const tHotSpotActivationID kActivateMaskOnHolder = 8;
-const tHotSpotActivationID kActivateMaskOnFiller = 9;
-const tHotSpotActivationID kActivateReactorPlatformOut = 10;
-const tHotSpotActivationID kActivateReactorPlatformIn = 11;
-const tHotSpotActivationID kActivateReactorAskLowerScreen = 12;
-const tHotSpotActivationID kActivateReactorReadyForNitrogen = 13;
-const tHotSpotActivationID kActivateReactorReadyForCrowBar = 14;
-const tHotSpotActivationID kActivateReactorAskOperation = 15;
-const tHotSpotActivationID kActivateReactorRanEvaluation = 16;
-const tHotSpotActivationID kActivateReactorRanDiagnostics = 17;
-const tHotSpotActivationID kActivateReactorAnalyzed = 18;
-const tHotSpotActivationID kActivateReactorInstructions = 19;
-const tHotSpotActivationID kActivateReactorInGame = 20;
-const tHotSpotActivationID kActivateReactorBombSafe = 21;
-const tHotSpotActivationID kActivateReactorBombExposed = 22;
-const tHotSpotActivationID kActivationRobotHeadClosed = 23;
-const tHotSpotActivationID kActivationRobotHeadOpen = 24;
+const HotSpotActivationID kActivationReadyForKiosk = 1;
+const HotSpotActivationID kActivationKioskChoice = 2;
+const HotSpotActivationID kActivationTunnelMapReady = 3;
+const HotSpotActivationID kActivateMarsPodClosed = 4;
+const HotSpotActivationID kActivateMarsPodOpen = 5;
+const HotSpotActivationID kActivateReadyToPressurizeAirlock = 6;
+const HotSpotActivationID kActivateAirlockPressurized = 7;
+const HotSpotActivationID kActivateMaskOnHolder = 8;
+const HotSpotActivationID kActivateMaskOnFiller = 9;
+const HotSpotActivationID kActivateReactorPlatformOut = 10;
+const HotSpotActivationID kActivateReactorPlatformIn = 11;
+const HotSpotActivationID kActivateReactorAskLowerScreen = 12;
+const HotSpotActivationID kActivateReactorReadyForNitrogen = 13;
+const HotSpotActivationID kActivateReactorReadyForCrowBar = 14;
+const HotSpotActivationID kActivateReactorAskOperation = 15;
+const HotSpotActivationID kActivateReactorRanEvaluation = 16;
+const HotSpotActivationID kActivateReactorRanDiagnostics = 17;
+const HotSpotActivationID kActivateReactorAnalyzed = 18;
+const HotSpotActivationID kActivateReactorInstructions = 19;
+const HotSpotActivationID kActivateReactorInGame = 20;
+const HotSpotActivationID kActivateReactorBombSafe = 21;
+const HotSpotActivationID kActivateReactorBombExposed = 22;
+const HotSpotActivationID kActivationRobotHeadClosed = 23;
+const HotSpotActivationID kActivationRobotHeadOpen = 24;
 
 //	Hot Spot IDs.
 
-const tHotSpotID kMars11NorthKioskSpotID = 5000;
-const tHotSpotID kMars11NorthKioskSightsSpotID = 5001;
-const tHotSpotID kMars11NorthKioskColonySpotID = 5002;
-const tHotSpotID kMars12NorthKioskSpotID = 5003;
-const tHotSpotID kMars12NorthKioskSightsSpotID = 5004;
-const tHotSpotID kMars12NorthKioskColonySpotID = 5005;
-const tHotSpotID kMars31SouthSpotID = 5006;
-const tHotSpotID kMars31SouthOutSpotID = 5007;
-const tHotSpotID kMars31SouthCardSpotID = 5008;
-const tHotSpotID kMars33NorthSpotID = 5009;
-const tHotSpotID kMars33NorthOutSpotID = 5010;
-const tHotSpotID kMars33NorthMonitorSpotID = 5011;
-const tHotSpotID kMars34NorthCardDropSpotID = 5012;
-const tHotSpotID kMars34SouthOpenStorageSpotID = 5013;
-const tHotSpotID kMars34SouthCloseStorageSpotID = 5014;
-const tHotSpotID kMars34SouthCrowbarSpotID = 5015;
-const tHotSpotID kMars35EastPressurizeSpotID = 5016;
-const tHotSpotID kMars35EastSpinSpotID = 5017;
-const tHotSpotID kMars35WestPressurizeSpotID = 5018;
-const tHotSpotID kMars35WestSpinSpotID = 5019;
-const tHotSpotID kMars45NorthOpenStorageSpotID = 5020;
-const tHotSpotID kMars45NorthCloseStorageSpotID = 5021;
-const tHotSpotID kMars45NorthCrowbarSpotID = 5022;
-const tHotSpotID kAttackRobotHotSpotID = 5023;
-const tHotSpotID kMars49AirMaskSpotID = 5024;
-const tHotSpotID kMars49AirMaskFilledSpotID = 5025;
-const tHotSpotID kMars49AirFillingDropSpotID = 5026;
-const tHotSpotID kMars52MoveLeftSpotID = 5027;
-const tHotSpotID kMars52MoveRightSpotID = 5028;
-const tHotSpotID kMars52ExtractSpotID = 5029;
-const tHotSpotID kMars53RetractSpotID = 5030;
-const tHotSpotID kMars54MoveLeftSpotID = 5031;
-const tHotSpotID kMars54MoveRightSpotID = 5032;
-const tHotSpotID kMars54ExtractSpotID = 5033;
-const tHotSpotID kMars55RetractSpotID = 5034;
-const tHotSpotID kMars56MoveLeftSpotID = 5035;
-const tHotSpotID kMars56MoveRightSpotID = 5036;
-const tHotSpotID kMars56ExtractSpotID = 5037;
-const tHotSpotID kMars57RetractSpotID = 5038;
-const tHotSpotID kMars57LowerScreenSpotID = 5039;
-const tHotSpotID kMars57Retract2SpotID = 5040;
-const tHotSpotID kMars57DropNitrogenSpotID = 5041;
-const tHotSpotID kMars57DropCrowBarSpotID = 5042;
-const tHotSpotID kMars57CantOpenPanelSpotID = 5043;
-const tHotSpotID kMars57ShieldEvaluationSpotID = 5044;
-const tHotSpotID kMars57MeasureOutputSpotID = 5045;
-const tHotSpotID kMars57RunDiagnosticsSpotID = 5046;
-const tHotSpotID kMars57BackToOperationMenuSpotID = 5047;
-const tHotSpotID kMars57AnalyzeObjectSpotID = 5048;
-const tHotSpotID kMars57RemoveObjectMenuSpotID = 5049;
-const tHotSpotID kMars57CircuitLinkSpotID = 5050;
-const tHotSpotID kMars57CancelCircuitLinkSpotID = 5051;
-const tHotSpotID kMars57GameInstructionsSpotID = 5052;
-const tHotSpotID kMars57UndoMoveSpotID = 5053;
-const tHotSpotID kMars57RedMoveSpotID = 5054;
-const tHotSpotID kMars57YellowMoveSpotID = 5055;
-const tHotSpotID kMars57GreenMoveSpotID = 5056;
-const tHotSpotID kMars57BlueMoveSpotID = 5057;
-const tHotSpotID kMars57PurpleMoveSpotID = 5058;
-const tHotSpotID kMars57LowerScreenSafelySpotID = 5059;
-const tHotSpotID kMars57GrabBombSpotID = 5060;
-const tHotSpotID kMars58MoveLeftSpotID = 5061;
-const tHotSpotID kMars58MoveRightSpotID = 5062;
-const tHotSpotID kMars58ExtractSpotID = 5063;
-const tHotSpotID kMars59RetractSpotID = 5064;
-const tHotSpotID kMars60EastPressurizeSpotID = 5065;
-const tHotSpotID kMars60EastSpinSpotID = 5066;
-const tHotSpotID kMars60WestPressurizeSpotID = 5067;
-const tHotSpotID kMars60WestSpinSpotID = 5068;
-const tHotSpotID kRobotShuttleOpenHeadSpotID = 5069;
-const tHotSpotID kRobotShuttleMapChipSpotID = 5070;
-const tHotSpotID kRobotShuttleOpticalChipSpotID = 5071;
-const tHotSpotID kRobotShuttleShieldChipSpotID = 5072;
+const HotSpotID kMars11NorthKioskSpotID = 5000;
+const HotSpotID kMars11NorthKioskSightsSpotID = 5001;
+const HotSpotID kMars11NorthKioskColonySpotID = 5002;
+const HotSpotID kMars12NorthKioskSpotID = 5003;
+const HotSpotID kMars12NorthKioskSightsSpotID = 5004;
+const HotSpotID kMars12NorthKioskColonySpotID = 5005;
+const HotSpotID kMars31SouthSpotID = 5006;
+const HotSpotID kMars31SouthOutSpotID = 5007;
+const HotSpotID kMars31SouthCardSpotID = 5008;
+const HotSpotID kMars33NorthSpotID = 5009;
+const HotSpotID kMars33NorthOutSpotID = 5010;
+const HotSpotID kMars33NorthMonitorSpotID = 5011;
+const HotSpotID kMars34NorthCardDropSpotID = 5012;
+const HotSpotID kMars34SouthOpenStorageSpotID = 5013;
+const HotSpotID kMars34SouthCloseStorageSpotID = 5014;
+const HotSpotID kMars34SouthCrowbarSpotID = 5015;
+const HotSpotID kMars35EastPressurizeSpotID = 5016;
+const HotSpotID kMars35EastSpinSpotID = 5017;
+const HotSpotID kMars35WestPressurizeSpotID = 5018;
+const HotSpotID kMars35WestSpinSpotID = 5019;
+const HotSpotID kMars45NorthOpenStorageSpotID = 5020;
+const HotSpotID kMars45NorthCloseStorageSpotID = 5021;
+const HotSpotID kMars45NorthCrowbarSpotID = 5022;
+const HotSpotID kAttackRobotHotSpotID = 5023;
+const HotSpotID kMars49AirMaskSpotID = 5024;
+const HotSpotID kMars49AirMaskFilledSpotID = 5025;
+const HotSpotID kMars49AirFillingDropSpotID = 5026;
+const HotSpotID kMars52MoveLeftSpotID = 5027;
+const HotSpotID kMars52MoveRightSpotID = 5028;
+const HotSpotID kMars52ExtractSpotID = 5029;
+const HotSpotID kMars53RetractSpotID = 5030;
+const HotSpotID kMars54MoveLeftSpotID = 5031;
+const HotSpotID kMars54MoveRightSpotID = 5032;
+const HotSpotID kMars54ExtractSpotID = 5033;
+const HotSpotID kMars55RetractSpotID = 5034;
+const HotSpotID kMars56MoveLeftSpotID = 5035;
+const HotSpotID kMars56MoveRightSpotID = 5036;
+const HotSpotID kMars56ExtractSpotID = 5037;
+const HotSpotID kMars57RetractSpotID = 5038;
+const HotSpotID kMars57LowerScreenSpotID = 5039;
+const HotSpotID kMars57Retract2SpotID = 5040;
+const HotSpotID kMars57DropNitrogenSpotID = 5041;
+const HotSpotID kMars57DropCrowBarSpotID = 5042;
+const HotSpotID kMars57CantOpenPanelSpotID = 5043;
+const HotSpotID kMars57ShieldEvaluationSpotID = 5044;
+const HotSpotID kMars57MeasureOutputSpotID = 5045;
+const HotSpotID kMars57RunDiagnosticsSpotID = 5046;
+const HotSpotID kMars57BackToOperationMenuSpotID = 5047;
+const HotSpotID kMars57AnalyzeObjectSpotID = 5048;
+const HotSpotID kMars57RemoveObjectMenuSpotID = 5049;
+const HotSpotID kMars57CircuitLinkSpotID = 5050;
+const HotSpotID kMars57CancelCircuitLinkSpotID = 5051;
+const HotSpotID kMars57GameInstructionsSpotID = 5052;
+const HotSpotID kMars57UndoMoveSpotID = 5053;
+const HotSpotID kMars57RedMoveSpotID = 5054;
+const HotSpotID kMars57YellowMoveSpotID = 5055;
+const HotSpotID kMars57GreenMoveSpotID = 5056;
+const HotSpotID kMars57BlueMoveSpotID = 5057;
+const HotSpotID kMars57PurpleMoveSpotID = 5058;
+const HotSpotID kMars57LowerScreenSafelySpotID = 5059;
+const HotSpotID kMars57GrabBombSpotID = 5060;
+const HotSpotID kMars58MoveLeftSpotID = 5061;
+const HotSpotID kMars58MoveRightSpotID = 5062;
+const HotSpotID kMars58ExtractSpotID = 5063;
+const HotSpotID kMars59RetractSpotID = 5064;
+const HotSpotID kMars60EastPressurizeSpotID = 5065;
+const HotSpotID kMars60EastSpinSpotID = 5066;
+const HotSpotID kMars60WestPressurizeSpotID = 5067;
+const HotSpotID kMars60WestSpinSpotID = 5068;
+const HotSpotID kRobotShuttleOpenHeadSpotID = 5069;
+const HotSpotID kRobotShuttleMapChipSpotID = 5070;
+const HotSpotID kRobotShuttleOpticalChipSpotID = 5071;
+const HotSpotID kRobotShuttleShieldChipSpotID = 5072;
 
 //	Extra sequence IDs.
 
-const tExtraID kMarsArrivalFromTSA = 0;
-const tExtraID kMars0AWatchShuttleDepart = 1;
-const tExtraID kRobotThrowsPlayer = 2;
-const tExtraID kMarsInfoKioskIntro = 3;
-const tExtraID kMarsColonyInfo = 4;
-const tExtraID kMarsSightsInfo = 5;
-const tExtraID kRobotOnWayToShuttle = 6;
-const tExtraID kMars31SouthZoomInNoCard = 7;
-const tExtraID kMars31SouthViewNoCard = 8;
-const tExtraID kMars31SouthZoomOutNoCard = 9;
-const tExtraID kMars31SouthZoomViewNoCard = 10;
-const tExtraID kMars33SlideShow1 = 11;
-const tExtraID kMars33SlideShow2 = 12;
-const tExtraID kMars33SlideShow3 = 13;
-const tExtraID kMars33SlideShow4 = 14;
-const tExtraID kMars34SpotOpenWithBar = 15;
-const tExtraID kMars34SpotCloseWithBar = 16;
-const tExtraID kMars34SpotOpenNoBar = 17;
-const tExtraID kMars34SpotCloseNoBar = 18;
-const tExtraID kMars34ViewOpenWithBar = 19;
-const tExtraID kMars34ViewOpenNoBar = 20;
-const tExtraID kMars34NorthPodGreeting = 21;
-const tExtraID kMarsTurnOnPod = 22;
-const tExtraID kMarsTakePodToMars45 = 23;
-const tExtraID kMars35WestSpinAirlockToEast = 24;
-const tExtraID kMars35EastSpinAirlockToWest = 25;
-const tExtraID kMars45SpotOpenWithBar = 26;
-const tExtraID kMars45SpotCloseWithBar = 27;
-const tExtraID kMars45SpotOpenNoBar = 28;
-const tExtraID kMars45SpotCloseNoBar = 29;
-const tExtraID kMars45ViewOpenWithBar = 30;
-const tExtraID kMars45ViewOpenNoBar = 31;
-const tExtraID kMars48RobotApproaches = 32;
-const tExtraID kMars48RobotKillsPlayer = 33;
-const tExtraID kMars48RobotLoops = 34;
-const tExtraID kMars48RobotView = 35;
-const tExtraID kMars48RobotDefends = 36;
-const tExtraID kMars49SouthViewMaskFilling = 37;
-const tExtraID kMars52SpinLeft = 38;
-const tExtraID kMars52SpinRight = 39;
-const tExtraID kMars52Extend = 40;
-const tExtraID kMars53Retract = 41;
-const tExtraID kMars54SpinLeft = 42;
-const tExtraID kMars54SpinRight = 43;
-const tExtraID kMars54Extend = 44;
-const tExtraID kMars55Retract = 45;
-const tExtraID kMars56SpinLeft = 46;
-const tExtraID kMars56SpinRight = 47;
-const tExtraID kMars56ExtendWithBomb = 48;
-const tExtraID kMars56ExtendNoBomb = 49;
-const tExtraID kMars57RetractWithBomb = 50;
-const tExtraID kMars57RetractNoBomb = 51;
-const tExtraID kMars57LowerScreenClosed = 52;
-const tExtraID kMars57CantOpenPanel = 53;
-const tExtraID kMars57FreezeLock = 54;
-const tExtraID kMars57BreakLock = 55;
-const tExtraID kMars57LockFrozenView = 56;
-const tExtraID kMars57ThawLock = 57;
-const tExtraID kMars57OpenPanel = 58;
-const tExtraID kMars57OpenPanelChoices = 59;
-const tExtraID kMars57ShieldEvaluation = 60;
-const tExtraID kMars57MeasureOutput = 61;
-const tExtraID kMars57ShieldOkayLoop = 62;
-const tExtraID kMars57RunDiagnostics = 63;
-const tExtraID kMars57BombExplodes = 64;
-const tExtraID kMars57BombAnalysis = 65;
-const tExtraID kMars57DontLink = 66;
-const tExtraID kMars57CircuitLink = 67;
-const tExtraID kMars57GameLevel1 = 68;
-const tExtraID kMars57GameLevel2 = 69;
-const tExtraID kMars57GameLevel3 = 70;
-const tExtraID kMars57BombExplodesInGame = 71;
-const tExtraID kMars57GameSolved = 72;
-const tExtraID kMars57ExposeBomb = 73;
-const tExtraID kMars57BackToNormal = 74;
-const tExtraID kMars57ViewOpenNoBomb = 75;
-const tExtraID kMars58SpinLeft = 76;
-const tExtraID kMars58SpinRight = 77;
-const tExtraID kMars58Extend = 78;
-const tExtraID kMars59Retract = 79;
-const tExtraID kMars60WestSpinAirlockToEast = 80;
-const tExtraID kMars60EastSpinAirlockToWest = 81;
-const tExtraID kMarsRobotHeadOpen = 82;
-const tExtraID kMarsRobotHeadClose = 83;
-const tExtraID kMarsRobotHead000 = 84;
-const tExtraID kMarsRobotHead001 = 85;
-const tExtraID kMarsRobotHead010 = 86;
-const tExtraID kMarsRobotHead011 = 87;
-const tExtraID kMarsRobotHead100 = 88;
-const tExtraID kMarsRobotHead101 = 89;
-const tExtraID kMarsRobotHead110 = 90;
-const tExtraID kMarsRobotHead111 = 91;
-const tExtraID kMarsMaze007RobotApproach = 92;
-const tExtraID kMarsMaze007RobotLoop = 93;
-const tExtraID kMarsMaze007RobotDeath = 94;
-const tExtraID kMarsMaze015SouthRobotApproach = 95;
-const tExtraID kMarsMaze015SouthRobotLoop = 96;
-const tExtraID kMarsMaze015SouthRobotDeath = 97;
-const tExtraID kMarsMaze101EastRobotApproach = 98;
-const tExtraID kMarsMaze101EastRobotLoop = 99;
-const tExtraID kMarsMaze101EastRobotDeath = 100;
-const tExtraID kMarsMaze104WestLoop = 101;
-const tExtraID kMarsMaze104WestDeath = 102;
-const tExtraID kMarsMaze133SouthApproach = 103;
-const tExtraID kMarsMaze133SouthLoop = 104;
-const tExtraID kMarsMaze133SouthDeath = 105;
-const tExtraID kMarsMaze136NorthApproach = 106;
-const tExtraID kMarsMaze136NorthLoop = 107;
-const tExtraID kMarsMaze136NorthDeath = 108;
-const tExtraID kMarsMaze184WestLoop = 109;
-const tExtraID kMarsMaze184WestDeath = 110;
-const tExtraID kMars200DeathInBucket = 111;
-
-const tResIDType kReactorUndoHilitePICTID = 900;
+const ExtraID kMarsArrivalFromTSA = 0;
+const ExtraID kMars0AWatchShuttleDepart = 1;
+const ExtraID kRobotThrowsPlayer = 2;
+const ExtraID kMarsInfoKioskIntro = 3;
+const ExtraID kMarsColonyInfo = 4;
+const ExtraID kMarsSightsInfo = 5;
+const ExtraID kRobotOnWayToShuttle = 6;
+const ExtraID kMars31SouthZoomInNoCard = 7;
+const ExtraID kMars31SouthViewNoCard = 8;
+const ExtraID kMars31SouthZoomOutNoCard = 9;
+const ExtraID kMars31SouthZoomViewNoCard = 10;
+const ExtraID kMars33SlideShow1 = 11;
+const ExtraID kMars33SlideShow2 = 12;
+const ExtraID kMars33SlideShow3 = 13;
+const ExtraID kMars33SlideShow4 = 14;
+const ExtraID kMars34SpotOpenWithBar = 15;
+const ExtraID kMars34SpotCloseWithBar = 16;
+const ExtraID kMars34SpotOpenNoBar = 17;
+const ExtraID kMars34SpotCloseNoBar = 18;
+const ExtraID kMars34ViewOpenWithBar = 19;
+const ExtraID kMars34ViewOpenNoBar = 20;
+const ExtraID kMars34NorthPodGreeting = 21;
+const ExtraID kMarsTurnOnPod = 22;
+const ExtraID kMarsTakePodToMars45 = 23;
+const ExtraID kMars35WestSpinAirlockToEast = 24;
+const ExtraID kMars35EastSpinAirlockToWest = 25;
+const ExtraID kMars45SpotOpenWithBar = 26;
+const ExtraID kMars45SpotCloseWithBar = 27;
+const ExtraID kMars45SpotOpenNoBar = 28;
+const ExtraID kMars45SpotCloseNoBar = 29;
+const ExtraID kMars45ViewOpenWithBar = 30;
+const ExtraID kMars45ViewOpenNoBar = 31;
+const ExtraID kMars48RobotApproaches = 32;
+const ExtraID kMars48RobotKillsPlayer = 33;
+const ExtraID kMars48RobotLoops = 34;
+const ExtraID kMars48RobotView = 35;
+const ExtraID kMars48RobotDefends = 36;
+const ExtraID kMars49SouthViewMaskFilling = 37;
+const ExtraID kMars52SpinLeft = 38;
+const ExtraID kMars52SpinRight = 39;
+const ExtraID kMars52Extend = 40;
+const ExtraID kMars53Retract = 41;
+const ExtraID kMars54SpinLeft = 42;
+const ExtraID kMars54SpinRight = 43;
+const ExtraID kMars54Extend = 44;
+const ExtraID kMars55Retract = 45;
+const ExtraID kMars56SpinLeft = 46;
+const ExtraID kMars56SpinRight = 47;
+const ExtraID kMars56ExtendWithBomb = 48;
+const ExtraID kMars56ExtendNoBomb = 49;
+const ExtraID kMars57RetractWithBomb = 50;
+const ExtraID kMars57RetractNoBomb = 51;
+const ExtraID kMars57LowerScreenClosed = 52;
+const ExtraID kMars57CantOpenPanel = 53;
+const ExtraID kMars57FreezeLock = 54;
+const ExtraID kMars57BreakLock = 55;
+const ExtraID kMars57LockFrozenView = 56;
+const ExtraID kMars57ThawLock = 57;
+const ExtraID kMars57OpenPanel = 58;
+const ExtraID kMars57OpenPanelChoices = 59;
+const ExtraID kMars57ShieldEvaluation = 60;
+const ExtraID kMars57MeasureOutput = 61;
+const ExtraID kMars57ShieldOkayLoop = 62;
+const ExtraID kMars57RunDiagnostics = 63;
+const ExtraID kMars57BombExplodes = 64;
+const ExtraID kMars57BombAnalysis = 65;
+const ExtraID kMars57DontLink = 66;
+const ExtraID kMars57CircuitLink = 67;
+const ExtraID kMars57GameLevel1 = 68;
+const ExtraID kMars57GameLevel2 = 69;
+const ExtraID kMars57GameLevel3 = 70;
+const ExtraID kMars57BombExplodesInGame = 71;
+const ExtraID kMars57GameSolved = 72;
+const ExtraID kMars57ExposeBomb = 73;
+const ExtraID kMars57BackToNormal = 74;
+const ExtraID kMars57ViewOpenNoBomb = 75;
+const ExtraID kMars58SpinLeft = 76;
+const ExtraID kMars58SpinRight = 77;
+const ExtraID kMars58Extend = 78;
+const ExtraID kMars59Retract = 79;
+const ExtraID kMars60WestSpinAirlockToEast = 80;
+const ExtraID kMars60EastSpinAirlockToWest = 81;
+const ExtraID kMarsRobotHeadOpen = 82;
+const ExtraID kMarsRobotHeadClose = 83;
+const ExtraID kMarsRobotHead000 = 84;
+const ExtraID kMarsRobotHead001 = 85;
+const ExtraID kMarsRobotHead010 = 86;
+const ExtraID kMarsRobotHead011 = 87;
+const ExtraID kMarsRobotHead100 = 88;
+const ExtraID kMarsRobotHead101 = 89;
+const ExtraID kMarsRobotHead110 = 90;
+const ExtraID kMarsRobotHead111 = 91;
+const ExtraID kMarsMaze007RobotApproach = 92;
+const ExtraID kMarsMaze007RobotLoop = 93;
+const ExtraID kMarsMaze007RobotDeath = 94;
+const ExtraID kMarsMaze015SouthRobotApproach = 95;
+const ExtraID kMarsMaze015SouthRobotLoop = 96;
+const ExtraID kMarsMaze015SouthRobotDeath = 97;
+const ExtraID kMarsMaze101EastRobotApproach = 98;
+const ExtraID kMarsMaze101EastRobotLoop = 99;
+const ExtraID kMarsMaze101EastRobotDeath = 100;
+const ExtraID kMarsMaze104WestLoop = 101;
+const ExtraID kMarsMaze104WestDeath = 102;
+const ExtraID kMarsMaze133SouthApproach = 103;
+const ExtraID kMarsMaze133SouthLoop = 104;
+const ExtraID kMarsMaze133SouthDeath = 105;
+const ExtraID kMarsMaze136NorthApproach = 106;
+const ExtraID kMarsMaze136NorthLoop = 107;
+const ExtraID kMarsMaze136NorthDeath = 108;
+const ExtraID kMarsMaze184WestLoop = 109;
+const ExtraID kMarsMaze184WestDeath = 110;
+const ExtraID kMars200DeathInBucket = 111;
+
+const ResIDType kReactorUndoHilitePICTID = 900;
 
 const int16 kMars52Compass = 90;
 const int16 kMars54Compass = 180;
diff --git a/engines/pegasus/neighborhood/mars/energybeam.cpp b/engines/pegasus/neighborhood/mars/energybeam.cpp
index 6a30c48dfb..85a1596b94 100755
--- a/engines/pegasus/neighborhood/mars/energybeam.cpp
+++ b/engines/pegasus/neighborhood/mars/energybeam.cpp
@@ -30,8 +30,8 @@ namespace Pegasus {
 
 const TimeValue kEnergyBeamTime = kOneSecond * kShuttleWeaponScale / 2;
 
-const tCoordType kEnergyBeamOriginH = kShuttleWindowMidH;
-const tCoordType kEnergyBeamOriginV = kShuttleWindowTop + kShuttleWindowHeight;
+const CoordType kEnergyBeamOriginH = kShuttleWindowMidH;
+const CoordType kEnergyBeamOriginV = kShuttleWindowTop + kShuttleWindowHeight;
 
 const float kBeamXOrigin = convertScreenHToSpaceX(kEnergyBeamOriginH, kEnergyBeamMinDistance);
 const float kBeamYOrigin = convertScreenVToSpaceY(kEnergyBeamOriginV, kEnergyBeamMinDistance);
diff --git a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
index e56fddc51f..d383cc34ab 100755
--- a/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
+++ b/engines/pegasus/neighborhood/mars/gravitoncannon.cpp
@@ -31,16 +31,16 @@ namespace Pegasus {
 
 const TimeValue kGravitonTime = kOneSecond * kShuttleWeaponScale;
 
-const tCoordType kGravitonOriginH = kShuttleWindowLeft - 1;
-const tCoordType kGravitonOriginV = kShuttleWindowMidV;
+const CoordType kGravitonOriginH = kShuttleWindowLeft - 1;
+const CoordType kGravitonOriginV = kShuttleWindowMidV;
 
 const float kGravitonXOrigin = convertScreenHToSpaceX(kGravitonOriginH, kGravitonMinDistance);
 const float kGravitonYOrigin = convertScreenVToSpaceY(kGravitonOriginV, kGravitonMinDistance);
 const float kGravitonZOrigin = kGravitonMinDistance;
 
 //	Width of graviton sprite...
-const tCoordType kGravitonMaxScreenWidth = 78;
-const tCoordType kGravitonMaxScreenHeight = 46;
+const CoordType kGravitonMaxScreenWidth = 78;
+const CoordType kGravitonMaxScreenHeight = 46;
 
 const float kGravitonWidth = convertScreenHToSpaceX(kShuttleWindowMidH + kGravitonMaxScreenWidth / 2, kGravitonMinDistance)
 		- convertScreenHToSpaceX(kShuttleWindowMidH - kGravitonMaxScreenWidth / 2, kGravitonMinDistance);
diff --git a/engines/pegasus/neighborhood/mars/hermite.cpp b/engines/pegasus/neighborhood/mars/hermite.cpp
index 814e92ff53..dc4a2c5fc2 100755
--- a/engines/pegasus/neighborhood/mars/hermite.cpp
+++ b/engines/pegasus/neighborhood/mars/hermite.cpp
@@ -27,17 +27,17 @@
 
 namespace Pegasus {
 
-tCoordType hermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, int32 time, int32 duration) {	
+CoordType hermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 time, int32 duration) {	
 	float t = (float)time / duration;
 	float tsq = t * t;
 	float tcu = t * tsq;
 	float tcu2 = tcu + tcu;
 	float tsq2 = tsq + tsq;
 	float tsq3 = tsq2 + tsq;
-	return (tCoordType)((tcu2 - tsq3 + 1) * p1 + (tsq3 - tcu2) * p4 + (tcu - tsq2 + t) * r1 + (tcu - tsq) * r4);
+	return (CoordType)((tcu2 - tsq3 + 1) * p1 + (tsq3 - tcu2) * p4 + (tcu - tsq2 + t) * r1 + (tcu - tsq) * r4);
 }
 
-tCoordType dHermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, int32 time, int32 duration) {	
+CoordType dHermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 time, int32 duration) {	
 	float t = (float)time / duration;
 	float t2 = t + t;
 	float t4 = t2 + t2;
@@ -45,7 +45,7 @@ tCoordType dHermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4,
 	float tsq = t * t;
 	float tsq3 = tsq + tsq + tsq;
 	float tsq6 = tsq3 + tsq3;
-	return (tCoordType)((tsq6 - t6) * p1 + (t6 - tsq6) * p4 + (tsq3 - t4 + 1) * r1 + (tsq3 - t2) * r4);
+	return (CoordType)((tsq6 - t6) * p1 + (t6 - tsq6) * p4 + (tsq3 - t4 + 1) * r1 + (tsq3 - t2) * r4);
 }
 
 void hermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 time, int32 duration, Common::Point &result) {	
diff --git a/engines/pegasus/neighborhood/mars/hermite.h b/engines/pegasus/neighborhood/mars/hermite.h
index de0122f84b..44cb3a5a11 100755
--- a/engines/pegasus/neighborhood/mars/hermite.h
+++ b/engines/pegasus/neighborhood/mars/hermite.h
@@ -31,8 +31,8 @@
 
 namespace Pegasus {
 
-tCoordType hermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, int32 t, int32 duration);
-tCoordType dHermite(tCoordType p1, tCoordType p4, tCoordType r1, tCoordType r4, int32 t, int32 duration);
+CoordType hermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 t, int32 duration);
+CoordType dHermite(CoordType p1, CoordType p4, CoordType r1, CoordType r4, int32 t, int32 duration);
 void hermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 t, int32 duration, Common::Point &result);
 void dHermite(Common::Point p1, Common::Point p4, Common::Point r1, Common::Point r4, int32 t, int32 duration, Common::Point &result);
 
diff --git a/engines/pegasus/neighborhood/mars/mars.cpp b/engines/pegasus/neighborhood/mars/mars.cpp
index 3a9273e91e..93f99904d7 100755
--- a/engines/pegasus/neighborhood/mars/mars.cpp
+++ b/engines/pegasus/neighborhood/mars/mars.cpp
@@ -42,13 +42,13 @@ namespace Pegasus {
 // Probably no one will know the difference.
 const int16 kMarsShieldPanelOffsetAngle = 22;
 
-const tCanMoveForwardReason kCantMoveRobotBlocking = kCantMoveLastReason + 1;
+const CanMoveForwardReason kCantMoveRobotBlocking = kCantMoveLastReason + 1;
 
-const tNotificationFlags kTimeForCanyonChaseFlag = kLastNeighborhoodNotificationFlag << 1;
-const tNotificationFlags kExplosionFinishedFlag = kTimeForCanyonChaseFlag << 1;
-const tNotificationFlags kTimeToTransportFlag = kExplosionFinishedFlag << 1;
+const NotificationFlags kTimeForCanyonChaseFlag = kLastNeighborhoodNotificationFlag << 1;
+const NotificationFlags kExplosionFinishedFlag = kTimeForCanyonChaseFlag << 1;
+const NotificationFlags kTimeToTransportFlag = kExplosionFinishedFlag << 1;
 
-const tNotificationFlags kMarsNotificationFlags = kTimeForCanyonChaseFlag |
+const NotificationFlags kMarsNotificationFlags = kTimeForCanyonChaseFlag |
 													kExplosionFinishedFlag |
 													kTimeToTransportFlag;
 
@@ -264,7 +264,7 @@ uint16 Mars::getDateResID() const {
 	return kDate2185ID;
 }
 
-TimeValue Mars::getViewTime(const tRoomID room, const tDirectionConstant direction) {
+TimeValue Mars::getViewTime(const RoomID room, const DirectionConstant direction) {
 	ExtraTable::Entry extra;
 	SpotTable::Entry spotEntry;
 	uint32 extraID = 0xffffffff;
@@ -342,7 +342,7 @@ TimeValue Mars::getViewTime(const tRoomID room, const tDirectionConstant directi
 	return extra.movieEnd - 1;
 }
 
-void Mars::getZoomEntry(const tHotSpotID spotID, ZoomTable::Entry &entry) {
+void Mars::getZoomEntry(const HotSpotID spotID, ZoomTable::Entry &entry) {
 	Neighborhood::getZoomEntry(spotID, entry);
 
 	uint32 extraID = 0xffffffff;
@@ -366,7 +366,7 @@ void Mars::getZoomEntry(const tHotSpotID spotID, ZoomTable::Entry &entry) {
 	}
 }
 
-void Mars::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &entry) {
+void Mars::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &entry) {
 	Neighborhood::findSpotEntry(room, direction, flags, entry);
 
 	if ((flags & (kSpotOnArrivalMask | kSpotOnTurnMask)) != 0) {
@@ -387,8 +387,8 @@ void Mars::findSpotEntry(const tRoomID room, const tDirectionConstant direction,
 	}
 }
 
-tCanMoveForwardReason Mars::canMoveForward(ExitTable::Entry &entry) {
-	tCanMoveForwardReason reason = Neighborhood::canMoveForward(entry);
+CanMoveForwardReason Mars::canMoveForward(ExitTable::Entry &entry) {
+	CanMoveForwardReason reason = Neighborhood::canMoveForward(entry);
 
 	switch (GameState.getCurrentRoomAndView()) {
 	case MakeRoomView(kMars48, kEast):
@@ -404,7 +404,7 @@ tCanMoveForwardReason Mars::canMoveForward(ExitTable::Entry &entry) {
 	return reason;
 }
 
-void Mars::cantMoveThatWay(tCanMoveForwardReason reason) {
+void Mars::cantMoveThatWay(CanMoveForwardReason reason) {
 	if (reason == kCantMoveRobotBlocking) {
 		startExtraSequence(kMars48RobotKillsPlayer, kExtraCompletedFlag, kFilterNoInput);
 		loadLoopSound2("");
@@ -425,7 +425,7 @@ void Mars::bumpIntoWall() {
 	Neighborhood::bumpIntoWall();
 }
 
-tCanOpenDoorReason Mars::canOpenDoor(DoorTable::Entry &entry) {
+CanOpenDoorReason Mars::canOpenDoor(DoorTable::Entry &entry) {
 	switch (GameState.getCurrentRoomAndView()) {
 	case MakeRoomView(kMars05, kEast):
 	case MakeRoomView(kMars06, kEast):
@@ -468,7 +468,7 @@ tCanOpenDoorReason Mars::canOpenDoor(DoorTable::Entry &entry) {
 	return Neighborhood::canOpenDoor(entry);
 }
 
-void Mars::cantOpenDoor(tCanOpenDoorReason reason) {
+void Mars::cantOpenDoor(CanOpenDoorReason reason) {
 	switch (GameState.getCurrentRoom()) {
 	case kMars05:
 	case kMars06:
@@ -611,7 +611,7 @@ void Mars::setUpReactorEnergyDrain() {
 	}
 }
 
-void Mars::closeDoorOffScreen(const tRoomID room, const tDirectionConstant direction) {
+void Mars::closeDoorOffScreen(const RoomID room, const DirectionConstant direction) {
 	switch (room) {
 	case kMars51:
 		playSpotSoundSync(kMarsGantryDoorCloseIn, kMarsGantryDoorCloseOut);
@@ -727,7 +727,7 @@ void Mars::checkAirlockDoors() {
 	}
 }
 
-int16 Mars::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) {
+int16 Mars::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) {
 	int16 angle = Neighborhood::getStaticCompassAngle(room, dir);
 
 	switch (MakeRoomView(room, dir)) {
@@ -895,7 +895,7 @@ void Mars::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSpec &co
 }
 
 void Mars::loadAmbientLoops() {
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 
 	if ((room >= kMars0A && room <= kMars21) || (room >= kMars41 && room <= kMars43)) {
 		if (GameState.getMarsSeenTimeStream())
@@ -1044,7 +1044,7 @@ void Mars::loadAmbientLoops() {
 	}
 }
 
-void Mars::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) {
+void Mars::checkContinuePoint(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kMars02, kSouth):
 	case MakeRoomView(kMars19, kEast):
@@ -1143,7 +1143,7 @@ void Mars::timerExpired(const uint32 eventType) {
 	}
 }
 
-void Mars::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void Mars::arriveAt(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kMars18, kNorth):
 		if (GameState.getMarsPodAtUpperPlatform())
@@ -1462,7 +1462,7 @@ void Mars::shieldOff() {
 	setUpReactorEnergyDrain();
 }
 
-void Mars::turnTo(const tDirectionConstant direction) {
+void Mars::turnTo(const DirectionConstant direction) {
 	switch (MakeRoomView(GameState.getCurrentRoom(), direction)) {
 	case MakeRoomView(kMars27, kNorth):
 	case MakeRoomView(kMars27, kSouth):
@@ -1788,8 +1788,8 @@ void Mars::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
 	}
 }
 
-tInputBits Mars::getInputFilter() {
-	tInputBits result = Neighborhood::getInputFilter();
+InputBits Mars::getInputFilter() {
+	InputBits result = Neighborhood::getInputFilter();
 
 	switch (GameState.getCurrentRoomAndView()) {
 	case MakeRoomView(kMars49, kSouth):
@@ -1830,7 +1830,7 @@ tInputBits Mars::getInputFilter() {
 // the inventory is too full or because the player lets go of the item before
 // dropping it into the inventory).
 Hotspot *Mars::getItemScreenSpot(Item *item, DisplayElement *element) {
-	tHotSpotID destSpotID;
+	HotSpotID destSpotID;
 
 	switch (item->getObjectID()) {
 	case kCardBomb:
@@ -2095,7 +2095,7 @@ void Mars::turnRight() {
 	}
 }
 
-void Mars::receiveNotification(Notification *notification, const tNotificationFlags flag) {
+void Mars::receiveNotification(Notification *notification, const NotificationFlags flag) {
 	InventoryItem *item;
 	
 	Neighborhood::receiveNotification(notification, flag);
@@ -3062,7 +3062,7 @@ const int kRobotTooStrong = 1;
 const int kTractorTooWeak = 2;
 const int kCapturedRobotShip = 3;
 
-void Mars::spaceChaseClick(const Input &input, const tHotSpotID id) {
+void Mars::spaceChaseClick(const Input &input, const HotSpotID id) {
 	Common::Point pt;
 
 	switch (id) {
@@ -3217,7 +3217,7 @@ void Mars::spaceChaseClick(const Input &input, const tHotSpotID id) {
 	}
 }
 
-void Mars::showBigExplosion(const Common::Rect &r, const tDisplayOrder order) {
+void Mars::showBigExplosion(const Common::Rect &r, const DisplayOrder order) {
 	if (_explosions.isMovieValid()) {
 		_explosions.setDisplayOrder(order);
 
@@ -3239,7 +3239,7 @@ void Mars::showBigExplosion(const Common::Rect &r, const tDisplayOrder order) {
 	}
 }
 
-void Mars::showLittleExplosion(const Common::Rect &r, const tDisplayOrder order) {	
+void Mars::showLittleExplosion(const Common::Rect &r, const DisplayOrder order) {	
 	if (_explosions.isMovieValid()) {
 		_explosions.setDisplayOrder(order);
 
@@ -3331,7 +3331,7 @@ void Mars::updateCursor(const Common::Point cursorLocation, const Hotspot *curso
 	}
 }
 
-tAirQuality Mars::getAirQuality(const tRoomID room) {
+AirQuality Mars::getAirQuality(const RoomID room) {
 	if ((room >= kMars36 && room <= kMars39) || (room >= kMarsMaze004 && room <= kMarsMaze200))
 		return kAirQualityVacuum;
 	if (room == kMars35 && !GameState.getMarsAirlockOpen())
@@ -3553,7 +3553,7 @@ Common::String Mars::getEnvScanMovie() {
 	Common::String movieName = Neighborhood::getEnvScanMovie();
 
 	if (movieName.empty()) {
-		tRoomID room = GameState.getCurrentRoom();
+		RoomID room = GameState.getCurrentRoom();
 
 		if (room >= kMars0A && room <= kMars21)
 			return "Images/AI/Mars/XME1";
@@ -3624,7 +3624,7 @@ uint Mars::getNumHints() {
 			break;
 		case MakeRoomView(kMars56, kEast):
 			if (getCurrentActivation() == kActivateReactorReadyForNitrogen) {
-				if ((tExtraID)_lastExtra == kMars57LowerScreenClosed)
+				if ((ExtraID)_lastExtra == kMars57LowerScreenClosed)
 					numHints = 3;
 			} else if (getCurrentActivation() == kActivateReactorPlatformOut) {
 				if (!GameState.getShieldOn()) {
diff --git a/engines/pegasus/neighborhood/mars/mars.h b/engines/pegasus/neighborhood/mars/mars.h
index 01474ab831..9aca10a703 100755
--- a/engines/pegasus/neighborhood/mars/mars.h
+++ b/engines/pegasus/neighborhood/mars/mars.h
@@ -77,12 +77,12 @@ public:
 
 	virtual uint16 getDateResID() const;
 
-	virtual tAirQuality getAirQuality(const tRoomID);
+	virtual AirQuality getAirQuality(const RoomID);
 
 	void checkAirMask();
 
-	void showBigExplosion(const Common::Rect &, const tDisplayOrder);
-	void showLittleExplosion(const Common::Rect &, const tDisplayOrder);
+	void showBigExplosion(const Common::Rect &, const DisplayOrder);
+	void showLittleExplosion(const Common::Rect &, const DisplayOrder);
 	void hitByJunk();
 	void decreaseRobotShuttleEnergy(const int, Common::Point impactPoint);
 	void setUpNextDropTime();
@@ -95,7 +95,7 @@ public:
 	virtual void shieldOn();
 	virtual void shieldOff();
 
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 
 	void setSoundFXLevel(const uint16);
 
@@ -123,25 +123,25 @@ protected:
 	void init();
 	void start();
 	void setUpAIRules();
-	void arriveAt(const tRoomID, const tDirectionConstant);
+	void arriveAt(const RoomID, const DirectionConstant);
 	void takeItemFromRoom(Item *);
 	void dropItemIntoRoom(Item *, Hotspot *);
 	void activateHotspots();
 	void activateOneHotspot(HotspotInfoTable::Entry &, Hotspot *);
 	void clickInHotspot(const Input &, const Hotspot *);
-	tInputBits getInputFilter();
+	InputBits getInputFilter();
 	
-	TimeValue getViewTime(const tRoomID, const tDirectionConstant);
-	void getZoomEntry(const tHotSpotID, ZoomTable::Entry &);
-	void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &);
-	tCanOpenDoorReason canOpenDoor(DoorTable::Entry &);
+	TimeValue getViewTime(const RoomID, const DirectionConstant);
+	void getZoomEntry(const HotSpotID, ZoomTable::Entry &);
+	void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &);
+	CanOpenDoorReason canOpenDoor(DoorTable::Entry &);
 	void openDoor();
-	void closeDoorOffScreen(const tRoomID, const tDirectionConstant);
-	int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant);
+	void closeDoorOffScreen(const RoomID, const DirectionConstant);
+	int16 getStaticCompassAngle(const RoomID, const DirectionConstant);
 	void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &);
 	void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec &);
-	void turnTo(const tDirectionConstant);
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void turnTo(const DirectionConstant);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void doorOpened();
 	void setUpReactorEnergyDrain();
 	Hotspot *getItemScreenSpot(Item *, DisplayElement *);
@@ -155,8 +155,8 @@ protected:
 	void doReactorGuess(int32 guess);
 	void bombExplodesInGame();
 	void didntFindBomb();
-	tCanMoveForwardReason canMoveForward(ExitTable::Entry &);
-	void cantMoveThatWay(tCanMoveForwardReason);
+	CanMoveForwardReason canMoveForward(ExitTable::Entry &);
+	void cantMoveThatWay(CanMoveForwardReason);
 	void moveForward();
 	void bumpIntoWall();
 	void turnLeft();
@@ -165,7 +165,7 @@ protected:
 	void loadAmbientLoops();
 	void checkAirlockDoors();
 	void pickedUpItem(Item *item);
-	void cantOpenDoor(tCanOpenDoorReason);
+	void cantOpenDoor(CanOpenDoorReason);
 	void launchMaze007Robot();
 	void launchMaze015Robot();
 	void launchMaze101Robot();
@@ -183,7 +183,7 @@ protected:
 	void startUpFromFinishedSpaceChase();
 	void startUpFromSpaceChase();
 	void transportToRobotShip();
-	void spaceChaseClick(const Input &, const tHotSpotID);
+	void spaceChaseClick(const Input &, const HotSpotID);
 	void updateCursor(const Common::Point, const Hotspot *);
 
 	Common::String getSoundSpotsName();
diff --git a/engines/pegasus/neighborhood/mars/planetmover.cpp b/engines/pegasus/neighborhood/mars/planetmover.cpp
index 2b287547b5..7a43c188f7 100755
--- a/engines/pegasus/neighborhood/mars/planetmover.cpp
+++ b/engines/pegasus/neighborhood/mars/planetmover.cpp
@@ -36,7 +36,7 @@ const TimeScale kRovingScale = kTractorBeamScale;
 const TimeValue kRovingTime = kTenSeconds * kRovingScale;
 const TimeValue kRovingSlop = kTwoSeconds * kRovingScale;
 
-const tCoordType kMaxVelocity = 20;
+const CoordType kMaxVelocity = 20;
 
 PlanetMover::PlanetMover() {
 	setScale(kRovingScale);
@@ -59,8 +59,8 @@ void PlanetMover::stopMoving() {
 
 void PlanetMover::dropPlanetOutOfSight() {	
 	stop();
-	tCoordType currentLoc = hermite(_p1, _p4, _r1, _r4, _lastTime, _duration);
-	tCoordType currentV = dHermite(_p1, _p4, _r1, _r4, _lastTime, _duration);
+	CoordType currentLoc = hermite(_p1, _p4, _r1, _r4, _lastTime, _duration);
+	CoordType currentV = dHermite(_p1, _p4, _r1, _r4, _lastTime, _duration);
 	_p1 = currentLoc;
 	_r1 = currentV;
 	_p4 = kPlanetStartTop;
diff --git a/engines/pegasus/neighborhood/mars/planetmover.h b/engines/pegasus/neighborhood/mars/planetmover.h
index faf76cd9fa..cc2c412548 100755
--- a/engines/pegasus/neighborhood/mars/planetmover.h
+++ b/engines/pegasus/neighborhood/mars/planetmover.h
@@ -47,7 +47,7 @@ protected:
 	virtual void timeChanged(const TimeValue);
 	
 	Movie *_planetMovie;
-	tCoordType _p1, _p4, _r1, _r4;
+	CoordType _p1, _p4, _r1, _r4;
 	TimeValue _duration;
 	bool _dropping;
 };
diff --git a/engines/pegasus/neighborhood/mars/reactor.cpp b/engines/pegasus/neighborhood/mars/reactor.cpp
index dd44fc49e1..b044fc9f4b 100755
--- a/engines/pegasus/neighborhood/mars/reactor.cpp
+++ b/engines/pegasus/neighborhood/mars/reactor.cpp
@@ -28,18 +28,18 @@
 
 namespace Pegasus {
 
-static const tCoordType kCurrentGuessWidth = 121;
-static const tCoordType kCurrentGuessHeight = 23;
+static const CoordType kCurrentGuessWidth = 121;
+static const CoordType kCurrentGuessHeight = 23;
 
-static const tCoordType kOneGuessWidth = 25;
-static const tCoordType kOneGuessHeight = 23;
+static const CoordType kOneGuessWidth = 25;
+static const CoordType kOneGuessHeight = 23;
 
-static const tResIDType kReactorChoicesPICTID = 905;
+static const ResIDType kReactorChoicesPICTID = 905;
 
-static const tCoordType kCurrentGuessLeft = kNavAreaLeft + 146;
-static const tCoordType kCurrentGuessTop = kNavAreaTop + 90;
+static const CoordType kCurrentGuessLeft = kNavAreaLeft + 146;
+static const CoordType kCurrentGuessTop = kNavAreaTop + 90;
 
-ReactorGuess::ReactorGuess(const tDisplayElementID id) : DisplayElement(id) {
+ReactorGuess::ReactorGuess(const DisplayElementID id) : DisplayElement(id) {
 	setBounds(kCurrentGuessLeft, kCurrentGuessTop, kCurrentGuessLeft + kCurrentGuessWidth,
 			kCurrentGuessTop + kCurrentGuessHeight);
 	setDisplayOrder(kMonitorLayer);
@@ -81,10 +81,10 @@ void ReactorGuess::draw(const Common::Rect &) {
 	}
 }
 
-static const tCoordType kReactorChoiceHiliteWidth = 166;
-static const tCoordType kReactorChoiceHiliteHeight = 26;
+static const CoordType kReactorChoiceHiliteWidth = 166;
+static const CoordType kReactorChoiceHiliteHeight = 26;
 
-static const tCoordType kChoiceHiliteLefts[6] = {
+static const CoordType kChoiceHiliteLefts[6] = {
 	0,
 	34,
 	34 + 34,
@@ -93,12 +93,12 @@ static const tCoordType kChoiceHiliteLefts[6] = {
 	34 + 34 + 32 + 34 + 32
 };
 
-static const tResIDType kReactorChoiceHilitePICTID = 901;
+static const ResIDType kReactorChoiceHilitePICTID = 901;
 
-static const tCoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116;
-static const tCoordType kReactorChoiceHiliteTop = kNavAreaTop + 158;
+static const CoordType kReactorChoiceHiliteLeft = kNavAreaLeft + 116;
+static const CoordType kReactorChoiceHiliteTop = kNavAreaTop + 158;
 
-ReactorChoiceHighlight::ReactorChoiceHighlight(const tDisplayElementID id) : DisplayElement(id) {
+ReactorChoiceHighlight::ReactorChoiceHighlight(const DisplayElementID id) : DisplayElement(id) {
 	setBounds(kReactorChoiceHiliteLeft, kReactorChoiceHiliteTop, kReactorChoiceHiliteLeft + kReactorChoiceHiliteWidth,
 			kReactorChoiceHiliteTop + kReactorChoiceHiliteHeight);
 	setDisplayOrder(kMonitorLayer);
@@ -129,14 +129,14 @@ void ReactorChoiceHighlight::draw(const Common::Rect &) {
 	}
 }
 
-static const tCoordType kReactorHistoryWidth = 128;
-static const tCoordType kReactorHistoryHeight = 168;
+static const CoordType kReactorHistoryWidth = 128;
+static const CoordType kReactorHistoryHeight = 168;
 
-static const tCoordType kColorWidths[5] = {24, 25, 25, 26, 27};
-static const tCoordType kColorHeights[5] = {14, 15, 17, 17, 19};
+static const CoordType kColorWidths[5] = { 24, 25, 25, 26, 27 };
+static const CoordType kColorHeights[5] = { 14, 15, 17, 17, 19};
 
 // TODO: Remove global construction
-static const tCoordType kColorTops[5] = {
+static const CoordType kColorTops[5] = {
 	0,
 	kColorHeights[0],
 	kColorHeights[0] + kColorHeights[1],
@@ -144,7 +144,7 @@ static const tCoordType kColorTops[5] = {
 	kColorHeights[0] + kColorHeights[1] + kColorHeights[2] + kColorHeights[3],
 };
 
-static const tCoordType kHistoryLefts[5][3] = {
+static const CoordType kHistoryLefts[5][3] = {
 	{ 302 + kNavAreaLeft, 329 + kNavAreaLeft, 357 + kNavAreaLeft },
 	{ 302 + kNavAreaLeft, 331 + kNavAreaLeft, 360 + kNavAreaLeft },
 	{ 303 + kNavAreaLeft, 333 + kNavAreaLeft, 363 + kNavAreaLeft },
@@ -152,7 +152,7 @@ static const tCoordType kHistoryLefts[5][3] = {
 	{ 305 + kNavAreaLeft, 337 + kNavAreaLeft, 369 + kNavAreaLeft }
 };
 
-static const tCoordType kHistoryTops[5] = {
+static const CoordType kHistoryTops[5] = {
 	39 + kNavAreaTop,
 	61 + kNavAreaTop,
 	84 + kNavAreaTop,
@@ -160,13 +160,13 @@ static const tCoordType kHistoryTops[5] = {
 	137 + kNavAreaTop
 };
 
-static const tCoordType kOneAnswerWidth = 35;
-static const tCoordType kOneAnswerHeight = 27;
+static const CoordType kOneAnswerWidth = 35;
+static const CoordType kOneAnswerHeight = 27;
 
-static const tCoordType kDigitWidth = 16;
-static const tCoordType kDigitHeight = 12;
+static const CoordType kDigitWidth = 16;
+static const CoordType kDigitHeight = 12;
 
-static const tCoordType kCorrectCountLefts[5] = {
+static const CoordType kCorrectCountLefts[5] = {
 	388 + kNavAreaLeft,
 	392 + kNavAreaLeft,
 	398 + kNavAreaLeft,
@@ -174,7 +174,7 @@ static const tCoordType kCorrectCountLefts[5] = {
 	406 + kNavAreaLeft
 };
 
-static const tCoordType kCorrectCountTops[5] = {
+static const CoordType kCorrectCountTops[5] = {
 	40 + kNavAreaTop,
 	62 + kNavAreaTop,
 	86 + kNavAreaTop,
@@ -182,17 +182,17 @@ static const tCoordType kCorrectCountTops[5] = {
 	140 + kNavAreaTop
 };
 
-static const tResIDType kReactorDigitsPICTID = 902;
-static const tResIDType kReactorHistoryPICTID = 903;
-static const tResIDType kReactorAnswerPICTID = 904;
+static const ResIDType kReactorDigitsPICTID = 902;
+static const ResIDType kReactorHistoryPICTID = 903;
+static const ResIDType kReactorAnswerPICTID = 904;
 
-static const tCoordType kReactorHistoryLeft = kNavAreaLeft + 302;
-static const tCoordType kReactorHistoryTop = kNavAreaTop + 39;
+static const CoordType kReactorHistoryLeft = kNavAreaLeft + 302;
+static const CoordType kReactorHistoryTop = kNavAreaTop + 39;
 
-static const tCoordType kAnswerLeft = kNavAreaLeft + 304;
-static const tCoordType kAnswerTop = kNavAreaTop + 180;
+static const CoordType kAnswerLeft = kNavAreaLeft + 304;
+static const CoordType kAnswerTop = kNavAreaTop + 180;
 
-ReactorHistory::ReactorHistory(const tDisplayElementID id) : DisplayElement(id) {
+ReactorHistory::ReactorHistory(const DisplayElementID id) : DisplayElement(id) {
 	setBounds(kReactorHistoryLeft, kReactorHistoryTop, kReactorHistoryLeft + kReactorHistoryWidth,
 			kReactorHistoryTop + kReactorHistoryHeight);
 	setDisplayOrder(kMonitorLayer);
diff --git a/engines/pegasus/neighborhood/mars/reactor.h b/engines/pegasus/neighborhood/mars/reactor.h
index 671970102b..86338f8266 100755
--- a/engines/pegasus/neighborhood/mars/reactor.h
+++ b/engines/pegasus/neighborhood/mars/reactor.h
@@ -34,7 +34,7 @@ namespace Pegasus {
 
 class ReactorGuess : public DisplayElement {
 public:
-	ReactorGuess(const tDisplayElementID);
+	ReactorGuess(const DisplayElementID);
 	virtual ~ReactorGuess() {}
 
 	void initReactorGuess();
@@ -52,7 +52,7 @@ protected:
 
 class ReactorChoiceHighlight : public DisplayElement {
 public:
-	ReactorChoiceHighlight(const tDisplayElementID);
+	ReactorChoiceHighlight(const DisplayElementID);
 	virtual ~ReactorChoiceHighlight() {}
 
 	void initReactorChoiceHighlight();
@@ -79,7 +79,7 @@ protected:
 
 class ReactorHistory : public DisplayElement {
 public:
-	ReactorHistory(const tDisplayElementID);
+	ReactorHistory(const DisplayElementID);
 	virtual ~ReactorHistory() {}
 
 	void initReactorHistory();
diff --git a/engines/pegasus/neighborhood/mars/robotship.cpp b/engines/pegasus/neighborhood/mars/robotship.cpp
index 862a8b2edd..b1ecdde008 100755
--- a/engines/pegasus/neighborhood/mars/robotship.cpp
+++ b/engines/pegasus/neighborhood/mars/robotship.cpp
@@ -40,18 +40,18 @@ const TimeValue kRovingSlop = kThreeSeconds * kRovingScale;
 const int kNumSpriteColumns = 15;
 const int kNumSpriteRows = 16;
 
-const tCoordType kInitialLocationLeft = kShuttleWindowLeft - 50;
-const tCoordType kInitialLocationTop = kShuttleWindowTop - 50;
-const tCoordType kInitialLocationWidth = kShuttleWindowWidth + 100;
-const tCoordType kInitialLocationHeight = kShuttleWindowHeight + 100;
+const CoordType kInitialLocationLeft = kShuttleWindowLeft - 50;
+const CoordType kInitialLocationTop = kShuttleWindowTop - 50;
+const CoordType kInitialLocationWidth = kShuttleWindowWidth + 100;
+const CoordType kInitialLocationHeight = kShuttleWindowHeight + 100;
 
-const tCoordType kVelocityVectorLength = 100;
-const tCoordType kVelocityVectorSlop = 50;
+const CoordType kVelocityVectorLength = 100;
+const CoordType kVelocityVectorSlop = 50;
 
-const tCoordType kRovingLeft = kShuttleWindowLeft + 20;
-const tCoordType kRovingTop = kShuttleWindowTop + 20;
-const tCoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft;
-const tCoordType kRovingHeight = kShuttleWindowMidV - kRovingTop;
+const CoordType kRovingLeft = kShuttleWindowLeft + 20;
+const CoordType kRovingTop = kShuttleWindowTop + 20;
+const CoordType kRovingWidth = kShuttleWindowMidH - kRovingLeft;
+const CoordType kRovingHeight = kShuttleWindowMidV - kRovingTop;
 
 RobotShip* g_robotShip = 0;
 
@@ -129,7 +129,7 @@ void RobotShip::setUpNextDropTime() {
 
 void RobotShip::timeToDropJunk() {	
 	if (g_spaceJunk) {
-		tCoordType x, y;
+		CoordType x, y;
 		_spritesMovie.getCenter(x, y);
 		g_spaceJunk->launchJunk(((PegasusEngine *)g_engine)->getRandomNumber(24), x, y);
 	}
@@ -169,7 +169,7 @@ void RobotShip::newDestination() {
 	start();
 }
 
-void RobotShip::moveRobotTo(tCoordType x, tCoordType y) {
+void RobotShip::moveRobotTo(CoordType x, CoordType y) {
 	_currentLocation.x = x;
 	_currentLocation.y = y;
 
@@ -258,8 +258,8 @@ void RobotShip::timeChanged(const TimeValue) {
 	}
 }
 
-void RobotShip::makeVelocityVector(tCoordType x1, tCoordType y1, tCoordType x2, tCoordType y2, Common::Point &vector) {	
-	tCoordType length = ((PegasusEngine *)g_engine)->getRandomNumber(kVelocityVectorSlop - 1) + kVelocityVectorLength;
+void RobotShip::makeVelocityVector(CoordType x1, CoordType y1, CoordType x2, CoordType y2, Common::Point &vector) {	
+	CoordType length = ((PegasusEngine *)g_engine)->getRandomNumber(kVelocityVectorSlop - 1) + kVelocityVectorLength;
 	vector.x = x2 - x1;
 	vector.y = y2 - y1;
 	float oldLength = sqrt(vector.x * vector.x + vector.y * vector.y);
diff --git a/engines/pegasus/neighborhood/mars/robotship.h b/engines/pegasus/neighborhood/mars/robotship.h
index 7c6d996566..7921198d48 100755
--- a/engines/pegasus/neighborhood/mars/robotship.h
+++ b/engines/pegasus/neighborhood/mars/robotship.h
@@ -30,8 +30,8 @@
 
 namespace Pegasus {
 
-const tCoordType kShuttleMovieWidth = 114;
-const tCoordType kShuttleMovieHeight = 42;
+const CoordType kShuttleMovieWidth = 114;
+const CoordType kShuttleMovieHeight = 42;
 
 class RobotShip : IdlerTimeBase {
 friend void timeToDropJunkFunction(FunctionPtr *, void *);
@@ -65,10 +65,10 @@ public:
 
 protected:
 	void newDestination();
-	void moveRobotTo(tCoordType, tCoordType);
+	void moveRobotTo(CoordType, CoordType);
 	void timeToDropJunk();
 	virtual void timeChanged(const TimeValue);
-	void makeVelocityVector(tCoordType, tCoordType, tCoordType, tCoordType, Common::Point &);
+	void makeVelocityVector(CoordType, CoordType, CoordType, CoordType, Common::Point &);
 
 	GlowingMovie _spritesMovie;
 	Common::Rect _shipRange;
diff --git a/engines/pegasus/neighborhood/mars/shuttlehud.cpp b/engines/pegasus/neighborhood/mars/shuttlehud.cpp
index 1850926ef3..cac188e01e 100755
--- a/engines/pegasus/neighborhood/mars/shuttlehud.cpp
+++ b/engines/pegasus/neighborhood/mars/shuttlehud.cpp
@@ -30,26 +30,26 @@
 
 namespace Pegasus {
 
-const tCoordType kHUDTargetGridLeft = kShuttleWindowLeft + 16;
-const tCoordType kHUDTargetGridTop = kShuttleWindowTop + 8;
-const tCoordType kHUDTargetGridWidth = 328;
-const tCoordType kHUDTargetGridHeight = 206;
-
-const tCoordType kHUDRS232Left = kHUDTargetGridLeft + 264;
-const tCoordType kHUDRS232Top = kHUDTargetGridTop + 2;
-
-const tCoordType kHUDLockLeft = kShuttleWindowLeft + 101;
-const tCoordType kHUDLockTop = kShuttleWindowTop + 49;
-const tCoordType kHUDLockWidth = 145;
-const tCoordType kHUDLockHeight = 124;
-
-const tCoordType kTractorLockWidth = 50;
-const tCoordType kTractorLockHeight = 30;
-
-const tCoordType kTractorLockLeft = kShuttleWindowMidH - kTractorLockWidth / 2;
-const tCoordType kTractorLockTop = kShuttleWindowMidV - kTractorLockHeight / 2;
-const tCoordType kTractorLockRight = kTractorLockLeft + kTractorLockWidth;
-const tCoordType kTractorLockBottom = kTractorLockTop + kTractorLockHeight;
+const CoordType kHUDTargetGridLeft = kShuttleWindowLeft + 16;
+const CoordType kHUDTargetGridTop = kShuttleWindowTop + 8;
+const CoordType kHUDTargetGridWidth = 328;
+const CoordType kHUDTargetGridHeight = 206;
+
+const CoordType kHUDRS232Left = kHUDTargetGridLeft + 264;
+const CoordType kHUDRS232Top = kHUDTargetGridTop + 2;
+
+const CoordType kHUDLockLeft = kShuttleWindowLeft + 101;
+const CoordType kHUDLockTop = kShuttleWindowTop + 49;
+const CoordType kHUDLockWidth = 145;
+const CoordType kHUDLockHeight = 124;
+
+const CoordType kTractorLockWidth = 50;
+const CoordType kTractorLockHeight = 30;
+
+const CoordType kTractorLockLeft = kShuttleWindowMidH - kTractorLockWidth / 2;
+const CoordType kTractorLockTop = kShuttleWindowMidV - kTractorLockHeight / 2;
+const CoordType kTractorLockRight = kTractorLockLeft + kTractorLockWidth;
+const CoordType kTractorLockBottom = kTractorLockTop + kTractorLockHeight;
 
 static const uint16 s_RS232Data[] = {
 	0xF0E1, 0xCE70,
diff --git a/engines/pegasus/neighborhood/mars/shuttleweapon.cpp b/engines/pegasus/neighborhood/mars/shuttleweapon.cpp
index 14614d1c87..0151a26f29 100755
--- a/engines/pegasus/neighborhood/mars/shuttleweapon.cpp
+++ b/engines/pegasus/neighborhood/mars/shuttleweapon.cpp
@@ -53,7 +53,7 @@ bool ShuttleWeapon::canFireWeapon() {
 	return !isRunning();
 }
 
-void ShuttleWeapon::fireWeapon(const tCoordType hStop, const tCoordType vStop) {	
+void ShuttleWeapon::fireWeapon(const CoordType hStop, const CoordType vStop) {	
 	if (!isRunning()) {
 		stop();
 		setTime(0);
diff --git a/engines/pegasus/neighborhood/mars/shuttleweapon.h b/engines/pegasus/neighborhood/mars/shuttleweapon.h
index c62cee1acc..30e42face8 100755
--- a/engines/pegasus/neighborhood/mars/shuttleweapon.h
+++ b/engines/pegasus/neighborhood/mars/shuttleweapon.h
@@ -45,7 +45,7 @@ public:
 	virtual void initShuttleWeapon();
 	virtual void cleanUpShuttleWeapon();
 
-	virtual void fireWeapon(const tCoordType, const tCoordType);
+	virtual void fireWeapon(const CoordType, const CoordType);
 
 	bool canFireWeapon();
 
diff --git a/engines/pegasus/neighborhood/mars/spacejunk.cpp b/engines/pegasus/neighborhood/mars/spacejunk.cpp
index a751dc2a71..28847136f6 100755
--- a/engines/pegasus/neighborhood/mars/spacejunk.cpp
+++ b/engines/pegasus/neighborhood/mars/spacejunk.cpp
@@ -31,9 +31,9 @@ namespace Pegasus {
 
 //const TimeValue kWeaponReboundTime = kTwoSeconds * kJunkTimeScale;
 //const TimeValue kCollisionReboundTime = kOneSecond * kJunkTimeScale;
-const tCoordType kMaxBounceSize = 90;
-const tCoordType kBounceTargetHRange = 640 - kMaxBounceSize - 2;
-const tCoordType kBounceTargetVRange = 480 - kMaxBounceSize - 2;
+const CoordType kMaxBounceSize = 90;
+const CoordType kBounceTargetHRange = 640 - kMaxBounceSize - 2;
+const CoordType kBounceTargetVRange = 480 - kMaxBounceSize - 2;
 
 const float kJunkXTarget = 0;
 const float kJunkYTarget = 0;
@@ -41,7 +41,7 @@ const float kJunkZTarget = kJunkMinDistance;
 
 SpaceJunk *g_spaceJunk = 0;
 
-SpaceJunk::SpaceJunk(const tDisplayElementID id) : ScalingMovie(id) {
+SpaceJunk::SpaceJunk(const DisplayElementID id) : ScalingMovie(id) {
 	_timer.setScale(kJunkTimeScale);
 	_bouncing = false;
 	g_spaceJunk = this;
@@ -51,7 +51,7 @@ SpaceJunk::~SpaceJunk() {
 	g_spaceJunk = 0;
 }
 
-void SpaceJunk::launchJunk(int16 whichJunk, tCoordType xOrigin, tCoordType yOrigin) {	
+void SpaceJunk::launchJunk(int16 whichJunk, CoordType xOrigin, CoordType yOrigin) {	
 	_bouncing = false;
 	TimeValue startTime = whichJunk * 16 * 40;
 	TimeValue stopTime = startTime + 16 * 40;
@@ -76,7 +76,7 @@ void SpaceJunk::launchJunk(int16 whichJunk, tCoordType xOrigin, tCoordType yOrig
 	_timer.start();
 }
 
-void SpaceJunk::setCenter(const tCoordType centerX, const tCoordType centerY) {
+void SpaceJunk::setCenter(const CoordType centerX, const CoordType centerY) {
 	_center.x = centerX;
 	_center.y = centerY;
 
@@ -86,7 +86,7 @@ void SpaceJunk::setCenter(const tCoordType centerX, const tCoordType centerY) {
 	setBounds(r);
 }
 
-void SpaceJunk::setScaleSize(const tCoordType size) {
+void SpaceJunk::setScaleSize(const CoordType size) {
 	Common::Rect r;
 	r.left = _center.x - (size >> 1);
 	r.top = _center.y - (size >> 1);
@@ -101,7 +101,7 @@ void SpaceJunk::useIdleTime() {
 		Common::Point pt;
 		pt.x = linearInterp(0, _bounceTime, time, _bounceStart.x, _bounceStop.x);
 		pt.y = linearInterp(0, _bounceTime, time, _bounceStart.y, _bounceStop.y);
-		tCoordType size = linearInterp(0, _bounceTime, time, _bounceSizeStart, _bounceSizeStop);
+		CoordType size = linearInterp(0, _bounceTime, time, _bounceSizeStart, _bounceSizeStop);
 		setCenter(pt.x, pt.y);
 		setScaleSize(size);
 
diff --git a/engines/pegasus/neighborhood/mars/spacejunk.h b/engines/pegasus/neighborhood/mars/spacejunk.h
index ba5aa753e0..03943b92c9 100755
--- a/engines/pegasus/neighborhood/mars/spacejunk.h
+++ b/engines/pegasus/neighborhood/mars/spacejunk.h
@@ -32,22 +32,22 @@
 
 namespace Pegasus {
 
-const tCoordType kJunkMaxScreenSize = 250;
+const CoordType kJunkMaxScreenSize = 250;
 
 const float kJunkSize = convertScreenVToSpaceY(kShuttleWindowMidV - kJunkMaxScreenSize / 2, kJunkMinDistance) -
 		convertScreenVToSpaceY(kShuttleWindowMidV + kJunkMaxScreenSize / 2, kJunkMinDistance);
 
 class SpaceJunk : public ScalingMovie, public Idler {
 public:
-	SpaceJunk(const tDisplayElementID);
+	SpaceJunk(const DisplayElementID);
 	virtual ~SpaceJunk();
 
-	void setCenter(const tCoordType, const tCoordType);
-	void setScaleSize(const tCoordType);
+	void setCenter(const CoordType, const CoordType);
+	void setScaleSize(const CoordType);
 
 	void useIdleTime();
 	
-	void launchJunk(int16, tCoordType, tCoordType);
+	void launchJunk(int16, CoordType, CoordType);
 	
 	void getJunkPosition(Point3D &);
 	bool isJunkFlying();
@@ -67,7 +67,7 @@ protected:
 	Common::Point _center;
 	bool _bouncing;
 	Common::Point _bounceStart, _bounceStop;
-	tCoordType _bounceSizeStart, _bounceSizeStop;
+	CoordType _bounceSizeStart, _bounceSizeStop;
 	TimeValue _bounceTime;
 };
 
diff --git a/engines/pegasus/neighborhood/neighborhood.cpp b/engines/pegasus/neighborhood/neighborhood.cpp
index ae7f80d2ce..c83636754e 100644
--- a/engines/pegasus/neighborhood/neighborhood.cpp
+++ b/engines/pegasus/neighborhood/neighborhood.cpp
@@ -55,7 +55,7 @@ static const TimeValue kStridingSlop = 39;
 
 Neighborhood *g_neighborhood = 0;
 
-Neighborhood::Neighborhood(InputHandler *nextHandler, PegasusEngine *vm, const Common::String &resName, tNeighborhoodID id)
+Neighborhood::Neighborhood(InputHandler *nextHandler, PegasusEngine *vm, const Common::String &resName, NeighborhoodID id)
 		: InputHandler(nextHandler), IDObject(id), _vm(vm), _resName(resName), _navMovie(kNavMovieID), _stridingCallBack(this),
 		_neighborhoodNotification(kNeighborhoodNotificationID, (NotificationManager *)vm), _pushIn(kNoDisplayElement),
 		_turnPush(kTurnPushID), _croppedMovie(kCroppedMovieID) {
@@ -188,7 +188,7 @@ void Neighborhood::start() {
 	arriveAt(GameState.getNextRoom(), GameState.getNextDirection());
 }
 
-void Neighborhood::receiveNotification(Notification *, const tNotificationFlags flags) {
+void Neighborhood::receiveNotification(Notification *, const NotificationFlags flags) {
 	if ((flags & (kNeighborhoodMovieCompletedFlag | kTurnCompletedFlag)) != 0 && g_AIArea)
 		g_AIArea->unlockAI();
 	if (flags & kMoveForwardCompletedFlag)
@@ -205,7 +205,7 @@ void Neighborhood::receiveNotification(Notification *, const tNotificationFlags
 		die(_extraDeathReason);
 }
 
-void Neighborhood::arriveAt(tRoomID room, tDirectionConstant direction) {
+void Neighborhood::arriveAt(RoomID room, DirectionConstant direction) {
 	if (g_map)
 		g_map->moveToMapLocation(GameState.getCurrentNeighborhood(), room, direction);
 
@@ -242,14 +242,14 @@ void Neighborhood::arriveAt(tRoomID room, tDirectionConstant direction) {
 
 //	These functions can be overridden to tweak the exact frames used.
 
-void Neighborhood::getExitEntry(const tRoomID room, const tDirectionConstant direction, ExitTable::Entry &entry) {
+void Neighborhood::getExitEntry(const RoomID room, const DirectionConstant direction, ExitTable::Entry &entry) {
 	entry = _exitTable.findEntry(room, direction, _currentAlternate);
 
 	if (entry.isEmpty())
 		entry = _exitTable.findEntry(room, direction, kNoAlternateID);
 }
 
-TimeValue Neighborhood::getViewTime(const tRoomID room, const tDirectionConstant direction) {
+TimeValue Neighborhood::getViewTime(const RoomID room, const DirectionConstant direction) {
 	if (GameState.getOpenDoorRoom() == room && GameState.getOpenDoorDirection() == direction) {
 		// If we get here, the door entry for this location must exist.
 		DoorTable::Entry doorEntry = _doorTable.findEntry(room, direction, _currentAlternate);
@@ -268,14 +268,14 @@ TimeValue Neighborhood::getViewTime(const tRoomID room, const tDirectionConstant
 	return viewEntry.time;
 }
 
-void Neighborhood::getDoorEntry(const tRoomID room, const tDirectionConstant direction, DoorTable::Entry &doorEntry) {
+void Neighborhood::getDoorEntry(const RoomID room, const DirectionConstant direction, DoorTable::Entry &doorEntry) {
 	doorEntry = _doorTable.findEntry(room, direction, _currentAlternate);
 
 	if (doorEntry.isEmpty())
 		doorEntry = _doorTable.findEntry(room, direction, kNoAlternateID);
 }
 
-tDirectionConstant Neighborhood::getTurnEntry(const tRoomID room, const tDirectionConstant direction, const tTurnDirection turnDirection) {
+DirectionConstant Neighborhood::getTurnEntry(const RoomID room, const DirectionConstant direction, const TurnDirection turnDirection) {
 	TurnTable::Entry turnEntry = _turnTable.findEntry(room, direction, turnDirection, _currentAlternate);
 
 	if (turnEntry.isEmpty())
@@ -284,18 +284,18 @@ tDirectionConstant Neighborhood::getTurnEntry(const tRoomID room, const tDirecti
 	return turnEntry.endDirection;
 }
 
-void Neighborhood::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &spotEntry) {
+void Neighborhood::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &spotEntry) {
 	spotEntry = _spotTable.findEntry(room, direction, flags, _currentAlternate);
 
 	if (spotEntry.isEmpty())
 		spotEntry = _spotTable.findEntry(room, direction, flags, kNoAlternateID);
 }
 
-void Neighborhood::getZoomEntry(const tHotSpotID id, ZoomTable::Entry &zoomEntry) {
+void Neighborhood::getZoomEntry(const HotSpotID id, ZoomTable::Entry &zoomEntry) {
 	zoomEntry = _zoomTable.findEntry(id);
 }
 
-void Neighborhood::getHotspotEntry(const tHotSpotID id, HotspotInfoTable::Entry &hotspotEntry) {
+void Neighborhood::getHotspotEntry(const HotSpotID id, HotspotInfoTable::Entry &hotspotEntry) {
 	hotspotEntry = _hotspotInfoTable.findEntry(id);
 }
 
@@ -307,7 +307,7 @@ void Neighborhood::getExtraEntry(const uint32 id, ExtraTable::Entry &extraEntry)
 //
 //	"Can" functions: Called to see whether or not a user is allowed to do something
 
-tCanMoveForwardReason Neighborhood::canMoveForward(ExitTable::Entry &entry) {
+CanMoveForwardReason Neighborhood::canMoveForward(ExitTable::Entry &entry) {
 	DoorTable::Entry door;
 	
 	getExitEntry(GameState.getCurrentRoom(), GameState.getCurrentDirection(), entry);
@@ -333,7 +333,7 @@ tCanMoveForwardReason Neighborhood::canMoveForward(ExitTable::Entry &entry) {
 	return kCanMoveForward;
 }
 
-tCanTurnReason Neighborhood::canTurn(tTurnDirection turnDirection, tDirectionConstant &nextDir) {
+CanTurnReason Neighborhood::canTurn(TurnDirection turnDirection, DirectionConstant &nextDir) {
 	nextDir = getTurnEntry(GameState.getCurrentRoom(), GameState.getCurrentDirection(), turnDirection);
 
 	if (nextDir == kNoDirection)
@@ -342,7 +342,7 @@ tCanTurnReason Neighborhood::canTurn(tTurnDirection turnDirection, tDirectionCon
 	return kCanTurn;
 }
 
-tCanOpenDoorReason Neighborhood::canOpenDoor(DoorTable::Entry &entry) {
+CanOpenDoorReason Neighborhood::canOpenDoor(DoorTable::Entry &entry) {
 	getDoorEntry(GameState.getCurrentRoom(), GameState.getCurrentDirection(), entry);
 
 	if (entry.flags & kDoorPresentMask) {
@@ -390,7 +390,7 @@ void Neighborhood::createNeighborhoodSpots() {
 
 void Neighborhood::popActionQueue() {	
 	if (!_actionQueue.empty()) {
-		tQueueRequest topRequest = _actionQueue.pop();
+		QueueRequest topRequest = _actionQueue.pop();
 
 		switch (topRequest.requestType) {
 		case kNavExtraRequest:
@@ -410,7 +410,7 @@ void Neighborhood::popActionQueue() {
 
 void Neighborhood::serviceActionQueue() {
 	if (!_actionQueue.empty()) {
-		tQueueRequest &topRequest = _actionQueue.front();
+		QueueRequest &topRequest = _actionQueue.front();
 
 		if (!topRequest.playing) {
 			topRequest.playing = true;
@@ -441,10 +441,10 @@ void Neighborhood::serviceActionQueue() {
 	}
 }
 
-void Neighborhood::requestAction(const tQueueRequestType requestType, const tExtraID extra, const TimeValue in, const TimeValue out,
-		const tInputBits interruptionFilter, const tNotificationFlags flags) {
+void Neighborhood::requestAction(const QueueRequestType requestType, const ExtraID extra, const TimeValue in, const TimeValue out,
+		const InputBits interruptionFilter, const NotificationFlags flags) {
 
-	tQueueRequest request;
+	QueueRequest request;
 	
 	request.requestType = requestType;
 	request.extra = extra;
@@ -459,11 +459,11 @@ void Neighborhood::requestAction(const tQueueRequestType requestType, const tExt
 		serviceActionQueue();
 }
 
-void Neighborhood::requestExtraSequence(const tExtraID whichExtra, const tNotificationFlags flags, const tInputBits interruptionFilter) {
+void Neighborhood::requestExtraSequence(const ExtraID whichExtra, const NotificationFlags flags, const InputBits interruptionFilter) {
 	requestAction(kNavExtraRequest, whichExtra, 0, 0, interruptionFilter, flags);
 }
 
-void Neighborhood::requestSpotSound(const TimeValue in, const TimeValue out, const tInputBits interruptionFilter, const tNotificationFlags flags) {
+void Neighborhood::requestSpotSound(const TimeValue in, const TimeValue out, const InputBits interruptionFilter, const NotificationFlags flags) {
 	requestAction(kSpotSoundRequest, 0xFFFFFFFF, in, out, interruptionFilter, flags);
 }
 
@@ -486,16 +486,16 @@ void Neighborhood::playSpotSoundSync(const TimeValue in, const TimeValue out) {
 	}
 }
 
-void Neighborhood::requestDelay(const TimeValue delayDuration, const TimeScale delayScale, const tInputBits interruptionFilter, const tNotificationFlags flags) {
+void Neighborhood::requestDelay(const TimeValue delayDuration, const TimeScale delayScale, const InputBits interruptionFilter, const NotificationFlags flags) {
 	requestAction(kDelayRequest, 0xFFFFFFFF, delayDuration, delayScale, interruptionFilter, flags);
 }
 
-bool operator==(const tQueueRequest &arg1, const tQueueRequest &arg2) {
+bool operator==(const QueueRequest &arg1, const QueueRequest &arg2) {
 	return arg1.requestType == arg2.requestType && arg1.extra == arg2.extra &&
 			arg1.start == arg2.start && arg1.stop == arg2.stop;
 }
 
-bool operator!=(const tQueueRequest &arg1, const tQueueRequest &arg2) {
+bool operator!=(const QueueRequest &arg1, const QueueRequest &arg2) {
 	return !operator==(arg1, arg2);
 }
 
@@ -543,7 +543,7 @@ bool Neighborhood::okayToJump() {
 	return !_vm->playerHasItemID(kGasCanister) && !_vm->playerHasItemID(kMachineGun);
 }
 
-tAirQuality Neighborhood::getAirQuality(const tRoomID) {
+AirQuality Neighborhood::getAirQuality(const RoomID) {
 	return kAirQualityGood;
 }
 
@@ -594,7 +594,7 @@ void Neighborhood::stopStriding() {
 }
 
 //	Compass support
-int16 Neighborhood::getStaticCompassAngle(const tRoomID, const tDirectionConstant dir) {
+int16 Neighborhood::getStaticCompassAngle(const RoomID, const DirectionConstant dir) {
 	//	North, south, east, west
 	static const int16 compassAngles[] = { 0, 180, 90, 270 };
 	return compassAngles[dir];
@@ -615,7 +615,7 @@ void Neighborhood::getExitCompassMove(const ExitTable::Entry &exitEntry, FaderMo
 	compassMove.makeTwoKnotFaderSpec(_navMovie.getScale(), exitEntry.movieStart, startAngle, exitEntry.movieEnd, stopAngle);
 }
 
-void Neighborhood::scheduleNavCallBack(tNotificationFlags flags) {
+void Neighborhood::scheduleNavCallBack(NotificationFlags flags) {
 	_navMovieCallBack.cancelCallBack();
 
 	if (flags != 0) {
@@ -624,19 +624,19 @@ void Neighborhood::scheduleNavCallBack(tNotificationFlags flags) {
 	}
 }
 
-void Neighborhood::scheduleStridingCallBack(const TimeValue strideStop, tNotificationFlags flags) {	
+void Neighborhood::scheduleStridingCallBack(const TimeValue strideStop, NotificationFlags flags) {	
 	_stridingCallBack.cancelCallBack();
 
 	if (flags != 0)
 		_stridingCallBack.scheduleCallBack(kTriggerTimeFwd, strideStop, _navMovie.getScale());
 }
 
-void Neighborhood::moveNavTo(const tCoordType h, const tCoordType v) {
-	tCoordType oldH, oldV;
+void Neighborhood::moveNavTo(const CoordType h, const CoordType v) {
+	CoordType oldH, oldV;
 	_navMovie.getLocation(oldH, oldV);
 
-	tCoordType offH = h - oldH;
-	tCoordType offV = v - oldV;
+	CoordType offH = h - oldH;
+	CoordType offV = v - oldV;
 
 	_navMovie.moveElementTo(h, v);
 	_turnPush.moveElementTo(h, v);
@@ -663,10 +663,10 @@ void Neighborhood::activateHotspots() {
 }
 
 void Neighborhood::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {	
-	tHotSpotFlags flags = clickedSpot->getHotspotFlags();
+	HotSpotFlags flags = clickedSpot->getHotspotFlags();
 
 	if ((flags & (kPickUpItemSpotFlag | kPickUpBiochipSpotFlag)) != 0) {
-		tItemID itemID = kNoItemID;
+		ItemID itemID = kNoItemID;
 
 		for (HotspotInfoTable::iterator it = _hotspotInfoTable.begin(); it != _hotspotInfoTable.end(); it++) {
 			if (it->hotspot == clickedSpot->getObjectID()) {
@@ -703,7 +703,7 @@ void Neighborhood::clickInHotspot(const Input &input, const Hotspot *clickedSpot
 	}
 }
 
-void Neighborhood::cantMoveThatWay(tCanMoveForwardReason reason) {
+void Neighborhood::cantMoveThatWay(CanMoveForwardReason reason) {
 	switch (reason) {
 	case kCantMoveDoorClosed:
 	case kCantMoveDoorLocked:
@@ -718,11 +718,11 @@ void Neighborhood::cantMoveThatWay(tCanMoveForwardReason reason) {
 	}
 }
 
-void Neighborhood::cantOpenDoor(tCanOpenDoorReason) {
+void Neighborhood::cantOpenDoor(CanOpenDoorReason) {
 	bumpIntoWall();
 }
 
-void Neighborhood::turnTo(const tDirectionConstant direction) {
+void Neighborhood::turnTo(const DirectionConstant direction) {
 	if (g_map)
 		g_map->moveToMapLocation(GameState.getCurrentNeighborhood(), GameState.getCurrentRoom(), direction);
 
@@ -796,7 +796,7 @@ void Neighborhood::doorOpened() {
 
 void Neighborhood::moveForward() {
 	ExitTable::Entry exitEntry;
-	tCanMoveForwardReason moveReason = canMoveForward(exitEntry);
+	CanMoveForwardReason moveReason = canMoveForward(exitEntry);
 
 	if (moveReason == kCanMoveForward)
 		startExitMovie(exitEntry);
@@ -804,9 +804,9 @@ void Neighborhood::moveForward() {
 		cantMoveThatWay(moveReason);
 }
 
-void Neighborhood::turn(const tTurnDirection turnDirection) {
-	tDirectionConstant nextDir;	
-	tCanTurnReason turnReason = canTurn(turnDirection, nextDir);
+void Neighborhood::turn(const TurnDirection turnDirection) {
+	DirectionConstant nextDir;	
+	CanTurnReason turnReason = canTurn(turnDirection, nextDir);
 
 	if (turnReason == kCanTurn)
 		startTurnPush(turnDirection, getViewTime(GameState.getCurrentRoom(), nextDir), nextDir);
@@ -832,7 +832,7 @@ void Neighborhood::turnDown() {
 
 void Neighborhood::openDoor() {
 	DoorTable::Entry door;	
-	tCanOpenDoorReason doorReason = canOpenDoor(door);
+	CanOpenDoorReason doorReason = canOpenDoor(door);
 
 	if (doorReason == kCanOpenDoor)
 		startDoorOpenMovie(door.movieStart, door.movieEnd);
@@ -851,7 +851,7 @@ void Neighborhood::updateViewFrame() {
 	showViewFrame(getViewTime(GameState.getCurrentRoom(), GameState.getCurrentDirection()));
 }
 
-void Neighborhood::startSpotLoop(TimeValue startTime, TimeValue stopTime, tNotificationFlags flags) {
+void Neighborhood::startSpotLoop(TimeValue startTime, TimeValue stopTime, NotificationFlags flags) {
 	_turnPush.hide();
 	startMovieSequence(startTime, stopTime, flags, true, kFilterAllInput);
 }
@@ -873,7 +873,7 @@ void Neighborhood::showViewFrame(TimeValue viewTime) {
 	}
 }
 
-void Neighborhood::startExtraSequence(const tExtraID extraID, const tNotificationFlags flags, const tInputBits interruptionFilter) {
+void Neighborhood::startExtraSequence(const ExtraID extraID, const NotificationFlags flags, const InputBits interruptionFilter) {
 	ExtraTable::Entry entry;
 	getExtraEntry(extraID, entry);
 
@@ -881,12 +881,12 @@ void Neighborhood::startExtraSequence(const tExtraID extraID, const tNotificatio
 		playExtraMovie(entry, flags, interruptionFilter);
 }
 
-bool Neighborhood::startExtraSequenceSync(const tExtraID extraID, const tInputBits interruptionFilter) {
+bool Neighborhood::startExtraSequenceSync(const ExtraID extraID, const InputBits interruptionFilter) {
 	InputHandler::getCurrentInputDevice()->waitInput(interruptionFilter);
 	return prepareExtraSync(extraID) && waitMovieFinish(&_navMovie, interruptionFilter);
 }
 
-void Neighborhood::loopExtraSequence(const uint32 extraID, tNotificationFlags flags) {
+void Neighborhood::loopExtraSequence(const uint32 extraID, NotificationFlags flags) {
 	ExtraTable::Entry entry;
 	getExtraEntry(extraID, entry);
 	
@@ -900,12 +900,12 @@ bool Neighborhood::navMoviePlaying() {
 	return _navMovie.isRunning();
 }
 
-void Neighborhood::playDeathExtra(tExtraID extra, tDeathReason deathReason) {
+void Neighborhood::playDeathExtra(ExtraID extra, DeathReason deathReason) {
 	_extraDeathReason = deathReason;
 	startExtraSequence(extra, kDeathExtraCompletedFlag, kFilterNoInput);
 }
 
-void Neighborhood::die(const tDeathReason deathReason) {
+void Neighborhood::die(const DeathReason deathReason) {
 	loadLoopSound1("");
 	loadLoopSound2("");
 	_vm->die(deathReason);
@@ -930,7 +930,7 @@ void Neighborhood::setAmbienceLevel(const uint16 ambientLevel) {
 }
 
 // Force the exit taken from (room, direction, alternate) to come to a stop.
-void Neighborhood::forceStridingStop(const tRoomID room, const tDirectionConstant direction, const tAlternateID alternate) {
+void Neighborhood::forceStridingStop(const RoomID room, const DirectionConstant direction, const AlternateID alternate) {
 	ExitTable::Entry entry = _exitTable.findEntry(room, direction, alternate);
 
 	if (entry.movieStart != 0xffffffff) {
@@ -951,7 +951,7 @@ void Neighborhood::forceStridingStop(const tRoomID room, const tDirectionConstan
 }
 
 // Restore the exit taken from (room, direction, alternate) to stride.
-void Neighborhood::restoreStriding(const tRoomID room, const tDirectionConstant direction, const tAlternateID alternate) {
+void Neighborhood::restoreStriding(const RoomID room, const DirectionConstant direction, const AlternateID alternate) {
 	ExitTable::Entry entry = _exitTable.findEntry(room, direction, alternate);
 
 	if (entry.movieStart != 0xffffffff) {
@@ -971,7 +971,7 @@ void Neighborhood::restoreStriding(const tRoomID room, const tDirectionConstant
 	}
 }
 
-HotspotInfoTable::Entry *Neighborhood::findHotspotEntry(const tHotSpotID id) {
+HotspotInfoTable::Entry *Neighborhood::findHotspotEntry(const HotSpotID id) {
 	for (HotspotInfoTable::iterator it = _hotspotInfoTable.begin(); it != _hotspotInfoTable.end(); it++)
 		if (it->hotspot == id)
 			return &(*it);
@@ -1031,7 +1031,7 @@ void Neighborhood::startDoorOpenMovie(const TimeValue startTime, const TimeValue
 	startMovieSequence(startTime, stopTime, kDoorOpenCompletedFlag, kFilterNoInput, false);
 }
 
-void Neighborhood::startTurnPush(const tTurnDirection turnDirection, const TimeValue newView, const tDirectionConstant nextDir) {
+void Neighborhood::startTurnPush(const TurnDirection turnDirection, const TimeValue newView, const DirectionConstant nextDir) {
 	if (g_AIArea)
 		g_AIArea->lockAIOut();
 
@@ -1114,7 +1114,7 @@ void Neighborhood::startTurnPush(const tTurnDirection turnDirection, const TimeV
 	_neighborhoodNotification.setNotificationFlags(kTurnCompletedFlag, kTurnCompletedFlag);
 }
 
-void Neighborhood::playExtraMovie(const ExtraTable::Entry &extraEntry, const tNotificationFlags flags, const tInputBits interruptionInput) {
+void Neighborhood::playExtraMovie(const ExtraTable::Entry &extraEntry, const NotificationFlags flags, const InputBits interruptionInput) {
 	FaderMoveSpec compassMove;
 
 	if (g_compass)
@@ -1128,7 +1128,7 @@ void Neighborhood::playExtraMovie(const ExtraTable::Entry &extraEntry, const tNo
 		g_compass->startFader(compassMove);
 }
 
-void Neighborhood::activateCurrentView(const tRoomID room, const tDirectionConstant direction, tSpotFlags flag) {
+void Neighborhood::activateCurrentView(const RoomID room, const DirectionConstant direction, SpotFlags flag) {
 	SpotTable::Entry entry;
 	findSpotEntry(room, direction, flag, entry);
 
@@ -1161,7 +1161,7 @@ void Neighborhood::activateOneHotspot(HotspotInfoTable::Entry &entry, Hotspot *h
 			if (item &&	item->getItemNeighborhood() == getObjectID())
 				hotspot->setActive();
 		} else {
-			tHotSpotFlags flags = hotspot->getHotspotFlags();
+			HotSpotFlags flags = hotspot->getHotspotFlags();
 
 			if ((flags & kNeighborhoodSpotFlag) != 0) {
 				if (flags & kOpenDoorSpotFlag) {
@@ -1189,8 +1189,8 @@ void Neighborhood::startSpotOnceOnly(TimeValue startTime, TimeValue stopTime) {
 	startMovieSequence(startTime, stopTime, kSpotCompletedFlag, kFilterNoInput, false);
 }
 
-void Neighborhood::startMovieSequence(const TimeValue startTime, const TimeValue stopTime, tNotificationFlags flags, bool loopSequence,
-		const tInputBits interruptionInput, const TimeValue strideStop) {
+void Neighborhood::startMovieSequence(const TimeValue startTime, const TimeValue stopTime, NotificationFlags flags, bool loopSequence,
+		const InputBits interruptionInput, const TimeValue strideStop) {
 	if (!loopSequence && g_AIArea)
 		g_AIArea->lockAIOut();
 	
@@ -1269,7 +1269,7 @@ void Neighborhood::throwAwayInterface() {
 	delete g_interface;
 }
 
-bool Neighborhood::prepareExtraSync(const tExtraID extraID) {
+bool Neighborhood::prepareExtraSync(const ExtraID extraID) {
 	ExtraTable::Entry extraEntry;
 	FaderMoveSpec compassMove;
 	
@@ -1308,7 +1308,7 @@ bool Neighborhood::prepareExtraSync(const tExtraID extraID) {
 	return result;
 }
 
-bool Neighborhood::waitMovieFinish(Movie *movie, const tInputBits interruptionFilter) {
+bool Neighborhood::waitMovieFinish(Movie *movie, const InputBits interruptionFilter) {
 	Input input;
 	bool result = true;
 	bool saveAllowed = _vm->swapSaveAllowed(false);
@@ -1334,7 +1334,7 @@ bool Neighborhood::waitMovieFinish(Movie *movie, const tInputBits interruptionFi
 	return result;
 }
 
-tInputBits Neighborhood::getInputFilter() {
+InputBits Neighborhood::getInputFilter() {
 	return _interruptionFilter & InputHandler::getInputFilter();
 }
 
@@ -1396,14 +1396,14 @@ void Neighborhood::setUpAIRules() {
 	}
 }
 
-GameInteraction *Neighborhood::makeInteraction(const tInteractionID interactionID) {
+GameInteraction *Neighborhood::makeInteraction(const InteractionID interactionID) {
 	if (interactionID == kNoInteractionID)
 		return 0;
 
 	return new GameInteraction(interactionID, this);
 }
 
-void Neighborhood::newInteraction(const tInteractionID interactionID) {
+void Neighborhood::newInteraction(const InteractionID interactionID) {
 	GameInteraction *interaction = makeInteraction(interactionID);
 	_doneWithInteraction = false;
 
@@ -1541,8 +1541,8 @@ void Neighborhood::showExtraView(uint32 extraID) {
 		showViewFrame(entry.movieEnd - 1);
 }
 
-void Neighborhood::startExtraLongSequence(const uint32 firstExtra, const uint32 lastExtra, tNotificationFlags flags,
-		const tInputBits interruptionFilter) {
+void Neighborhood::startExtraLongSequence(const uint32 firstExtra, const uint32 lastExtra, NotificationFlags flags,
+		const InputBits interruptionFilter) {
 	ExtraTable::Entry firstEntry, lastEntry;
 	getExtraEntry(firstExtra, firstEntry);
 
@@ -1554,7 +1554,7 @@ void Neighborhood::startExtraLongSequence(const uint32 firstExtra, const uint32
 	}
 }
 
-void Neighborhood::openCroppedMovie(const Common::String &movieName, tCoordType left, tCoordType top) {
+void Neighborhood::openCroppedMovie(const Common::String &movieName, CoordType left, CoordType top) {
 	if (_croppedMovie.isMovieValid())
 		closeCroppedMovie();
 
@@ -1564,7 +1564,7 @@ void Neighborhood::openCroppedMovie(const Common::String &movieName, tCoordType
 	_croppedMovie.show();
 }
 
-void Neighborhood::loopCroppedMovie(const Common::String &movieName, tCoordType left, tCoordType top) {
+void Neighborhood::loopCroppedMovie(const Common::String &movieName, CoordType left, CoordType top) {
 	openCroppedMovie(movieName, left, top);
 	_croppedMovie.redrawMovieWorld();
 	_croppedMovie.setFlags(kLoopTimeBase);
@@ -1575,12 +1575,12 @@ void Neighborhood::closeCroppedMovie() {
 	_croppedMovie.releaseMovie();
 }
 
-void Neighborhood::playCroppedMovieOnce(const Common::String &movieName, tCoordType left, tCoordType top, const tInputBits interruptionFilter) {	
+void Neighborhood::playCroppedMovieOnce(const Common::String &movieName, CoordType left, CoordType top, const InputBits interruptionFilter) {	
 	openCroppedMovie(movieName, left, top);
 	_croppedMovie.redrawMovieWorld();
 	_croppedMovie.start();
 
-	tInputBits oldInterruptionFilter = _interruptionFilter;
+	InputBits oldInterruptionFilter = _interruptionFilter;
 	if (oldInterruptionFilter != kFilterNoInput)
 		_interruptionFilter = kFilterNoInput;
 
@@ -1651,12 +1651,12 @@ void Neighborhood::handleInput(const Input &input, const Hotspot *cursorSpot) {
 	InputHandler::handleInput(input, cursorSpot);
 }
 
-void Neighborhood::setHotspotFlags(const tHotSpotID id, const tHotSpotFlags flags) {
+void Neighborhood::setHotspotFlags(const HotSpotID id, const HotSpotFlags flags) {
 	Hotspot *hotspot = g_allHotspots.findHotspotByID(id);
 	hotspot->setMaskedHotspotFlags(flags, flags);
 }
 
-void Neighborhood::setIsItemTaken(const tItemID id) {
+void Neighborhood::setIsItemTaken(const ItemID id) {
 	GameState.setTakenItemID(id, _vm->playerHasItemID(id));
 }
 
@@ -1693,7 +1693,7 @@ void Neighborhood::downButton(const Input &) {
 	}
 }
 
-void Neighborhood::initOnePicture(Picture *picture, const Common::String &pictureName, tDisplayOrder order, tCoordType left, tCoordType top, bool show) {
+void Neighborhood::initOnePicture(Picture *picture, const Common::String &pictureName, DisplayOrder order, CoordType left, CoordType top, bool show) {
 	picture->initFromPICTFile(pictureName);
 	picture->setDisplayOrder(order);
 	picture->moveElementTo(left, top);
@@ -1702,7 +1702,7 @@ void Neighborhood::initOnePicture(Picture *picture, const Common::String &pictur
 		picture->show();
 }
 
-void Neighborhood::initOneMovie(Movie *movie, const Common::String &movieName, tDisplayOrder order, tCoordType left, tCoordType top, bool show) {
+void Neighborhood::initOneMovie(Movie *movie, const Common::String &movieName, DisplayOrder order, CoordType left, CoordType top, bool show) {
 	movie->initFromMovieFile(movieName);
 	movie->setDisplayOrder(order);
 	movie->moveElementTo(left, top);
diff --git a/engines/pegasus/neighborhood/neighborhood.h b/engines/pegasus/neighborhood/neighborhood.h
index c11fe78e59..7b1f86780a 100644
--- a/engines/pegasus/neighborhood/neighborhood.h
+++ b/engines/pegasus/neighborhood/neighborhood.h
@@ -52,24 +52,24 @@ namespace Pegasus {
 class PegasusEngine;
 
 // Pegasus Prime neighborhood id's
-const tNeighborhoodID kCaldoriaID = 0;
-const tNeighborhoodID kFullTSAID = 1;
-const tNeighborhoodID kFinalTSAID = 2;
-const tNeighborhoodID kTinyTSAID = 3;
-const tNeighborhoodID kPrehistoricID = 4;
-const tNeighborhoodID kMarsID = 5;
-const tNeighborhoodID kWSCID = 6;
-const tNeighborhoodID kNoradAlphaID = 7;
-const tNeighborhoodID kNoradDeltaID = 8;
+const NeighborhoodID kCaldoriaID = 0;
+const NeighborhoodID kFullTSAID = 1;
+const NeighborhoodID kFinalTSAID = 2;
+const NeighborhoodID kTinyTSAID = 3;
+const NeighborhoodID kPrehistoricID = 4;
+const NeighborhoodID kMarsID = 5;
+const NeighborhoodID kWSCID = 6;
+const NeighborhoodID kNoradAlphaID = 7;
+const NeighborhoodID kNoradDeltaID = 8;
 // The sub chase is not really a neighborhood, but we define a constant that is used
 // to allow an easy transition out of Norad Alpha.
-const tNeighborhoodID kNoradSubChaseID = 1000;
+const NeighborhoodID kNoradSubChaseID = 1000;
 
 const TimeScale kDefaultLoopFadeScale = kThirtyTicksPerSecond;
 const TimeValue kDefaultLoopFadeOut = kHalfSecondPerThirtyTicks;
 const TimeValue kDefaultLoopFadeIn = kHalfSecondPerThirtyTicks;
 
-enum tQueueRequestType {
+enum QueueRequestType {
 	kNavExtraRequest,
 	kSpotSoundRequest,
 	kDelayRequest
@@ -78,18 +78,18 @@ enum tQueueRequestType {
 // For delay requests, start is interpreted as the total delay and stop is interpreted
 // as the scale the delay is in.
 // For extra requests, start and stop are not used.
-struct tQueueRequest {
-	tQueueRequestType requestType;
-	tExtraID extra;
+struct QueueRequest {
+	QueueRequestType requestType;
+	ExtraID extra;
 	TimeValue start, stop;
-	tInputBits interruptionFilter;
+	InputBits interruptionFilter;
 	bool playing;
-	tNotificationFlags flags;
+	NotificationFlags flags;
 	Notification *notification;
 };
 
-bool operator==(const tQueueRequest &arg1, const tQueueRequest &arg2);
-bool operator!=(const tQueueRequest &arg1, const tQueueRequest &arg2);
+bool operator==(const QueueRequest &arg1, const QueueRequest &arg2);
+bool operator!=(const QueueRequest &arg1, const QueueRequest &arg2);
 
 class GameInteraction;
 class Item;
@@ -106,40 +106,40 @@ protected:
 	Neighborhood *_neighborhood;
 };
 
-typedef Common::Queue<tQueueRequest> NeighborhoodActionQueue;
+typedef Common::Queue<QueueRequest> NeighborhoodActionQueue;
 
 class Neighborhood : public IDObject, public NotificationReceiver, public InputHandler, public Idler {
 friend class StriderCallBack;
 friend void timerFunction(FunctionPtr *, void *);
 
 public:
-	Neighborhood(InputHandler *nextHandler, PegasusEngine *vm, const Common::String &resName, tNeighborhoodID id);
+	Neighborhood(InputHandler *nextHandler, PegasusEngine *vm, const Common::String &resName, NeighborhoodID id);
 	virtual ~Neighborhood();
 
 	virtual void init();
 	virtual void start();
-	virtual void moveNavTo(const tCoordType, const tCoordType);
-	virtual void checkContinuePoint(const tRoomID, const tDirectionConstant) = 0;
+	virtual void moveNavTo(const CoordType, const CoordType);
+	virtual void checkContinuePoint(const RoomID, const DirectionConstant) = 0;
 	void makeContinuePoint();
 
 	virtual void activateHotspots();
 	virtual void clickInHotspot(const Input &, const Hotspot *);
 
-	virtual tCanMoveForwardReason canMoveForward(ExitTable::Entry &entry);
-	virtual tCanTurnReason canTurn(tTurnDirection turn, tDirectionConstant &nextDir);
-	virtual tCanOpenDoorReason canOpenDoor(DoorTable::Entry &entry);
+	virtual CanMoveForwardReason canMoveForward(ExitTable::Entry &entry);
+	virtual CanTurnReason canTurn(TurnDirection turn, DirectionConstant &nextDir);
+	virtual CanOpenDoorReason canOpenDoor(DoorTable::Entry &entry);
 
-	virtual void cantMoveThatWay(tCanMoveForwardReason);
-	virtual void cantTurnThatWay(tCanTurnReason) {}
-	virtual void cantOpenDoor(tCanOpenDoorReason);
-	virtual void arriveAt(tRoomID room, tDirectionConstant direction);
-	virtual void turnTo(const tDirectionConstant);
+	virtual void cantMoveThatWay(CanMoveForwardReason);
+	virtual void cantTurnThatWay(CanTurnReason) {}
+	virtual void cantOpenDoor(CanOpenDoorReason);
+	virtual void arriveAt(RoomID room, DirectionConstant direction);
+	virtual void turnTo(const DirectionConstant);
 	virtual void spotCompleted();
 	virtual void doorOpened();
-	virtual void closeDoorOffScreen(const tRoomID, const tDirectionConstant) {}
+	virtual void closeDoorOffScreen(const RoomID, const DirectionConstant) {}
 
 	virtual void moveForward();
-	virtual void turn(const tTurnDirection);
+	virtual void turn(const TurnDirection);
 	virtual void turnLeft();
 	virtual void turnRight();
 	virtual void turnUp();
@@ -149,43 +149,43 @@ public:
 
 	virtual void updateViewFrame();
 	
-	void requestExtraSequence(const tExtraID, const tNotificationFlags, const tInputBits interruptionFilter);
-	void requestSpotSound(const TimeValue, const TimeValue, const tInputBits interruptionFilter, const tNotificationFlags);
+	void requestExtraSequence(const ExtraID, const NotificationFlags, const InputBits interruptionFilter);
+	void requestSpotSound(const TimeValue, const TimeValue, const InputBits interruptionFilter, const NotificationFlags);
 	void playSpotSoundSync(const TimeValue in, const TimeValue out);
-	void requestDelay(const TimeValue, const TimeScale, const tInputBits interruptionFilter, const tNotificationFlags);
+	void requestDelay(const TimeValue, const TimeScale, const InputBits interruptionFilter, const NotificationFlags);
 
 	Notification *getNeighborhoodNotification() { return &_neighborhoodNotification; }
 
 	virtual void getExtraEntry(const uint32 id, ExtraTable::Entry &extraEntry);
-	virtual void startSpotLoop(TimeValue, TimeValue, tNotificationFlags = 0);
+	virtual void startSpotLoop(TimeValue, TimeValue, NotificationFlags = 0);
 	virtual bool actionQueueEmpty() { return _actionQueue.empty(); }
 	virtual void showViewFrame(TimeValue);
-	virtual void findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &spotEntry);
-	virtual void startExtraSequence(const tExtraID, const tNotificationFlags, const tInputBits interruptionFilter);
-	bool startExtraSequenceSync(const tExtraID, const tInputBits);
-	virtual void loopExtraSequence(const uint32, tNotificationFlags = 0);
+	virtual void findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &spotEntry);
+	virtual void startExtraSequence(const ExtraID, const NotificationFlags, const InputBits interruptionFilter);
+	bool startExtraSequenceSync(const ExtraID, const InputBits);
+	virtual void loopExtraSequence(const uint32, NotificationFlags = 0);
 	int32 getLastExtra() const { return _lastExtra; }
-	virtual void scheduleNavCallBack(tNotificationFlags);
+	virtual void scheduleNavCallBack(NotificationFlags);
 	
 	Movie *getNavMovie() { return &_navMovie; }
 	bool navMoviePlaying();
 	
-	void setCurrentAlternate(const tAlternateID alt) { _currentAlternate = alt; }
-	tAlternateID getCurrentAlternate() const { return _currentAlternate; }
+	void setCurrentAlternate(const AlternateID alt) { _currentAlternate = alt; }
+	AlternateID getCurrentAlternate() const { return _currentAlternate; }
 	
-	void setCurrentActivation(const tHotSpotActivationID a) { _currentActivation = a; }
-	tHotSpotActivationID getCurrentActivation() { return _currentActivation; }
+	void setCurrentActivation(const HotSpotActivationID a) { _currentActivation = a; }
+	HotSpotActivationID getCurrentActivation() { return _currentActivation; }
 	
-	virtual void playDeathExtra(tExtraID, tDeathReason);
-	virtual void die(const tDeathReason);
+	virtual void playDeathExtra(ExtraID, DeathReason);
+	virtual void die(const DeathReason);
 
 	virtual void setSoundFXLevel(const uint16);
 	virtual void setAmbienceLevel(const uint16);
 	
-	void forceStridingStop(const tRoomID, const tDirectionConstant, const tAlternateID);
-	void restoreStriding(const tRoomID, const tDirectionConstant, const tAlternateID);
+	void forceStridingStop(const RoomID, const DirectionConstant, const AlternateID);
+	void restoreStriding(const RoomID, const DirectionConstant, const AlternateID);
 	
-	HotspotInfoTable::Entry *findHotspotEntry(const tHotSpotID);
+	HotspotInfoTable::Entry *findHotspotEntry(const HotSpotID);
 	
 	Push *getTurnPush() { return &_turnPush; }
 	Picture *getTurnPushPicture() { return &_pushIn; }
@@ -208,7 +208,7 @@ public:
 
 	virtual bool okayToJump();
 
-	virtual tAirQuality getAirQuality(const tRoomID);
+	virtual AirQuality getAirQuality(const RoomID);
 	virtual void checkAirMask() {}
 	virtual void checkFlashlight() {}
 	virtual void shieldOn() {}
@@ -229,18 +229,18 @@ public:
 	virtual void dropItemIntoRoom(Item *, Hotspot *);
 	virtual Hotspot *getItemScreenSpot(Item *, DisplayElement *) { return 0; }
 
-	virtual GameInteraction *makeInteraction(const tInteractionID);
+	virtual GameInteraction *makeInteraction(const InteractionID);
 	virtual void requestDeleteCurrentInteraction() { _doneWithInteraction = true; }
 
 	virtual uint16 getDateResID() const = 0;
 
 	virtual void showExtraView(uint32);
-	virtual void startExtraLongSequence(const uint32, const uint32, tNotificationFlags, const tInputBits interruptionFilter);
+	virtual void startExtraLongSequence(const uint32, const uint32, NotificationFlags, const InputBits interruptionFilter);
 	
-	void openCroppedMovie(const Common::String &, tCoordType, tCoordType);
-	void loopCroppedMovie(const Common::String &, tCoordType, tCoordType);
+	void openCroppedMovie(const Common::String &, CoordType, CoordType);
+	void loopCroppedMovie(const Common::String &, CoordType, CoordType);
 	void closeCroppedMovie();
-	void playCroppedMovieOnce(const Common::String &, tCoordType, tCoordType, const tInputBits interruptionFilter = kFilterNoInput);
+	void playCroppedMovieOnce(const Common::String &, CoordType, CoordType, const InputBits interruptionFilter = kFilterNoInput);
 
 	void playMovieSegment(Movie *, TimeValue = 0, TimeValue = 0xffffffff);
 
@@ -258,15 +258,15 @@ protected:
 	virtual Common::String getNavMovieName() = 0;
 
 	// Notification function.
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 
 	// Map info functions.
-	virtual void getExitEntry(const tRoomID room, const tDirectionConstant direction, ExitTable::Entry &entry);
-	virtual TimeValue getViewTime(const tRoomID room, const tDirectionConstant direction);
-	virtual void getDoorEntry(const tRoomID room, const tDirectionConstant direction, DoorTable::Entry &doorEntry);
-	virtual tDirectionConstant getTurnEntry(const tRoomID room, const tDirectionConstant direction, const tTurnDirection turn);
-	virtual void getZoomEntry(const tHotSpotID id, ZoomTable::Entry &zoomEntry);
-	virtual void getHotspotEntry(const tHotSpotID id, HotspotInfoTable::Entry &hotspotEntry);
+	virtual void getExitEntry(const RoomID room, const DirectionConstant direction, ExitTable::Entry &entry);
+	virtual TimeValue getViewTime(const RoomID room, const DirectionConstant direction);
+	virtual void getDoorEntry(const RoomID room, const DirectionConstant direction, DoorTable::Entry &doorEntry);
+	virtual DirectionConstant getTurnEntry(const RoomID room, const DirectionConstant direction, const TurnDirection turn);
+	virtual void getZoomEntry(const HotSpotID id, ZoomTable::Entry &zoomEntry);
+	virtual void getHotspotEntry(const HotSpotID id, HotspotInfoTable::Entry &hotspotEntry);
 
 	// Nav movie sequences.
 	virtual void startExitMovie(const ExitTable::Entry &);
@@ -274,20 +274,20 @@ protected:
 	virtual void stopStriding();
 	virtual void checkStriding();
 	virtual bool stillMoveForward();
-	virtual void scheduleStridingCallBack(const TimeValue, tNotificationFlags flags);
+	virtual void scheduleStridingCallBack(const TimeValue, NotificationFlags flags);
 	virtual void startZoomMovie(const ZoomTable::Entry &);
 	virtual void startDoorOpenMovie(const TimeValue, const TimeValue);
-	virtual void startTurnPush(const tTurnDirection, const TimeValue, const tDirectionConstant);
-	virtual void playExtraMovie(const ExtraTable::Entry &, const tNotificationFlags, const tInputBits interruptionFilter);
+	virtual void startTurnPush(const TurnDirection, const TimeValue, const DirectionConstant);
+	virtual void playExtraMovie(const ExtraTable::Entry &, const NotificationFlags, const InputBits interruptionFilter);
 	
-	virtual void activateCurrentView(const tRoomID, const tDirectionConstant, tSpotFlags);
+	virtual void activateCurrentView(const RoomID, const DirectionConstant, SpotFlags);
 	
 	virtual void activateOneHotspot(HotspotInfoTable::Entry &, Hotspot *);
 	
 	virtual void startSpotOnceOnly(TimeValue, TimeValue);
 	
-	virtual void startMovieSequence(const TimeValue, const TimeValue, tNotificationFlags,
-  			bool loopSequence, const tInputBits interruptionFilter, const TimeValue strideStop = 0xffffffff);
+	virtual void startMovieSequence(const TimeValue, const TimeValue, NotificationFlags,
+  			bool loopSequence, const InputBits interruptionFilter, const TimeValue strideStop = 0xffffffff);
 	
 	virtual void createNeighborhoodSpots();
 	
@@ -298,34 +298,34 @@ protected:
 	// Action queue stuff
 	void popActionQueue();
 	void serviceActionQueue();
-	void requestAction(const tQueueRequestType, const tExtraID, const TimeValue, const TimeValue, const tInputBits, const tNotificationFlags);
+	void requestAction(const QueueRequestType, const ExtraID, const TimeValue, const TimeValue, const InputBits, const NotificationFlags);
 
-	virtual bool prepareExtraSync(const tExtraID);
-	virtual bool waitMovieFinish(Movie *, const tInputBits);
+	virtual bool prepareExtraSync(const ExtraID);
+	virtual bool waitMovieFinish(Movie *, const InputBits);
 	
-	virtual tInputBits getInputFilter();
+	virtual InputBits getInputFilter();
 
 	// Misc.
-	virtual int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant dir);
+	virtual int16 getStaticCompassAngle(const RoomID, const DirectionConstant dir);
 	virtual void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &);
 	virtual void getZoomCompassMove(const ZoomTable::Entry &, FaderMoveSpec&);
 	virtual void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec&);
 
 	virtual void setUpAIRules();
-	virtual void setHotspotFlags(const tHotSpotID, const tHotSpotFlags);
-	virtual void setIsItemTaken(const tItemID);
+	virtual void setHotspotFlags(const HotSpotID, const HotSpotFlags);
+	virtual void setIsItemTaken(const ItemID);
 
 	virtual void upButton(const Input &);
 	virtual void leftButton(const Input &);
 	virtual void rightButton(const Input &);
 	virtual void downButton(const Input &);
 
-	void initOnePicture(Picture *, const Common::String &, tDisplayOrder, tCoordType, tCoordType, bool);
-	void initOneMovie(Movie *, const Common::String &, tDisplayOrder, tCoordType, tCoordType, bool);
+	void initOnePicture(Picture *, const Common::String &, DisplayOrder, CoordType, CoordType, bool);
+	void initOneMovie(Movie *, const Common::String &, DisplayOrder, CoordType, CoordType, bool);
 
 	void reinstateMonocleInterface();
 
-	virtual void newInteraction(const tInteractionID);
+	virtual void newInteraction(const InteractionID);
 	virtual void useIdleTime();
 	virtual void bumpIntoWall();
 	virtual void zoomUpOrBump();
@@ -349,11 +349,11 @@ protected:
 	TurnTable _turnTable;
 	ViewTable _viewTable;
 	ZoomTable _zoomTable;
-	tAlternateID _currentAlternate;
-	tHotSpotActivationID _currentActivation;
+	AlternateID _currentAlternate;
+	HotSpotActivationID _currentActivation;
 	
 	int32 _lastExtra;
-	tDeathReason _extraDeathReason;
+	DeathReason _extraDeathReason;
 
 	// Graphics
 	Movie _navMovie;
@@ -379,7 +379,7 @@ protected:
 	TimeBase _delayTimer;
 
 	// Interruptibility...
-	tInputBits _interruptionFilter;
+	InputBits _interruptionFilter;
 
 	// Nav hiding (for info support...)
 	bool _isRunning;
diff --git a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp
index 2af4335cc5..ff1f078b15 100755
--- a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.cpp
@@ -30,10 +30,10 @@
 
 namespace Pegasus {
 
-static const tNotificationFlags kECRSection1FinishedFlag = 1;
-static const tNotificationFlags kECRPanFinishedFlag = kECRSection1FinishedFlag << 1;
-static const tNotificationFlags kECRSection2FinishedFlag = kECRPanFinishedFlag << 1;
-static const tNotificationFlags kECRNotificationFlags = kECRSection1FinishedFlag |
+static const NotificationFlags kECRSection1FinishedFlag = 1;
+static const NotificationFlags kECRPanFinishedFlag = kECRSection1FinishedFlag << 1;
+static const NotificationFlags kECRSection2FinishedFlag = kECRPanFinishedFlag << 1;
+static const NotificationFlags kECRNotificationFlags = kECRSection1FinishedFlag |
 													kECRPanFinishedFlag |
 													kECRSection2FinishedFlag;
 
@@ -45,7 +45,7 @@ static const TimeValue kSection2Start = 26;
 static const TimeValue kSection2Stop = 1000;
 
 // Seems to be a good value for a 20 second pan.
-static const tCoordType kPanPixelsPerFrame = 8;
+static const CoordType kPanPixelsPerFrame = 8;
 
 // Interesting times are in seconds.
 static const TimeValue s_ECRInterestingTimes[] = {
@@ -63,7 +63,7 @@ NoradAlphaECRMonitor::NoradAlphaECRMonitor(Neighborhood *nextHandler) : GameInte
 		_ecrPan(kECRPanID) {
 }
 
-void NoradAlphaECRMonitor::receiveNotification(Notification *, const tNotificationFlags flags) {
+void NoradAlphaECRMonitor::receiveNotification(Notification *, const NotificationFlags flags) {
 	if (flags & kECRSection1FinishedFlag)
 		ecrSection1Finished();
 	else if (flags & kECRPanFinishedFlag)
diff --git a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.h b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.h
index 329dae7310..9e286ed337 100755
--- a/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.h
+++ b/engines/pegasus/neighborhood/norad/alpha/ecrmonitor.h
@@ -43,7 +43,7 @@ protected:
 	virtual void openInteraction();
 	virtual void closeInteraction();
 
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 
 	void ecrSection1Finished();
 	void ecrPanFinished();
diff --git a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
index c115f903b0..00cfe71752 100755
--- a/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/fillingstation.cpp
@@ -32,18 +32,18 @@
 
 namespace Pegasus {
 
-const tNotificationFlags kFSPowerUpFinishedFlag = 1;
-const tNotificationFlags kFSSplashFinishedFlag = kFSPowerUpFinishedFlag << 1;
-const tNotificationFlags kFSIntakeWarningFinishedFlag = kFSSplashFinishedFlag << 1;
-const tNotificationFlags kFSIntakeHiliteFinishedFlag = kFSIntakeWarningFinishedFlag << 1;
-const tNotificationFlags kFSDispenseHiliteFinishedFlag = kFSIntakeHiliteFinishedFlag << 1;
-const tNotificationFlags kFSArHiliteFinishedFlag = kFSDispenseHiliteFinishedFlag << 1;
-const tNotificationFlags kFSCO2HiliteFinishedFlag = kFSArHiliteFinishedFlag << 1;
-const tNotificationFlags kFSHeHiliteFinishedFlag = kFSCO2HiliteFinishedFlag << 1;
-const tNotificationFlags kFSOHiliteFinishedFlag = kFSHeHiliteFinishedFlag << 1;
-const tNotificationFlags kFSNHiliteFinishedFlag = kFSOHiliteFinishedFlag << 1;
-
-const tNotificationFlags kFSNotificationFlags = kFSPowerUpFinishedFlag |
+const NotificationFlags kFSPowerUpFinishedFlag = 1;
+const NotificationFlags kFSSplashFinishedFlag = kFSPowerUpFinishedFlag << 1;
+const NotificationFlags kFSIntakeWarningFinishedFlag = kFSSplashFinishedFlag << 1;
+const NotificationFlags kFSIntakeHiliteFinishedFlag = kFSIntakeWarningFinishedFlag << 1;
+const NotificationFlags kFSDispenseHiliteFinishedFlag = kFSIntakeHiliteFinishedFlag << 1;
+const NotificationFlags kFSArHiliteFinishedFlag = kFSDispenseHiliteFinishedFlag << 1;
+const NotificationFlags kFSCO2HiliteFinishedFlag = kFSArHiliteFinishedFlag << 1;
+const NotificationFlags kFSHeHiliteFinishedFlag = kFSCO2HiliteFinishedFlag << 1;
+const NotificationFlags kFSOHiliteFinishedFlag = kFSHeHiliteFinishedFlag << 1;
+const NotificationFlags kFSNHiliteFinishedFlag = kFSOHiliteFinishedFlag << 1;
+
+const NotificationFlags kFSNotificationFlags = kFSPowerUpFinishedFlag |
 												kFSSplashFinishedFlag |
 												kFSIntakeWarningFinishedFlag |
 												kFSIntakeHiliteFinishedFlag |
@@ -61,12 +61,10 @@ const int16 kDispenseMenu = 3;
 const int16 kWaitingForDispense = 4;
 
 // Dummy itemIDs
+const ItemID kCO2Item = 10000;
+const ItemID kHeItem = 10001;
 
-const tItemID kCO2Item = 10000;
-const tItemID kHeItem = 10001;
-
-//	Interactive points.
-
+// Interactive points.
 const TimeValue kFSPowerUpStartStart = 0;
 const TimeValue kFSPowerUpStartStop = 600;
 const TimeValue kFSSplashStart = 600;
@@ -168,7 +166,7 @@ void NoradAlphaFillingStation::setStaticState(TimeValue time, int16 state) {
 	allowInput(true);
 }
 
-void NoradAlphaFillingStation::setSegmentState(TimeValue start, TimeValue stop, tNotificationFlags flag, int16 state) {	
+void NoradAlphaFillingStation::setSegmentState(TimeValue start, TimeValue stop, NotificationFlags flag, int16 state) {	
 	_rightSideMovie.stop();
 	_rightSideMovie.setSegment(start, stop);
 	_rightSideMovie.setTime(start);
@@ -316,7 +314,7 @@ void NoradAlphaFillingStation::NHighlightFinished() {
 	dispenseGas();
 }
 
-void NoradAlphaFillingStation::receiveNotification(Notification *, const tNotificationFlags flags) {
+void NoradAlphaFillingStation::receiveNotification(Notification *, const NotificationFlags flags) {
 	switch (flags) {
 	case kFSPowerUpFinishedFlag:
 		powerUpFinished();
diff --git a/engines/pegasus/neighborhood/norad/alpha/fillingstation.h b/engines/pegasus/neighborhood/norad/alpha/fillingstation.h
index e3fb1f6fd8..eb2088e373 100755
--- a/engines/pegasus/neighborhood/norad/alpha/fillingstation.h
+++ b/engines/pegasus/neighborhood/norad/alpha/fillingstation.h
@@ -47,7 +47,7 @@ public:
 	void newFillingItem(Item *);
 
 protected:
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 
 	virtual void openInteraction();
 	virtual void initInteraction();
@@ -77,13 +77,13 @@ protected:
 	void dispenseGas();
 
 	void setStaticState(TimeValue, int16);
-	void setSegmentState(TimeValue, TimeValue, tNotificationFlags, int16);
+	void setSegmentState(TimeValue, TimeValue, NotificationFlags, int16);
 
 	Movie _rightSideMovie;
 	Notification _rightSideNotification;
 	NotificationCallBack _rightSideCallBack;
 	int16 _state;
-	tItemID _dispenseItemID;
+	ItemID _dispenseItemID;
 };
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp b/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp
index 3bab3b822d..8391a3ff10 100755
--- a/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/noradalpha.cpp
@@ -132,9 +132,9 @@ void NoradAlpha::start() {
 		g_energyMonitor->startEnergyDraining();
 	}
 
-	tNeighborhoodID itemNeighborhood;
-	tRoomID itemRoom;
-	tDirectionConstant itemDirection;
+	NeighborhoodID itemNeighborhood;
+	RoomID itemRoom;
+	DirectionConstant itemDirection;
 
 	Item *item = (Item *)g_allItems.findItemByID(kGasCanister);
 	item->getItemRoom(itemNeighborhood, itemRoom, itemDirection);
@@ -211,7 +211,7 @@ void NoradAlpha::playClawMonitorIntro() {
 	playSpotSoundSync(kLoadClawIntroIn, kLoadClawIntroOut);
 }
 
-GameInteraction *NoradAlpha::makeInteraction(const tInteractionID interactionID) {
+GameInteraction *NoradAlpha::makeInteraction(const InteractionID interactionID) {
 	switch (interactionID) {
 	case kNoradECRMonitorInteractionID:
 		return new NoradAlphaECRMonitor(this);
@@ -250,7 +250,7 @@ void NoradAlpha::loadAmbientLoops() {
 	if (!GameState.getNoradSeenTimeStream())
 		return;
 
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 	if (GameState.getNoradGassed()) {
 		if (room >= kNorad11 && room <= kNorad19West)
 			loadLoopSound1("Sounds/Norad/NEW SUB AMB.22K.AIFF", kNoradWarningVolume * 3);
@@ -288,7 +288,7 @@ void NoradAlpha::loadAmbientLoops() {
 	
 }
 
-void NoradAlpha::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) {
+void NoradAlpha::checkContinuePoint(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kNorad02, kEast):
 	case MakeRoomView(kNorad06, kEast):
@@ -301,7 +301,7 @@ void NoradAlpha::checkContinuePoint(const tRoomID room, const tDirectionConstant
 	}
 }
 
-void NoradAlpha::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void NoradAlpha::arriveAt(const RoomID room, const DirectionConstant direction) {
 	Norad::arriveAt(room, direction);
 
 	switch (GameState.getCurrentRoom()) {
@@ -364,7 +364,7 @@ void NoradAlpha::bumpIntoWall() {
 	Neighborhood::bumpIntoWall();
 }
 
-void NoradAlpha::receiveNotification(Notification *notification, const tNotificationFlags flags) {
+void NoradAlpha::receiveNotification(Notification *notification, const NotificationFlags flags) {
 	if ((flags & kExtraCompletedFlag) != 0) {
 		switch (_lastExtra) {
 		case kNoradArriveFromTSA:
@@ -400,7 +400,7 @@ void NoradAlpha::receiveNotification(Notification *notification, const tNotifica
 	g_AIArea->checkMiddleArea();
 }
 
-void NoradAlpha::getZoomEntry(const tHotSpotID spotID, ZoomTable::Entry &entry) {
+void NoradAlpha::getZoomEntry(const HotSpotID spotID, ZoomTable::Entry &entry) {
 	Norad::getZoomEntry(spotID, entry);
 
 	ExtraTable::Entry extra;
@@ -428,7 +428,7 @@ void NoradAlpha::getZoomEntry(const tHotSpotID spotID, ZoomTable::Entry &entry)
 	}
 }
 
-TimeValue NoradAlpha::getViewTime(const tRoomID room, const tDirectionConstant direction) {
+TimeValue NoradAlpha::getViewTime(const RoomID room, const DirectionConstant direction) {
 	ExtraTable::Entry entry;
 	
 	if (room == kNorad01 && direction == kSouth && !GameState.getNoradSeenTimeStream()) {
@@ -511,13 +511,13 @@ void NoradAlpha::activateHotspots() {
 	case MakeRoomView(kNorad01West, kWest):
 		if (_vm->getDragType() == kDragInventoryUse) {
 			if (!_fillingStationItem) {
-				tItemID itemID = _vm->getDraggingItem()->getObjectID();
+				ItemID itemID = _vm->getDraggingItem()->getObjectID();
 				if (itemID == kArgonCanister || itemID == kGasCanister || itemID == kAirMask ||
 						itemID == kNitrogenCanister)
 					g_allHotspots.activateOneHotspot(kN01GasOutletSpotID);
 			}
 		} else {
-			tHotSpotID spotID;
+			HotSpotID spotID;
 
 			if (_fillingStationItem) {
 				switch (_fillingStationItem->getObjectID()) {
@@ -596,9 +596,9 @@ void NoradAlpha::dropItemIntoRoom(Item *item, Hotspot *droppedSpot) {
 	Norad::dropItemIntoRoom(item, droppedSpot);
 }
 
-void NoradAlpha::getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, tHotSpotID &clawControlSpotID, tHotSpotID &pinchClawSpotID,
-		tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID, tHotSpotID &moveClawLeftSpotID, tHotSpotID &moveClawUpSpotID,
-		tHotSpotID &clawCCWSpotID, tHotSpotID &clawCWSpotID, uint32 &clawPosition, const uint32 *&clawExtraIDs) {
+void NoradAlpha::getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, HotSpotID &clawControlSpotID, HotSpotID &pinchClawSpotID,
+		HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID, HotSpotID &moveClawLeftSpotID, HotSpotID &moveClawUpSpotID,
+		HotSpotID &clawCCWSpotID, HotSpotID &clawCWSpotID, uint32 &clawPosition, const uint32 *&clawExtraIDs) {
 	outSpotID = kNorad22MonitorOutSpotID;
 	prepSpotID = kNorad22LaunchPrepSpotID;
 	clawControlSpotID = kNorad22ClawControlSpotID;
@@ -632,7 +632,7 @@ Common::String NoradAlpha::getEnvScanMovie() {
 	Common::String movieName = Neighborhood::getEnvScanMovie();
 
 	if (movieName.empty()) {
-		tRoomID room = GameState.getCurrentRoom();
+		RoomID room = GameState.getCurrentRoom();
 		if (room >= kNorad01 && room <= kNorad01West)
 			return "Images/AI/Norad/XNE1";
 		else if ((room >= kNorad02 && room <= kNorad19West))
@@ -718,7 +718,7 @@ Common::String NoradAlpha::getHintMovie(uint hintNum) {
 	return movieName;
 }
 
-void NoradAlpha::closeDoorOffScreen(const tRoomID room, const tDirectionConstant) {
+void NoradAlpha::closeDoorOffScreen(const RoomID room, const DirectionConstant) {
 	switch (room) {
 	case kNorad12:
 	case kNorad13:
@@ -732,7 +732,7 @@ void NoradAlpha::closeDoorOffScreen(const tRoomID room, const tDirectionConstant
 	}
 }
 
-void NoradAlpha::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &spotEntry) {
+void NoradAlpha::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &spotEntry) {
 	if (room == kNorad01 && direction == kSouth)
 		spotEntry.clear();
 	else
diff --git a/engines/pegasus/neighborhood/norad/alpha/noradalpha.h b/engines/pegasus/neighborhood/norad/alpha/noradalpha.h
index 9b96d136ec..b88a6eb802 100755
--- a/engines/pegasus/neighborhood/norad/alpha/noradalpha.h
+++ b/engines/pegasus/neighborhood/norad/alpha/noradalpha.h
@@ -54,12 +54,12 @@ public:
 	virtual void takeItemFromRoom(Item *);
 	virtual void dropItemIntoRoom(Item *, Hotspot *);
 
-	virtual GameInteraction *makeInteraction(const tInteractionID);
+	virtual GameInteraction *makeInteraction(const InteractionID);
 
-	virtual void getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, tHotSpotID &clawControlSpotID,
-			tHotSpotID &pinchClawSpotID, tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID,
-			tHotSpotID &moveClawLeftSpotID, tHotSpotID &moveClawUpSpotID, tHotSpotID &clawCCWSpotID,
-			tHotSpotID &clawCWSpotID, uint32 &, const uint32 *&);
+	virtual void getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, HotSpotID &clawControlSpotID,
+			HotSpotID &pinchClawSpotID, HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID,
+			HotSpotID &moveClawLeftSpotID, HotSpotID &moveClawUpSpotID, HotSpotID &clawCCWSpotID,
+			HotSpotID &clawCWSpotID, uint32 &, const uint32 *&);
 
 	void loadAmbientLoops();
 
@@ -71,11 +71,11 @@ public:
 	void setSubPrepFailed(bool value) { _subPrepFailed = value; }
 	bool getSubPrepFailed() { return _subPrepFailed; }
 
-	void closeDoorOffScreen(const tRoomID, const tDirectionConstant);
-	void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &);
+	void closeDoorOffScreen(const RoomID, const DirectionConstant);
+	void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &);
 	void clickInHotspot(const Input &, const Hotspot *);
 
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 
 	bool canSolve();
 	void doSolve();
@@ -89,12 +89,12 @@ protected:
 	virtual void arriveAtNorad04();
 	virtual void arriveAtNorad22();
 	
-	virtual void arriveAt(const tRoomID, const tDirectionConstant);
+	virtual void arriveAt(const RoomID, const DirectionConstant);
 	
-	virtual void getZoomEntry(const tHotSpotID, ZoomTable::Entry &);
-	virtual TimeValue getViewTime(const tRoomID, const tDirectionConstant);
+	virtual void getZoomEntry(const HotSpotID, ZoomTable::Entry &);
+	virtual TimeValue getViewTime(const RoomID, const DirectionConstant);
 	
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 
 	virtual void activateHotspots();
 
diff --git a/engines/pegasus/neighborhood/norad/alpha/panorama.cpp b/engines/pegasus/neighborhood/norad/alpha/panorama.cpp
index 417305cbc2..614595ba25 100755
--- a/engines/pegasus/neighborhood/norad/alpha/panorama.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/panorama.cpp
@@ -118,13 +118,13 @@ void Panorama::setViewBounds(const Common::Rect &newView) {
 	}
 
 	if (_viewBounds != r) {
-		tCoordType stripLeft = 0;
+		CoordType stripLeft = 0;
 
 		if (r.width() != _viewBounds.width() || !_panoramaWorld.isSurfaceValid()) {
 			_panoramaWorld.deallocateSurface();
 			makeNewSurface(r);
 		} else {
-			tCoordType stripRight;
+			CoordType stripRight;
 			calcStripRange(r, stripLeft, stripRight);
 			loadStrips(stripLeft, stripRight);
 		}
@@ -159,7 +159,7 @@ void Panorama::drawPanorama(const Common::Rect &destRect) {
 //      _panoramaHeight, _stripWidth is correct.
 //      _panoramaMovie is allocated.
 void Panorama::makeNewSurface(const Common::Rect& view) {
-	tCoordType stripLeft, stripRight;	
+	CoordType stripLeft, stripRight;	
 	calcStripRange(view, stripLeft, stripRight);
 
 	Common::Rect r(0, 0, (stripRight - stripLeft + 1) * _stripWidth, _panoramaHeight);
@@ -169,7 +169,7 @@ void Panorama::makeNewSurface(const Common::Rect& view) {
 }
 
 // Assumes view is not empty.
-void Panorama::calcStripRange(const Common::Rect &view, tCoordType &stripLeft, tCoordType &stripRight) {
+void Panorama::calcStripRange(const Common::Rect &view, CoordType &stripLeft, CoordType &stripRight) {
 	stripLeft = view.left / _stripWidth;
 	stripRight = (view.left - view.left % _stripWidth + _stripWidth - 1 + view.width()) / _stripWidth;
 }
@@ -179,18 +179,18 @@ void Panorama::calcStripRange(const Common::Rect &view, tCoordType &stripLeft, t
 // Assumptions:
 //      Surface is allocated and is big enough for maximum range of
 //          stripLeft and stripRight
-void Panorama::loadStrips(tCoordType stripLeft, tCoordType stripRight) {	
+void Panorama::loadStrips(CoordType stripLeft, CoordType stripRight) {	
 	if (_stripLeft == -1) {
 		// Surface has just been allocated.
 		// Load in all strips.
-		for (tCoordType i = stripLeft; i <= stripRight; i++)
+		for (CoordType i = stripLeft; i <= stripRight; i++)
 			loadOneStrip(i, stripLeft);
 
 		_stripLeft = stripLeft;
 		_stripRight = stripRight;
 	} else if (stripLeft != _stripLeft) {
-		tCoordType overlapLeft = MAX(stripLeft, _stripLeft);
-		tCoordType overlapRight = MIN(stripRight, _stripRight);
+		CoordType overlapLeft = MAX(stripLeft, _stripLeft);
+		CoordType overlapRight = MIN(stripRight, _stripRight);
 
 		if (overlapLeft <= overlapRight) {
 			Common::Rect r1((overlapLeft - _stripLeft) * _stripWidth, 0,
@@ -202,18 +202,18 @@ void Panorama::loadStrips(tCoordType stripLeft, tCoordType stripRight) {
 				_panoramaWorld.getSurfaceBounds(bounds);
 				_panoramaWorld.getSurface()->move(bounds.right - r1.right, 0, _panoramaHeight);
 
-				for (tCoordType i = stripLeft; i < _stripLeft; i++)
+				for (CoordType i = stripLeft; i < _stripLeft; i++)
 					loadOneStrip(i, stripLeft);
 			} else {
 				_panoramaWorld.getSurface()->move(-r1.left, 0, _panoramaHeight);
 
-				for (tCoordType i = _stripRight + 1; i <= stripRight; i++)
+				for (CoordType i = _stripRight + 1; i <= stripRight; i++)
 					loadOneStrip(i, stripLeft);
 			}
 		} else {
 			// No overlap.
 			// Load everything.
-			for (tCoordType i = stripLeft; i <= stripRight; i++)
+			for (CoordType i = stripLeft; i <= stripRight; i++)
 				loadOneStrip(i, stripLeft);
 		}
 
@@ -221,7 +221,7 @@ void Panorama::loadStrips(tCoordType stripLeft, tCoordType stripRight) {
 		_stripRight = stripRight;
 	} else if (stripRight > _stripRight) {
 		// Need to add one or more strips.
-		for (tCoordType i = _stripRight + 1; i <= stripRight; i++)
+		for (CoordType i = _stripRight + 1; i <= stripRight; i++)
 			loadOneStrip(i, _stripLeft);
 
 		_stripRight = stripRight;
@@ -231,7 +231,7 @@ void Panorama::loadStrips(tCoordType stripLeft, tCoordType stripRight) {
 	}
 }
 
-void Panorama::loadOneStrip(tCoordType stripToLoad, tCoordType leftStrip) {
+void Panorama::loadOneStrip(CoordType stripToLoad, CoordType leftStrip) {
 	_panoramaMovie.moveMovieBoxTo((stripToLoad - leftStrip) * _stripWidth, 0);
 	_panoramaMovie.setTime(stripToLoad, 1);
 	_panoramaMovie.redrawMovieWorld();
diff --git a/engines/pegasus/neighborhood/norad/alpha/panorama.h b/engines/pegasus/neighborhood/norad/alpha/panorama.h
index a773da9750..3ca2c1e305 100755
--- a/engines/pegasus/neighborhood/norad/alpha/panorama.h
+++ b/engines/pegasus/neighborhood/norad/alpha/panorama.h
@@ -79,18 +79,18 @@ public:
 protected:
 	void blankFields();
 	void makeNewSurface(const Common::Rect &);
-	void calcStripRange(const Common::Rect &, tCoordType &, tCoordType &);
-	void loadStrips(tCoordType, tCoordType);
-	void loadOneStrip(tCoordType, tCoordType);
+	void calcStripRange(const Common::Rect &, CoordType &, CoordType &);
+	void loadStrips(CoordType, CoordType);
+	void loadOneStrip(CoordType, CoordType);
 	
 	Movie _panoramaMovie;
 	Surface _panoramaWorld, *_mask;
 	Common::Rect _viewBounds;
 	Common::Rect _drawBounds;
-	tCoordType _panoramaWidth, _panoramaHeight;
-	tCoordType _stripWidth; // Pixels per strip.
-	tCoordType _numStrips;
-	tCoordType _stripLeft, _stripRight;
+	CoordType _panoramaWidth, _panoramaHeight;
+	CoordType _stripWidth; // Pixels per strip.
+	CoordType _numStrips;
+	CoordType _stripLeft, _stripRight;
 };
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/norad/alpha/panoramascroll.cpp b/engines/pegasus/neighborhood/norad/alpha/panoramascroll.cpp
index 2b8ff49a6a..fcb49c52ee 100755
--- a/engines/pegasus/neighborhood/norad/alpha/panoramascroll.cpp
+++ b/engines/pegasus/neighborhood/norad/alpha/panoramascroll.cpp
@@ -27,7 +27,7 @@
 
 namespace Pegasus {
 
-PanoramaScroll::PanoramaScroll(const tDisplayElementID id) : IdlerAnimation(id) {
+PanoramaScroll::PanoramaScroll(const DisplayElementID id) : IdlerAnimation(id) {
 	_boundsWidth = 0;
 	_totalWidth = 0;
 }
@@ -72,7 +72,7 @@ void PanoramaScroll::draw(const Common::Rect &) {
 }
 
 void PanoramaScroll::timeChanged(const TimeValue newTime) {	
-	tCoordType leftPixel = (_totalWidth - _boundsWidth) * newTime / getDuration();
+	CoordType leftPixel = (_totalWidth - _boundsWidth) * newTime / getDuration();
 
 	Common::Rect r;
 	_panorama.getViewBounds(r);
diff --git a/engines/pegasus/neighborhood/norad/alpha/panoramascroll.h b/engines/pegasus/neighborhood/norad/alpha/panoramascroll.h
index 8496181d73..6a3e1515e2 100755
--- a/engines/pegasus/neighborhood/norad/alpha/panoramascroll.h
+++ b/engines/pegasus/neighborhood/norad/alpha/panoramascroll.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 class PanoramaScroll : public IdlerAnimation {
 public:
-	PanoramaScroll(const tDisplayElementID);
+	PanoramaScroll(const DisplayElementID);
 	virtual ~PanoramaScroll() {}
 
 	void initFromMovieFile(const Common::String &);
@@ -52,7 +52,7 @@ protected:
 
 	Panorama _panorama;
 	Surface _mask;
-	tCoordType _totalWidth, _boundsWidth;
+	CoordType _totalWidth, _boundsWidth;
 };
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/norad/constants.h b/engines/pegasus/neighborhood/norad/constants.h
index 8d5eff4a95..92319b899d 100755
--- a/engines/pegasus/neighborhood/norad/constants.h
+++ b/engines/pegasus/neighborhood/norad/constants.h
@@ -196,9 +196,9 @@ const TimeValue kYouCannotPossiblyOut = 65740;
 const TimeValue kYouWillFailIn = 65740;
 const TimeValue kYouWillFailOut = 67217;
 
-const tCanOpenDoorReason kCantOpenBadPressure = kCantOpenLastReason + 1;
+const CanOpenDoorReason kCantOpenBadPressure = kCantOpenLastReason + 1;
 
-const tNotificationFlags kAirTimerExpiredFlag = kLastNeighborhoodNotificationFlag << 1;
+const NotificationFlags kAirTimerExpiredFlag = kLastNeighborhoodNotificationFlag << 1;
 
 const uint16 kNoradWarningVolume = 0x100 / 3;
 const uint16 kNoradSuckWindVolume = 0x100 / 2;
@@ -209,237 +209,237 @@ const int16 kSubControlCompassAngle = -10;
 
 //	Norad interactions.
 
-const tInteractionID kNoradGlobeGameInteractionID = 0;
-const tInteractionID kNoradECRMonitorInteractionID = 1;
-const tInteractionID kNoradFillingStationInteractionID = 2;
-const tInteractionID kNoradElevatorInteractionID = 3;
-const tInteractionID kNoradPressureDoorInteractionID = 4;
-const tInteractionID kNoradSubControlRoomInteractionID = 5;
-const tInteractionID kNoradSubPlatformInteractionID = 6;
+const InteractionID kNoradGlobeGameInteractionID = 0;
+const InteractionID kNoradECRMonitorInteractionID = 1;
+const InteractionID kNoradFillingStationInteractionID = 2;
+const InteractionID kNoradElevatorInteractionID = 3;
+const InteractionID kNoradPressureDoorInteractionID = 4;
+const InteractionID kNoradSubControlRoomInteractionID = 5;
+const InteractionID kNoradSubPlatformInteractionID = 6;
 
 /////////////////////////////////////////////
 //
 //	Norad Alpha
 
-const tCoordType kECRSlideShowLeft = kNavAreaLeft + 78;
-const tCoordType kECRSlideShowTop = kNavAreaTop + 1;
+const CoordType kECRSlideShowLeft = kNavAreaLeft + 78;
+const CoordType kECRSlideShowTop = kNavAreaTop + 1;
 
-const tCoordType kECRPanLeft = kNavAreaLeft + 78 + 5;
-const tCoordType kECRPanTop = kNavAreaTop + 1 + 4;
-const tCoordType kECRPanRight = kECRPanLeft + 213;
-const tCoordType kECRPanBottom = kECRPanTop + 241;
+const CoordType kECRPanLeft = kNavAreaLeft + 78 + 5;
+const CoordType kECRPanTop = kNavAreaTop + 1 + 4;
+const CoordType kECRPanRight = kECRPanLeft + 213;
+const CoordType kECRPanBottom = kECRPanTop + 241;
 
-const tCoordType kNoradAlphaElevatorControlsLeft = kNavAreaLeft + 332;
-const tCoordType kNoradAlphaElevatorControlsTop = kNavAreaTop + 127;
+const CoordType kNoradAlphaElevatorControlsLeft = kNavAreaLeft + 332;
+const CoordType kNoradAlphaElevatorControlsTop = kNavAreaTop + 127;
 
-const tCoordType kNoradAlpha01LeftSideLeft = kNavAreaLeft + 0;
-const tCoordType kNoradAlpha01LeftSideTop = kNavAreaTop + 0;
+const CoordType kNoradAlpha01LeftSideLeft = kNavAreaLeft + 0;
+const CoordType kNoradAlpha01LeftSideTop = kNavAreaTop + 0;
 
-const tCoordType kNoradAlpha01RightSideLeft = kNavAreaLeft + 240;
-const tCoordType kNoradAlpha01RightSideTop = kNavAreaTop + 12;
+const CoordType kNoradAlpha01RightSideLeft = kNavAreaLeft + 240;
+const CoordType kNoradAlpha01RightSideTop = kNavAreaTop + 12;
 
-const tCoordType kNoradUpperLevelsLeft = kNavAreaLeft + 98;
-const tCoordType kNoradUpperLevelsTop = kNavAreaTop + 31;
+const CoordType kNoradUpperLevelsLeft = kNavAreaLeft + 98;
+const CoordType kNoradUpperLevelsTop = kNavAreaTop + 31;
 
-const tCoordType kNoradUpperTypeLeft = kNoradUpperLevelsLeft + 114;
-const tCoordType kNoradUpperTypeTop = kNoradUpperLevelsTop + 8;
+const CoordType kNoradUpperTypeLeft = kNoradUpperLevelsLeft + 114;
+const CoordType kNoradUpperTypeTop = kNoradUpperLevelsTop + 8;
 
-const tCoordType kNoradUpperUpLeft = kNavAreaLeft + 361;
-const tCoordType kNoradUpperUpTop = kNavAreaTop + 32;
+const CoordType kNoradUpperUpLeft = kNavAreaLeft + 361;
+const CoordType kNoradUpperUpTop = kNavAreaTop + 32;
 
-const tCoordType kNoradUpperDownLeft = kNavAreaLeft + 367;
-const tCoordType kNoradUpperDownTop = kNavAreaTop + 66;
+const CoordType kNoradUpperDownLeft = kNavAreaLeft + 367;
+const CoordType kNoradUpperDownTop = kNavAreaTop + 66;
 
-const tCoordType kNoradLowerLevelsLeft = kNavAreaLeft + 74;
-const tCoordType kNoradLowerLevelsTop = kNavAreaTop + 157;
+const CoordType kNoradLowerLevelsLeft = kNavAreaLeft + 74;
+const CoordType kNoradLowerLevelsTop = kNavAreaTop + 157;
 
-const tCoordType kNoradLowerTypeLeft = kNoradLowerLevelsLeft + 144;
-const tCoordType kNoradLowerTypeTop = kNoradLowerLevelsTop + 9;
+const CoordType kNoradLowerTypeLeft = kNoradLowerLevelsLeft + 144;
+const CoordType kNoradLowerTypeTop = kNoradLowerLevelsTop + 9;
 
-const tCoordType kNoradLowerUpLeft = kNavAreaLeft + 380;
-const tCoordType kNoradLowerUpTop = kNavAreaTop + 164;
+const CoordType kNoradLowerUpLeft = kNavAreaLeft + 380;
+const CoordType kNoradLowerUpTop = kNavAreaTop + 164;
 
-const tCoordType kNoradLowerDownLeft = kNavAreaLeft + 388;
-const tCoordType kNoradLowerDownTop = kNavAreaTop + 212;
+const CoordType kNoradLowerDownLeft = kNavAreaLeft + 388;
+const CoordType kNoradLowerDownTop = kNavAreaTop + 212;
 
-const tCoordType kNoradPlatformLeft = kNavAreaLeft + 36;
-const tCoordType kNoradPlatformTop = kNavAreaTop + 87;
+const CoordType kNoradPlatformLeft = kNavAreaLeft + 36;
+const CoordType kNoradPlatformTop = kNavAreaTop + 87;
 
-const tCoordType kNoradSubControlLeft = kNavAreaLeft + 0;
-const tCoordType kNoradSubControlTop = kNavAreaTop + 84;
+const CoordType kNoradSubControlLeft = kNavAreaLeft + 0;
+const CoordType kNoradSubControlTop = kNavAreaTop + 84;
 
-const tCoordType kNoradSubControlPinchLeft = kNoradSubControlLeft + 106;
-const tCoordType kNoradSubControlPinchTop = kNoradSubControlTop + 86;
+const CoordType kNoradSubControlPinchLeft = kNoradSubControlLeft + 106;
+const CoordType kNoradSubControlPinchTop = kNoradSubControlTop + 86;
 
-const tCoordType kNoradSubControlDownLeft = kNoradSubControlLeft + 66;
-const tCoordType kNoradSubControlDownTop = kNoradSubControlTop + 106;
+const CoordType kNoradSubControlDownLeft = kNoradSubControlLeft + 66;
+const CoordType kNoradSubControlDownTop = kNoradSubControlTop + 106;
 
-const tCoordType kNoradSubControlRightLeft = kNoradSubControlLeft + 83;
-const tCoordType kNoradSubControlRightTop = kNoradSubControlTop + 90;
+const CoordType kNoradSubControlRightLeft = kNoradSubControlLeft + 83;
+const CoordType kNoradSubControlRightTop = kNoradSubControlTop + 90;
 
-const tCoordType kNoradSubControlLeftLeft = kNoradSubControlLeft + 56;
-const tCoordType kNoradSubControlLeftTop = kNoradSubControlTop + 91;
+const CoordType kNoradSubControlLeftLeft = kNoradSubControlLeft + 56;
+const CoordType kNoradSubControlLeftTop = kNoradSubControlTop + 91;
 
-const tCoordType kNoradSubControlUpLeft = kNoradSubControlLeft + 66;
-const tCoordType kNoradSubControlUpTop = kNoradSubControlTop + 81;
+const CoordType kNoradSubControlUpLeft = kNoradSubControlLeft + 66;
+const CoordType kNoradSubControlUpTop = kNoradSubControlTop + 81;
 
-const tCoordType kNoradSubControlCCWLeft = kNoradSubControlLeft + 29;
-const tCoordType kNoradSubControlCCWTop = kNoradSubControlTop + 88;
+const CoordType kNoradSubControlCCWLeft = kNoradSubControlLeft + 29;
+const CoordType kNoradSubControlCCWTop = kNoradSubControlTop + 88;
 
-const tCoordType kNoradSubControlCWLeft = kNoradSubControlLeft + 0;
-const tCoordType kNoradSubControlCWTop = kNoradSubControlTop + 89;
+const CoordType kNoradSubControlCWLeft = kNoradSubControlLeft + 0;
+const CoordType kNoradSubControlCWTop = kNoradSubControlTop + 89;
 
-const tCoordType kNoradClawMonitorLeft = kNavAreaLeft + 288;
-const tCoordType kNoradClawMonitorTop = kNavAreaTop + 97;
+const CoordType kNoradClawMonitorLeft = kNavAreaLeft + 288;
+const CoordType kNoradClawMonitorTop = kNavAreaTop + 97;
 
-const tCoordType kNoradGreenBallAtALeft = kNoradClawMonitorLeft + 179;
-const tCoordType kNoradGreenBallAtATop = kNoradClawMonitorTop + 82;
+const CoordType kNoradGreenBallAtALeft = kNoradClawMonitorLeft + 179;
+const CoordType kNoradGreenBallAtATop = kNoradClawMonitorTop + 82;
 
-const tCoordType kNoradGreenBallAtBLeft = kNoradClawMonitorLeft + 130;
-const tCoordType kNoradGreenBallAtBTop = kNoradClawMonitorTop + 73;
+const CoordType kNoradGreenBallAtBLeft = kNoradClawMonitorLeft + 130;
+const CoordType kNoradGreenBallAtBTop = kNoradClawMonitorTop + 73;
 
-const tCoordType kNoradGreenBallAtCLeft = kNoradClawMonitorLeft + 110;
-const tCoordType kNoradGreenBallAtCTop = kNoradClawMonitorTop + 26;
+const CoordType kNoradGreenBallAtCLeft = kNoradClawMonitorLeft + 110;
+const CoordType kNoradGreenBallAtCTop = kNoradClawMonitorTop + 26;
 
-const tCoordType kNoradGreenBallAtDLeft = kNoradClawMonitorLeft + 21;
-const tCoordType kNoradGreenBallAtDTop = kNoradClawMonitorTop + 49;
+const CoordType kNoradGreenBallAtDLeft = kNoradClawMonitorLeft + 21;
+const CoordType kNoradGreenBallAtDTop = kNoradClawMonitorTop + 49;
 
 /////////////////////////////////////////////
 //
 //	Norad Delta
 
-const tCoordType kGlobeMonitorLeft = kNavAreaLeft + 360;
-const tCoordType kGlobeMonitorTop = kNavAreaTop + 144;
+const CoordType kGlobeMonitorLeft = kNavAreaLeft + 360;
+const CoordType kGlobeMonitorTop = kNavAreaTop + 144;
 
-const tCoordType kGlobeLeft = kNavAreaLeft + 172;
-const tCoordType kGlobeTop = kNavAreaTop;
+const CoordType kGlobeLeft = kNavAreaLeft + 172;
+const CoordType kGlobeTop = kNavAreaTop;
 
-const tCoordType kGlobeCircleLeftLeft = kNavAreaLeft + 186;
-const tCoordType kGlobeCircleLeftTop = kNavAreaTop + 41;
+const CoordType kGlobeCircleLeftLeft = kNavAreaLeft + 186;
+const CoordType kGlobeCircleLeftTop = kNavAreaTop + 41;
 
-const tCoordType kGlobeCircleRightLeft = kNavAreaLeft + 321;
-const tCoordType kGlobeCircleRightTop = kNavAreaTop + 41;
+const CoordType kGlobeCircleRightLeft = kNavAreaLeft + 321;
+const CoordType kGlobeCircleRightTop = kNavAreaTop + 41;
 
-const tCoordType kGlobeCircleUpLeft = kNavAreaLeft + 220;
-const tCoordType kGlobeCircleUpTop = kNavAreaTop + 7;
+const CoordType kGlobeCircleUpLeft = kNavAreaLeft + 220;
+const CoordType kGlobeCircleUpTop = kNavAreaTop + 7;
 
-const tCoordType kGlobeCircleDownLeft = kNavAreaLeft + 220;
-const tCoordType kGlobeCircleDownTop = kNavAreaTop + 142;
+const CoordType kGlobeCircleDownLeft = kNavAreaLeft + 220;
+const CoordType kGlobeCircleDownTop = kNavAreaTop + 142;
 
-const tCoordType kGlobeUpperLeftHiliteLeft = kNavAreaLeft + 207;
-const tCoordType kGlobeUpperLeftHiliteTop = kNavAreaTop + 28;
+const CoordType kGlobeUpperLeftHiliteLeft = kNavAreaLeft + 207;
+const CoordType kGlobeUpperLeftHiliteTop = kNavAreaTop + 28;
 
-const tCoordType kGlobeUpperRightHiliteLeft = kNavAreaLeft + 307;
-const tCoordType kGlobeUpperRightHiliteTop = kNavAreaTop + 28;
+const CoordType kGlobeUpperRightHiliteLeft = kNavAreaLeft + 307;
+const CoordType kGlobeUpperRightHiliteTop = kNavAreaTop + 28;
 
-const tCoordType kGlobeLowerLeftHiliteLeft = kNavAreaLeft + 207;
-const tCoordType kGlobeLowerLeftHiliteTop = kNavAreaTop + 128;
+const CoordType kGlobeLowerLeftHiliteLeft = kNavAreaLeft + 207;
+const CoordType kGlobeLowerLeftHiliteTop = kNavAreaTop + 128;
 
-const tCoordType kGlobeLowerRightHiliteLeft = kNavAreaLeft + 307;
-const tCoordType kGlobeLowerRightHiliteTop = kNavAreaTop + 128;
+const CoordType kGlobeLowerRightHiliteLeft = kNavAreaLeft + 307;
+const CoordType kGlobeLowerRightHiliteTop = kNavAreaTop + 128;
 
-const tCoordType kGlobeLeftMotionHiliteLeft = kNavAreaLeft + 182;
-const tCoordType kGlobeLeftMotionHiliteTop = kNavAreaTop + 60;
+const CoordType kGlobeLeftMotionHiliteLeft = kNavAreaLeft + 182;
+const CoordType kGlobeLeftMotionHiliteTop = kNavAreaTop + 60;
 
-const tCoordType kGlobeRightMotionHiliteLeft = kNavAreaLeft + 331;
-const tCoordType kGlobeRightMotionHiliteTop = kNavAreaTop + 60;
+const CoordType kGlobeRightMotionHiliteLeft = kNavAreaLeft + 331;
+const CoordType kGlobeRightMotionHiliteTop = kNavAreaTop + 60;
 
-const tCoordType kGlobeUpMotionHiliteLeft = kNavAreaLeft + 239;
-const tCoordType kGlobeUpMotionHiliteTop = kNavAreaTop + 3;
+const CoordType kGlobeUpMotionHiliteLeft = kNavAreaLeft + 239;
+const CoordType kGlobeUpMotionHiliteTop = kNavAreaTop + 3;
 
-const tCoordType kGlobeDownMotionHiliteLeft = kNavAreaLeft + 239;
-const tCoordType kGlobeDownMotionHiliteTop = kNavAreaTop + 152;
+const CoordType kGlobeDownMotionHiliteLeft = kNavAreaLeft + 239;
+const CoordType kGlobeDownMotionHiliteTop = kNavAreaTop + 152;
 
-const tCoordType kGlobeUpperNamesLeft = kNavAreaLeft + 368;
-const tCoordType kGlobeUpperNamesTop = kNavAreaTop + 188;
+const CoordType kGlobeUpperNamesLeft = kNavAreaLeft + 368;
+const CoordType kGlobeUpperNamesTop = kNavAreaTop + 188;
 
-const tCoordType kGlobeLowerNamesLeft = kNavAreaLeft + 368;
-const tCoordType kGlobeLowerNamesTop = kNavAreaTop + 212;
+const CoordType kGlobeLowerNamesLeft = kNavAreaLeft + 368;
+const CoordType kGlobeLowerNamesTop = kNavAreaTop + 212;
 
-const tCoordType kGlobeCountdownLeft = kNavAreaLeft + 478;
-const tCoordType kGlobeCountdownTop = kNavAreaTop + 164;
+const CoordType kGlobeCountdownLeft = kNavAreaLeft + 478;
+const CoordType kGlobeCountdownTop = kNavAreaTop + 164;
 
 //	Norad Alpha display IDs.
 
-const tDisplayElementID kECRSlideShowMovieID = kNeighborhoodDisplayID;
-const tDisplayElementID kECRPanID = kECRSlideShowMovieID + 1;
-const tDisplayElementID kNoradAlphaDeathMovieID = kECRPanID + 1;
-const tDisplayElementID kNoradElevatorControlsID = kNoradAlphaDeathMovieID + 1;
-const tDisplayElementID kN01LeftSideID = kNoradElevatorControlsID + 1;
-const tDisplayElementID kN01RightSideID = kN01LeftSideID + 1;
-const tDisplayElementID kPressureDoorLevelsID = kN01RightSideID + 1;
-const tDisplayElementID kPressureDoorTypeID = kPressureDoorLevelsID + 1;
-const tDisplayElementID kPressureDoorUpButtonID = kPressureDoorTypeID + 1;
-const tDisplayElementID kPressureDoorDownButtonID = kPressureDoorUpButtonID + 1;
-const tDisplayElementID kPlatformMonitorID = kPressureDoorDownButtonID + 1;
-const tDisplayElementID kSubControlMonitorID = kPlatformMonitorID + 1;
-const tDisplayElementID kClawMonitorID = kSubControlMonitorID + 1;
-const tDisplayElementID kSubControlPinchID = kClawMonitorID + 1;
-const tDisplayElementID kSubControlDownID = kSubControlPinchID + 1;
-const tDisplayElementID kSubControlRightID = kSubControlDownID + 1;
-const tDisplayElementID kSubControlLeftID = kSubControlRightID + 1;
-const tDisplayElementID kSubControlUpID = kSubControlLeftID + 1;
-const tDisplayElementID kSubControlCCWID = kSubControlUpID + 1;
-const tDisplayElementID kSubControlCWID = kSubControlCCWID + 1;
-const tDisplayElementID kClawMonitorGreenBallID = kSubControlCWID + 1;
+const DisplayElementID kECRSlideShowMovieID = kNeighborhoodDisplayID;
+const DisplayElementID kECRPanID = kECRSlideShowMovieID + 1;
+const DisplayElementID kNoradAlphaDeathMovieID = kECRPanID + 1;
+const DisplayElementID kNoradElevatorControlsID = kNoradAlphaDeathMovieID + 1;
+const DisplayElementID kN01LeftSideID = kNoradElevatorControlsID + 1;
+const DisplayElementID kN01RightSideID = kN01LeftSideID + 1;
+const DisplayElementID kPressureDoorLevelsID = kN01RightSideID + 1;
+const DisplayElementID kPressureDoorTypeID = kPressureDoorLevelsID + 1;
+const DisplayElementID kPressureDoorUpButtonID = kPressureDoorTypeID + 1;
+const DisplayElementID kPressureDoorDownButtonID = kPressureDoorUpButtonID + 1;
+const DisplayElementID kPlatformMonitorID = kPressureDoorDownButtonID + 1;
+const DisplayElementID kSubControlMonitorID = kPlatformMonitorID + 1;
+const DisplayElementID kClawMonitorID = kSubControlMonitorID + 1;
+const DisplayElementID kSubControlPinchID = kClawMonitorID + 1;
+const DisplayElementID kSubControlDownID = kSubControlPinchID + 1;
+const DisplayElementID kSubControlRightID = kSubControlDownID + 1;
+const DisplayElementID kSubControlLeftID = kSubControlRightID + 1;
+const DisplayElementID kSubControlUpID = kSubControlLeftID + 1;
+const DisplayElementID kSubControlCCWID = kSubControlUpID + 1;
+const DisplayElementID kSubControlCWID = kSubControlCCWID + 1;
+const DisplayElementID kClawMonitorGreenBallID = kSubControlCWID + 1;
 
 //	Norad Delta display IDs.
 
-const tDisplayElementID kGlobeMonitorID = kNeighborhoodDisplayID;
-const tDisplayElementID kGlobeMovieID = kGlobeMonitorID + 14;
-const tDisplayElementID kGlobeCircleLeftID = kGlobeMovieID + 1;
-const tDisplayElementID kGlobeCircleRightID = kGlobeCircleLeftID + 1;
-const tDisplayElementID kGlobeCircleUpID = kGlobeCircleRightID + 1;
-const tDisplayElementID kGlobeCircleDownID = kGlobeCircleUpID + 1;
-const tDisplayElementID kMotionHiliteLeftID = kGlobeCircleDownID + 1;
-const tDisplayElementID kMotionHiliteRightID = kMotionHiliteLeftID + 1;
-const tDisplayElementID kMotionHiliteUpID = kMotionHiliteRightID + 1;
-const tDisplayElementID kMotionHiliteDownID = kMotionHiliteUpID + 1;
-const tDisplayElementID kTargetHiliteUpperLeftID = kMotionHiliteDownID + 1;
-const tDisplayElementID kTargetHiliteUpperRightID = kTargetHiliteUpperLeftID + 1;
-const tDisplayElementID kTargetHiliteLowerLeftID = kTargetHiliteUpperRightID + 1;
-const tDisplayElementID kTargetHiliteLowerRightID = kTargetHiliteLowerLeftID + 1;
-const tDisplayElementID kGlobeUpperNamesID = kTargetHiliteLowerRightID + 1;
-const tDisplayElementID kGlobeLowerNamesID = kGlobeUpperNamesID + 1;
-const tDisplayElementID kGlobeCountdownID = kGlobeLowerNamesID + 1;
+const DisplayElementID kGlobeMonitorID = kNeighborhoodDisplayID;
+const DisplayElementID kGlobeMovieID = kGlobeMonitorID + 14;
+const DisplayElementID kGlobeCircleLeftID = kGlobeMovieID + 1;
+const DisplayElementID kGlobeCircleRightID = kGlobeCircleLeftID + 1;
+const DisplayElementID kGlobeCircleUpID = kGlobeCircleRightID + 1;
+const DisplayElementID kGlobeCircleDownID = kGlobeCircleUpID + 1;
+const DisplayElementID kMotionHiliteLeftID = kGlobeCircleDownID + 1;
+const DisplayElementID kMotionHiliteRightID = kMotionHiliteLeftID + 1;
+const DisplayElementID kMotionHiliteUpID = kMotionHiliteRightID + 1;
+const DisplayElementID kMotionHiliteDownID = kMotionHiliteUpID + 1;
+const DisplayElementID kTargetHiliteUpperLeftID = kMotionHiliteDownID + 1;
+const DisplayElementID kTargetHiliteUpperRightID = kTargetHiliteUpperLeftID + 1;
+const DisplayElementID kTargetHiliteLowerLeftID = kTargetHiliteUpperRightID + 1;
+const DisplayElementID kTargetHiliteLowerRightID = kTargetHiliteLowerLeftID + 1;
+const DisplayElementID kGlobeUpperNamesID = kTargetHiliteLowerRightID + 1;
+const DisplayElementID kGlobeLowerNamesID = kGlobeUpperNamesID + 1;
+const DisplayElementID kGlobeCountdownID = kGlobeLowerNamesID + 1;
 
 //	Norad Alpha:
 
-const tDisplayOrder kECRMonitorOrder = kMonitorLayer;
-const tDisplayOrder kECRPanOrder = kECRMonitorOrder + 1;
+const DisplayOrder kECRMonitorOrder = kMonitorLayer;
+const DisplayOrder kECRPanOrder = kECRMonitorOrder + 1;
 
-const tDisplayOrder kN01LeftSideOrder = kMonitorLayer;
-const tDisplayOrder kN01RightSideOrder = kN01LeftSideOrder + 1;
+const DisplayOrder kN01LeftSideOrder = kMonitorLayer;
+const DisplayOrder kN01RightSideOrder = kN01LeftSideOrder + 1;
 
-const tDisplayOrder kElevatorControlsOrder = kMonitorLayer;
+const DisplayOrder kElevatorControlsOrder = kMonitorLayer;
 
-const tDisplayOrder kPressureLevelsOrder = kMonitorLayer;
-const tDisplayOrder kPressureTypeOrder = kPressureLevelsOrder + 1;
-const tDisplayOrder kPressureUpOrder = kPressureTypeOrder + 1;
-const tDisplayOrder kPressureDownOrder = kPressureUpOrder + 1;
+const DisplayOrder kPressureLevelsOrder = kMonitorLayer;
+const DisplayOrder kPressureTypeOrder = kPressureLevelsOrder + 1;
+const DisplayOrder kPressureUpOrder = kPressureTypeOrder + 1;
+const DisplayOrder kPressureDownOrder = kPressureUpOrder + 1;
 
-const tDisplayOrder kPlatformOrder = kMonitorLayer;
+const DisplayOrder kPlatformOrder = kMonitorLayer;
 
-const tDisplayOrder kSubControlOrder = kMonitorLayer;
-const tDisplayOrder kClawMonitorOrder = kSubControlOrder + 1;
-const tDisplayOrder kSubControlPinchOrder = kClawMonitorOrder + 1;
-const tDisplayOrder kSubControlDownOrder = kSubControlPinchOrder + 1;
-const tDisplayOrder kSubControlRightOrder = kSubControlDownOrder + 1;
-const tDisplayOrder kSubControlLeftOrder = kSubControlRightOrder + 1;
-const tDisplayOrder kSubControlUpOrder = kSubControlLeftOrder + 1;
-const tDisplayOrder kSubControlCCWOrder = kSubControlUpOrder + 1;
-const tDisplayOrder kSubControlCWOrder = kSubControlCCWOrder + 1;
-const tDisplayOrder kClawMonitorGreenBallOrder = kSubControlCWOrder + 1;
+const DisplayOrder kSubControlOrder = kMonitorLayer;
+const DisplayOrder kClawMonitorOrder = kSubControlOrder + 1;
+const DisplayOrder kSubControlPinchOrder = kClawMonitorOrder + 1;
+const DisplayOrder kSubControlDownOrder = kSubControlPinchOrder + 1;
+const DisplayOrder kSubControlRightOrder = kSubControlDownOrder + 1;
+const DisplayOrder kSubControlLeftOrder = kSubControlRightOrder + 1;
+const DisplayOrder kSubControlUpOrder = kSubControlLeftOrder + 1;
+const DisplayOrder kSubControlCCWOrder = kSubControlUpOrder + 1;
+const DisplayOrder kSubControlCWOrder = kSubControlCCWOrder + 1;
+const DisplayOrder kClawMonitorGreenBallOrder = kSubControlCWOrder + 1;
 
 //	Norad Delta:
 
-const tDisplayOrder kGlobeMonitorLayer = kMonitorLayer;
-const tDisplayOrder kGlobeMovieLayer = kGlobeMonitorLayer + 1;
-const tDisplayOrder kGlobeCircleLayer = kGlobeMovieLayer + 1;
-const tDisplayOrder kGlobeHilitesLayer = kGlobeCircleLayer + 1;
-const tDisplayOrder kGlobeUpperNamesLayer = kGlobeHilitesLayer + 1;
-const tDisplayOrder kGlobeLowerNamesLayer = kGlobeUpperNamesLayer + 1;
-const tDisplayOrder kGlobeCountdownLayer = kGlobeLowerNamesLayer + 1;
+const DisplayOrder kGlobeMonitorLayer = kMonitorLayer;
+const DisplayOrder kGlobeMovieLayer = kGlobeMonitorLayer + 1;
+const DisplayOrder kGlobeCircleLayer = kGlobeMovieLayer + 1;
+const DisplayOrder kGlobeHilitesLayer = kGlobeCircleLayer + 1;
+const DisplayOrder kGlobeUpperNamesLayer = kGlobeHilitesLayer + 1;
+const DisplayOrder kGlobeLowerNamesLayer = kGlobeUpperNamesLayer + 1;
+const DisplayOrder kGlobeCountdownLayer = kGlobeLowerNamesLayer + 1;
 
 //	Norad Alpha Tables
 
@@ -449,204 +449,204 @@ const TimeScale kNoradAlphaFrameDuration = 40;
 
 //	Alternate IDs.
 
-const tAlternateID kAltNoradAlphaNormal = 0;
+const AlternateID kAltNoradAlphaNormal = 0;
 
 //	Room IDs.
 
-const tRoomID kNorad01 = 0;
-const tRoomID kNorad01East = 1;
-const tRoomID kNorad01West = 2;
-const tRoomID kNorad02 = 3;
-const tRoomID kNorad03 = 4;
-const tRoomID kNorad04 = 5;
-const tRoomID kNorad05 = 6;
-const tRoomID kNorad06 = 7;
-const tRoomID kNorad07 = 8;
-const tRoomID kNorad07North = 9;
-const tRoomID kNorad08 = 10;
-const tRoomID kNorad09 = 11;
-const tRoomID kNorad10 = 12;
-const tRoomID kNorad10East = 13;
-const tRoomID kNorad11 = 14;
-const tRoomID kNorad11South = 15;
-const tRoomID kNorad12 = 16;
-const tRoomID kNorad12South = 17;
-const tRoomID kNorad13 = 18;
-const tRoomID kNorad14 = 19;
-const tRoomID kNorad15 = 20;
-const tRoomID kNorad16 = 21;
-const tRoomID kNorad17 = 22;
-const tRoomID kNorad18 = 23;
-const tRoomID kNorad19 = 24;
-const tRoomID kNorad19West = 25;
-const tRoomID kNorad21 = 26;
-const tRoomID kNorad21West = 27;
-const tRoomID kNorad22 = 28;
-const tRoomID kNorad22West = 29;
+const RoomID kNorad01 = 0;
+const RoomID kNorad01East = 1;
+const RoomID kNorad01West = 2;
+const RoomID kNorad02 = 3;
+const RoomID kNorad03 = 4;
+const RoomID kNorad04 = 5;
+const RoomID kNorad05 = 6;
+const RoomID kNorad06 = 7;
+const RoomID kNorad07 = 8;
+const RoomID kNorad07North = 9;
+const RoomID kNorad08 = 10;
+const RoomID kNorad09 = 11;
+const RoomID kNorad10 = 12;
+const RoomID kNorad10East = 13;
+const RoomID kNorad11 = 14;
+const RoomID kNorad11South = 15;
+const RoomID kNorad12 = 16;
+const RoomID kNorad12South = 17;
+const RoomID kNorad13 = 18;
+const RoomID kNorad14 = 19;
+const RoomID kNorad15 = 20;
+const RoomID kNorad16 = 21;
+const RoomID kNorad17 = 22;
+const RoomID kNorad18 = 23;
+const RoomID kNorad19 = 24;
+const RoomID kNorad19West = 25;
+const RoomID kNorad21 = 26;
+const RoomID kNorad21West = 27;
+const RoomID kNorad22 = 28;
+const RoomID kNorad22West = 29;
 
 //	Hot Spot Activation IDs.
 
 
 //	Hot Spot IDs.
 
-const tHotSpotID kNorad01ECRSpotID = 5000;
-const tHotSpotID kNorad01GasSpotID = 5001;
-const tHotSpotID kNorad01ECROutSpotID = 5002;
-const tHotSpotID kNorad01GasOutSpotID = 5003;
-const tHotSpotID kNorad01MonitorSpotID = 5004;
-const tHotSpotID kNorad01IntakeSpotID = 5005;
-const tHotSpotID kNorad01DispenseSpotID = 5006;
-const tHotSpotID kNorad01ArSpotID = 5007;
-const tHotSpotID kNorad01CO2SpotID = 5008;
-const tHotSpotID kNorad01HeSpotID = 5009;
-const tHotSpotID kNorad01OSpotID = 5010;
-const tHotSpotID kNorad01NSpotID = 5011;
-const tHotSpotID kN01GasCanisterSpotID = 5012;
-const tHotSpotID kN01ArgonCanisterSpotID = 5013;
-const tHotSpotID kN01AirMaskSpotID = 5014;
-const tHotSpotID kN01NitrogenCanisterSpotID = 5015;
-const tHotSpotID kN01GasOutletSpotID = 5016;
-const tHotSpotID kNorad07DoorSpotID = 5017;
-const tHotSpotID kNorad07DoorOutSpotID = 5018;
-const tHotSpotID kNorad10DoorSpotID = 5019;
-const tHotSpotID kNorad10EastOutSpotID = 5020;
-const tHotSpotID kAlphaUpperPressureDoorUpSpotID = 5021;
-const tHotSpotID kAlphaUpperPressureDoorDownSpotID = 5022;
-const tHotSpotID kNorad11ElevatorSpotID = 5023;
-const tHotSpotID kNorad11ElevatorOutSpotID = 5024;
-const tHotSpotID kNorad11ElevatorDownSpotID = 5025;
-const tHotSpotID kNorad12ElevatorSpotID = 5026;
-const tHotSpotID kNorad12ElevatorOutSpotID = 5027;
-const tHotSpotID kNorad12ElevatorUpSpotID = 5028;
-const tHotSpotID kNorad19MonitorSpotID = 5029;
-const tHotSpotID kNorad19MonitorOutSpotID = 5030;
-const tHotSpotID kNorad19ActivateMonitorSpotID = 5031;
-const tHotSpotID kNorad21WestSpotID = 5032;
-const tHotSpotID kNorad21WestOutSpotID = 5033;
-const tHotSpotID kAlphaLowerPressureDoorUpSpotID = 5034;
-const tHotSpotID kAlphaLowerPressureDoorDownSpotID = 5035;
-const tHotSpotID kNorad22MonitorSpotID = 5036;
-const tHotSpotID kNorad22MonitorOutSpotID = 5037;
-const tHotSpotID kNorad22LaunchPrepSpotID = 5038;
-const tHotSpotID kNorad22ClawControlSpotID = 5039;
-const tHotSpotID kNorad22ClawPinchSpotID = 5040;
-const tHotSpotID kNorad22ClawDownSpotID = 5041;
-const tHotSpotID kNorad22ClawRightSpotID = 5042;
-const tHotSpotID kNorad22ClawLeftSpotID = 5043;
-const tHotSpotID kNorad22ClawUpSpotID = 5044;
-const tHotSpotID kNorad22ClawCCWSpotID = 5045;
-const tHotSpotID kNorad22ClawCWSpotID = 5046;
+const HotSpotID kNorad01ECRSpotID = 5000;
+const HotSpotID kNorad01GasSpotID = 5001;
+const HotSpotID kNorad01ECROutSpotID = 5002;
+const HotSpotID kNorad01GasOutSpotID = 5003;
+const HotSpotID kNorad01MonitorSpotID = 5004;
+const HotSpotID kNorad01IntakeSpotID = 5005;
+const HotSpotID kNorad01DispenseSpotID = 5006;
+const HotSpotID kNorad01ArSpotID = 5007;
+const HotSpotID kNorad01CO2SpotID = 5008;
+const HotSpotID kNorad01HeSpotID = 5009;
+const HotSpotID kNorad01OSpotID = 5010;
+const HotSpotID kNorad01NSpotID = 5011;
+const HotSpotID kN01GasCanisterSpotID = 5012;
+const HotSpotID kN01ArgonCanisterSpotID = 5013;
+const HotSpotID kN01AirMaskSpotID = 5014;
+const HotSpotID kN01NitrogenCanisterSpotID = 5015;
+const HotSpotID kN01GasOutletSpotID = 5016;
+const HotSpotID kNorad07DoorSpotID = 5017;
+const HotSpotID kNorad07DoorOutSpotID = 5018;
+const HotSpotID kNorad10DoorSpotID = 5019;
+const HotSpotID kNorad10EastOutSpotID = 5020;
+const HotSpotID kAlphaUpperPressureDoorUpSpotID = 5021;
+const HotSpotID kAlphaUpperPressureDoorDownSpotID = 5022;
+const HotSpotID kNorad11ElevatorSpotID = 5023;
+const HotSpotID kNorad11ElevatorOutSpotID = 5024;
+const HotSpotID kNorad11ElevatorDownSpotID = 5025;
+const HotSpotID kNorad12ElevatorSpotID = 5026;
+const HotSpotID kNorad12ElevatorOutSpotID = 5027;
+const HotSpotID kNorad12ElevatorUpSpotID = 5028;
+const HotSpotID kNorad19MonitorSpotID = 5029;
+const HotSpotID kNorad19MonitorOutSpotID = 5030;
+const HotSpotID kNorad19ActivateMonitorSpotID = 5031;
+const HotSpotID kNorad21WestSpotID = 5032;
+const HotSpotID kNorad21WestOutSpotID = 5033;
+const HotSpotID kAlphaLowerPressureDoorUpSpotID = 5034;
+const HotSpotID kAlphaLowerPressureDoorDownSpotID = 5035;
+const HotSpotID kNorad22MonitorSpotID = 5036;
+const HotSpotID kNorad22MonitorOutSpotID = 5037;
+const HotSpotID kNorad22LaunchPrepSpotID = 5038;
+const HotSpotID kNorad22ClawControlSpotID = 5039;
+const HotSpotID kNorad22ClawPinchSpotID = 5040;
+const HotSpotID kNorad22ClawDownSpotID = 5041;
+const HotSpotID kNorad22ClawRightSpotID = 5042;
+const HotSpotID kNorad22ClawLeftSpotID = 5043;
+const HotSpotID kNorad22ClawUpSpotID = 5044;
+const HotSpotID kNorad22ClawCCWSpotID = 5045;
+const HotSpotID kNorad22ClawCWSpotID = 5046;
 
 //	Extra sequence IDs.
 
-const tExtraID kNoradArriveFromTSA = 0;
-const tExtraID kNorad01RobotTaunt = 1;
-const tExtraID kNorad01ZoomInWithGasCanister = 2;
-const tExtraID kN01WGasCanister = 3;
-const tExtraID kNorad01ZoomOutWithGasCanister = 4;
-const tExtraID kN01WZEmptyLit = 5;
-const tExtraID kN01WZGasCanisterDim = 6;
-const tExtraID kN01WZGasCanisterLit = 7;
-const tExtraID kN01WZArgonCanisterDim = 8;
-const tExtraID kN01WZArgonCanisterLit = 9;
-const tExtraID kN01WZAirMaskDim = 10;
-const tExtraID kN01WZAirMaskLit = 11;
-const tExtraID kN01WZNitrogenCanisterDim = 12;
-const tExtraID kN01WZNitrogenCanisterLit = 13;
-const tExtraID kNorad04EastDeath = 14;
-const tExtraID kNorad19PrepSub = 15;
-const tExtraID kNorad19ExitToSub = 16;
-const tExtraID kNorad22SouthIntro = 17;
-const tExtraID kNorad22SouthReply = 18;
-const tExtraID kNorad22SouthFinish = 19;
-const tExtraID kN22ClawFromAToB = 20;
-const tExtraID kN22ClawALoop = 21;
-const tExtraID kN22ClawAPinch = 22;
-const tExtraID kN22ClawACounterclockwise = 23;
-const tExtraID kN22ClawAClockwise = 24;
-const tExtraID kN22ClawFromBToA = 25;
-const tExtraID kN22ClawFromBToC = 26;
-const tExtraID kN22ClawFromBToD = 27;
-const tExtraID kN22ClawBLoop = 28;
-const tExtraID kN22ClawBPinch = 29;
-const tExtraID kN22ClawBCounterclockwise = 30;
-const tExtraID kN22ClawBClockwise = 31;
-const tExtraID kN22ClawFromCToB = 32;
-const tExtraID kN22ClawCLoop = 33;
-const tExtraID kN22ClawCPinch = 34;
-const tExtraID kN22ClawCCounterclockwise = 35;
-const tExtraID kN22ClawCClockwise = 36;
-const tExtraID kN22ClawFromDToB = 37;
-const tExtraID kN22ClawDLoop = 38;
-const tExtraID kN22ClawDPinch = 39;
-const tExtraID kN22ClawDCounterclockwise = 40;
-const tExtraID kN22ClawDClockwise = 41;
+const ExtraID kNoradArriveFromTSA = 0;
+const ExtraID kNorad01RobotTaunt = 1;
+const ExtraID kNorad01ZoomInWithGasCanister = 2;
+const ExtraID kN01WGasCanister = 3;
+const ExtraID kNorad01ZoomOutWithGasCanister = 4;
+const ExtraID kN01WZEmptyLit = 5;
+const ExtraID kN01WZGasCanisterDim = 6;
+const ExtraID kN01WZGasCanisterLit = 7;
+const ExtraID kN01WZArgonCanisterDim = 8;
+const ExtraID kN01WZArgonCanisterLit = 9;
+const ExtraID kN01WZAirMaskDim = 10;
+const ExtraID kN01WZAirMaskLit = 11;
+const ExtraID kN01WZNitrogenCanisterDim = 12;
+const ExtraID kN01WZNitrogenCanisterLit = 13;
+const ExtraID kNorad04EastDeath = 14;
+const ExtraID kNorad19PrepSub = 15;
+const ExtraID kNorad19ExitToSub = 16;
+const ExtraID kNorad22SouthIntro = 17;
+const ExtraID kNorad22SouthReply = 18;
+const ExtraID kNorad22SouthFinish = 19;
+const ExtraID kN22ClawFromAToB = 20;
+const ExtraID kN22ClawALoop = 21;
+const ExtraID kN22ClawAPinch = 22;
+const ExtraID kN22ClawACounterclockwise = 23;
+const ExtraID kN22ClawAClockwise = 24;
+const ExtraID kN22ClawFromBToA = 25;
+const ExtraID kN22ClawFromBToC = 26;
+const ExtraID kN22ClawFromBToD = 27;
+const ExtraID kN22ClawBLoop = 28;
+const ExtraID kN22ClawBPinch = 29;
+const ExtraID kN22ClawBCounterclockwise = 30;
+const ExtraID kN22ClawBClockwise = 31;
+const ExtraID kN22ClawFromCToB = 32;
+const ExtraID kN22ClawCLoop = 33;
+const ExtraID kN22ClawCPinch = 34;
+const ExtraID kN22ClawCCounterclockwise = 35;
+const ExtraID kN22ClawCClockwise = 36;
+const ExtraID kN22ClawFromDToB = 37;
+const ExtraID kN22ClawDLoop = 38;
+const ExtraID kN22ClawDPinch = 39;
+const ExtraID kN22ClawDCounterclockwise = 40;
+const ExtraID kN22ClawDClockwise = 41;
 
 
 //	Norad Delta Extra sequence IDs.
 
-const tExtraID kArriveFromSubChase = 0;
-const tExtraID kN59ZoomWithRobot = 1;
-const tExtraID kN59RobotApproaches = 2;
-const tExtraID kN59RobotPunchLoop = 3;
-const tExtraID kN59PlayerWins1 = 4;
-const tExtraID kN59PlayerWins2 = 5;
-const tExtraID kN59RobotWins = 6;
-const tExtraID kN59RobotHeadOpens = 7;
-const tExtraID kN59Biochips111 = 8;
-const tExtraID kN59Biochips011 = 9;
-const tExtraID kN59Biochips101 = 10;
-const tExtraID kN59Biochips001 = 11;
-const tExtraID kN59Biochips110 = 12;
-const tExtraID kN59Biochips010 = 13;
-const tExtraID kN59Biochips100 = 14;
-const tExtraID kN59Biochips000 = 15;
-const tExtraID kN59RobotDisappears = 16;
-const tExtraID kN60ClawFromAToB = 17;
-const tExtraID kN60ClawALoop = 18;
-const tExtraID kN60ClawAPinch = 19;
-const tExtraID kN60ClawACounterclockwise = 20;
-const tExtraID kN60ClawAClockwise = 21;
-const tExtraID kN60ClawFromBToA = 22;
-const tExtraID kN60ClawFromBToC = 23;
-const tExtraID kN60ClawFromBToD = 24;
-const tExtraID kN60ClawBLoop = 25;
-const tExtraID kN60ClawBPinch = 26;
-const tExtraID kN60ClawBCounterclockwise = 27;
-const tExtraID kN60ClawBClockwise = 28;
-const tExtraID kN60ClawFromCToB = 29;
-const tExtraID kN60ClawCLoop = 30;
-const tExtraID kN60ClawCPinch = 31;
-const tExtraID kN60ClawCCounterclockwise = 32;
-const tExtraID kN60ClawCClockwise = 33;
-const tExtraID kN60ClawFromDToB = 34;
-const tExtraID kN60ClawDLoop = 35;
-const tExtraID kN60ClawDPinch = 36;
-const tExtraID kN60ClawDCounterclockwise = 37;
-const tExtraID kN60ClawDClockwise = 38;
-const tExtraID kN60RobotApproaches = 39;
-const tExtraID kN60FirstMistake = 40;
-const tExtraID kN60ArmActivated = 41;
-const tExtraID kN60SecondMistake = 42;
-const tExtraID kN60ArmToPositionB = 43;
-const tExtraID kN60ThirdMistake = 44;
-const tExtraID kN60ArmGrabsRobot = 45;
-const tExtraID kN60FourthMistake = 46;
-const tExtraID kN60ArmCarriesRobotToPositionA = 47;
-const tExtraID kN60PlayerFollowsRobotToDoor = 48;
-const tExtraID kN60RobotHeadOpens = 49;
-const tExtraID kN60Biochips111 = 50;
-const tExtraID kN60Biochips011 = 51;
-const tExtraID kN60Biochips101 = 52;
-const tExtraID kN60Biochips001 = 53;
-const tExtraID kN60Biochips110 = 54;
-const tExtraID kN60Biochips010 = 55;
-const tExtraID kN60Biochips100 = 56;
-const tExtraID kN60Biochips000 = 57;
-const tExtraID kN60RobotDisappears = 58;
-const tExtraID kNoradDeltaRetinalScanBad = 59;
-const tExtraID kNoradDeltaRetinalScanGood = 60;
-const tExtraID kN79BrightView = 61;
+const ExtraID kArriveFromSubChase = 0;
+const ExtraID kN59ZoomWithRobot = 1;
+const ExtraID kN59RobotApproaches = 2;
+const ExtraID kN59RobotPunchLoop = 3;
+const ExtraID kN59PlayerWins1 = 4;
+const ExtraID kN59PlayerWins2 = 5;
+const ExtraID kN59RobotWins = 6;
+const ExtraID kN59RobotHeadOpens = 7;
+const ExtraID kN59Biochips111 = 8;
+const ExtraID kN59Biochips011 = 9;
+const ExtraID kN59Biochips101 = 10;
+const ExtraID kN59Biochips001 = 11;
+const ExtraID kN59Biochips110 = 12;
+const ExtraID kN59Biochips010 = 13;
+const ExtraID kN59Biochips100 = 14;
+const ExtraID kN59Biochips000 = 15;
+const ExtraID kN59RobotDisappears = 16;
+const ExtraID kN60ClawFromAToB = 17;
+const ExtraID kN60ClawALoop = 18;
+const ExtraID kN60ClawAPinch = 19;
+const ExtraID kN60ClawACounterclockwise = 20;
+const ExtraID kN60ClawAClockwise = 21;
+const ExtraID kN60ClawFromBToA = 22;
+const ExtraID kN60ClawFromBToC = 23;
+const ExtraID kN60ClawFromBToD = 24;
+const ExtraID kN60ClawBLoop = 25;
+const ExtraID kN60ClawBPinch = 26;
+const ExtraID kN60ClawBCounterclockwise = 27;
+const ExtraID kN60ClawBClockwise = 28;
+const ExtraID kN60ClawFromCToB = 29;
+const ExtraID kN60ClawCLoop = 30;
+const ExtraID kN60ClawCPinch = 31;
+const ExtraID kN60ClawCCounterclockwise = 32;
+const ExtraID kN60ClawCClockwise = 33;
+const ExtraID kN60ClawFromDToB = 34;
+const ExtraID kN60ClawDLoop = 35;
+const ExtraID kN60ClawDPinch = 36;
+const ExtraID kN60ClawDCounterclockwise = 37;
+const ExtraID kN60ClawDClockwise = 38;
+const ExtraID kN60RobotApproaches = 39;
+const ExtraID kN60FirstMistake = 40;
+const ExtraID kN60ArmActivated = 41;
+const ExtraID kN60SecondMistake = 42;
+const ExtraID kN60ArmToPositionB = 43;
+const ExtraID kN60ThirdMistake = 44;
+const ExtraID kN60ArmGrabsRobot = 45;
+const ExtraID kN60FourthMistake = 46;
+const ExtraID kN60ArmCarriesRobotToPositionA = 47;
+const ExtraID kN60PlayerFollowsRobotToDoor = 48;
+const ExtraID kN60RobotHeadOpens = 49;
+const ExtraID kN60Biochips111 = 50;
+const ExtraID kN60Biochips011 = 51;
+const ExtraID kN60Biochips101 = 52;
+const ExtraID kN60Biochips001 = 53;
+const ExtraID kN60Biochips110 = 54;
+const ExtraID kN60Biochips010 = 55;
+const ExtraID kN60Biochips100 = 56;
+const ExtraID kN60Biochips000 = 57;
+const ExtraID kN60RobotDisappears = 58;
+const ExtraID kNoradDeltaRetinalScanBad = 59;
+const ExtraID kNoradDeltaRetinalScanGood = 60;
+const ExtraID kN79BrightView = 61;
 
 // Norad Delta Tables
 
@@ -656,99 +656,99 @@ const TimeScale kNoradDeltaFrameDuration = 40;
 
 //	Alternate IDs.
 
-const tAlternateID kAltNoradDeltaNormal = 0;
+const AlternateID kAltNoradDeltaNormal = 0;
 
 //	Room IDs.
 
-const tRoomID kNorad41 = 0;
-const tRoomID kNorad42 = 1;
-const tRoomID kNorad43 = 2;
-const tRoomID kNorad44 = 3;
-const tRoomID kNorad45 = 4;
-const tRoomID kNorad46 = 5;
-const tRoomID kNorad47 = 6;
-const tRoomID kNorad48 = 7;
-const tRoomID kNorad48South = 8;
-const tRoomID kNorad49 = 9;
-const tRoomID kNorad49South = 10;
-const tRoomID kNorad50 = 11;
-const tRoomID kNorad50East = 12;
-const tRoomID kNorad51 = 13;
-const tRoomID kNorad52 = 14;
-const tRoomID kNorad53 = 15;
-const tRoomID kNorad54 = 16;
-const tRoomID kNorad54North = 17;
-const tRoomID kNorad55 = 18;
-const tRoomID kNorad56 = 19;
-const tRoomID kNorad57 = 20;
-const tRoomID kNorad58 = 21;
-const tRoomID kNorad59 = 22;
-const tRoomID kNorad59West = 23;
-const tRoomID kNorad60 = 24;
-const tRoomID kNorad60West = 25;
-const tRoomID kNorad61 = 26;
-const tRoomID kNorad62 = 27;
-const tRoomID kNorad63 = 28;
-const tRoomID kNorad64 = 29;
-const tRoomID kNorad65 = 30;
-const tRoomID kNorad66 = 31;
-const tRoomID kNorad67 = 32;
-const tRoomID kNorad68 = 33;
-const tRoomID kNorad68West = 34;
-const tRoomID kNorad69 = 35;
-const tRoomID kNorad78 = 36;
-const tRoomID kNorad79 = 37;
-const tRoomID kNorad79West = 38;
+const RoomID kNorad41 = 0;
+const RoomID kNorad42 = 1;
+const RoomID kNorad43 = 2;
+const RoomID kNorad44 = 3;
+const RoomID kNorad45 = 4;
+const RoomID kNorad46 = 5;
+const RoomID kNorad47 = 6;
+const RoomID kNorad48 = 7;
+const RoomID kNorad48South = 8;
+const RoomID kNorad49 = 9;
+const RoomID kNorad49South = 10;
+const RoomID kNorad50 = 11;
+const RoomID kNorad50East = 12;
+const RoomID kNorad51 = 13;
+const RoomID kNorad52 = 14;
+const RoomID kNorad53 = 15;
+const RoomID kNorad54 = 16;
+const RoomID kNorad54North = 17;
+const RoomID kNorad55 = 18;
+const RoomID kNorad56 = 19;
+const RoomID kNorad57 = 20;
+const RoomID kNorad58 = 21;
+const RoomID kNorad59 = 22;
+const RoomID kNorad59West = 23;
+const RoomID kNorad60 = 24;
+const RoomID kNorad60West = 25;
+const RoomID kNorad61 = 26;
+const RoomID kNorad62 = 27;
+const RoomID kNorad63 = 28;
+const RoomID kNorad64 = 29;
+const RoomID kNorad65 = 30;
+const RoomID kNorad66 = 31;
+const RoomID kNorad67 = 32;
+const RoomID kNorad68 = 33;
+const RoomID kNorad68West = 34;
+const RoomID kNorad69 = 35;
+const RoomID kNorad78 = 36;
+const RoomID kNorad79 = 37;
+const RoomID kNorad79West = 38;
 
 //	Hot Spot Activation IDs.
 
 
 //	Hot Spot IDs.
 
-const tHotSpotID kNorad48ElevatorSpotID = 5000;
-const tHotSpotID kNorad48ElevatorOutSpotID = 5001;
-const tHotSpotID kNorad48ElevatorUpSpotID = 5002;
-const tHotSpotID kNorad49ElevatorSpotID = 5003;
-const tHotSpotID kNorad49ElevatorOutSpotID = 5004;
-const tHotSpotID kNorad49ElevatorDownSpotID = 5005;
-const tHotSpotID kNorad50DoorSpotID = 5006;
-const tHotSpotID kNorad50DoorOutSpotID = 5007;
-const tHotSpotID kDeltaUpperPressureDoorUpSpotID = 5008;
-const tHotSpotID kDeltaUpperPressureDoorDownSpotID = 5009;
-const tHotSpotID kNorad54DoorSpotID = 5010;
-const tHotSpotID kNorad54DoorOutSpotID = 5011;
-const tHotSpotID kNorad59WestSpotID = 5012;
-const tHotSpotID kNorad59WestOutSpotID = 5013;
-const tHotSpotID kDeltaLowerPressureDoorUpSpotID = 5014;
-const tHotSpotID kDeltaLowerPressureDoorDownSpotID = 5015;
-const tHotSpotID kDelta59RobotHeadSpotID = 5016;
-const tHotSpotID kDelta59RobotShieldBiochipSpotID = 5017;
-const tHotSpotID kDelta59RobotOpMemBiochipSpotID = 5018;
-const tHotSpotID kDelta59RobotRetinalBiochipSpotID = 5019;
-const tHotSpotID kNorad60MonitorSpotID = 5020;
-const tHotSpotID kNorad60MonitorOutSpotID = 5021;
-const tHotSpotID kNorad60LaunchPrepSpotID = 5022;
-const tHotSpotID kNorad60ClawControlSpotID = 5023;
-const tHotSpotID kNorad60ClawPinchSpotID = 5024;
-const tHotSpotID kNorad60ClawDownSpotID = 5025;
-const tHotSpotID kNorad60ClawRightSpotID = 5026;
-const tHotSpotID kNorad60ClawLeftSpotID = 5027;
-const tHotSpotID kNorad60ClawUpSpotID = 5028;
-const tHotSpotID kNorad60ClawCCWSpotID = 5029;
-const tHotSpotID kNorad60ClawCWSpotID = 5030;
-const tHotSpotID kDelta60RobotHeadSpotID = 5031;
-const tHotSpotID kDelta60RobotShieldBiochipSpotID = 5032;
-const tHotSpotID kDelta60RobotOpMemBiochipSpotID = 5033;
-const tHotSpotID kDelta60RobotRetinalBiochipSpotID = 5034;
-const tHotSpotID kNorad68WestSpotID = 5035;
-const tHotSpotID kNorad68WestOutSpotID = 5036;
-const tHotSpotID kNorad79WestSpotID = 5037;
-const tHotSpotID kNorad79WestOutSpotID = 5038;
-const tHotSpotID kNorad79SpinLeftSpotID = 5039;
-const tHotSpotID kNorad79SpinRightSpotID = 5040;
-const tHotSpotID kNorad79SpinUpSpotID = 5041;
-const tHotSpotID kNorad79SpinDownSpotID = 5042;
-const tHotSpotID kNorad79SiloAreaSpotID = 5043;
+const HotSpotID kNorad48ElevatorSpotID = 5000;
+const HotSpotID kNorad48ElevatorOutSpotID = 5001;
+const HotSpotID kNorad48ElevatorUpSpotID = 5002;
+const HotSpotID kNorad49ElevatorSpotID = 5003;
+const HotSpotID kNorad49ElevatorOutSpotID = 5004;
+const HotSpotID kNorad49ElevatorDownSpotID = 5005;
+const HotSpotID kNorad50DoorSpotID = 5006;
+const HotSpotID kNorad50DoorOutSpotID = 5007;
+const HotSpotID kDeltaUpperPressureDoorUpSpotID = 5008;
+const HotSpotID kDeltaUpperPressureDoorDownSpotID = 5009;
+const HotSpotID kNorad54DoorSpotID = 5010;
+const HotSpotID kNorad54DoorOutSpotID = 5011;
+const HotSpotID kNorad59WestSpotID = 5012;
+const HotSpotID kNorad59WestOutSpotID = 5013;
+const HotSpotID kDeltaLowerPressureDoorUpSpotID = 5014;
+const HotSpotID kDeltaLowerPressureDoorDownSpotID = 5015;
+const HotSpotID kDelta59RobotHeadSpotID = 5016;
+const HotSpotID kDelta59RobotShieldBiochipSpotID = 5017;
+const HotSpotID kDelta59RobotOpMemBiochipSpotID = 5018;
+const HotSpotID kDelta59RobotRetinalBiochipSpotID = 5019;
+const HotSpotID kNorad60MonitorSpotID = 5020;
+const HotSpotID kNorad60MonitorOutSpotID = 5021;
+const HotSpotID kNorad60LaunchPrepSpotID = 5022;
+const HotSpotID kNorad60ClawControlSpotID = 5023;
+const HotSpotID kNorad60ClawPinchSpotID = 5024;
+const HotSpotID kNorad60ClawDownSpotID = 5025;
+const HotSpotID kNorad60ClawRightSpotID = 5026;
+const HotSpotID kNorad60ClawLeftSpotID = 5027;
+const HotSpotID kNorad60ClawUpSpotID = 5028;
+const HotSpotID kNorad60ClawCCWSpotID = 5029;
+const HotSpotID kNorad60ClawCWSpotID = 5030;
+const HotSpotID kDelta60RobotHeadSpotID = 5031;
+const HotSpotID kDelta60RobotShieldBiochipSpotID = 5032;
+const HotSpotID kDelta60RobotOpMemBiochipSpotID = 5033;
+const HotSpotID kDelta60RobotRetinalBiochipSpotID = 5034;
+const HotSpotID kNorad68WestSpotID = 5035;
+const HotSpotID kNorad68WestOutSpotID = 5036;
+const HotSpotID kNorad79WestSpotID = 5037;
+const HotSpotID kNorad79WestOutSpotID = 5038;
+const HotSpotID kNorad79SpinLeftSpotID = 5039;
+const HotSpotID kNorad79SpinRightSpotID = 5040;
+const HotSpotID kNorad79SpinUpSpotID = 5041;
+const HotSpotID kNorad79SpinDownSpotID = 5042;
+const HotSpotID kNorad79SiloAreaSpotID = 5043;
 
 } // End of namespace Pegasus
 
diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.cpp b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
index 39cccc64fc..d413554c05 100755
--- a/engines/pegasus/neighborhood/norad/delta/globegame.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/globegame.cpp
@@ -197,28 +197,27 @@ void GlobeTracker::stopGlobeMovie() {
 }
 
 //	Globe game PICTs:
-
-static const tResIDType kGlobeCircleLeftPICTID = 300;
-static const tResIDType kGlobeCircleRightPICTID = 301;
-static const tResIDType kGlobeCircleUpPICTID = 302;
-static const tResIDType kGlobeCircleDownPICTID = 303;
-static const tResIDType kTargetUpperLeftPICTID = 304;
-static const tResIDType kTargetUpperRightPICTID = 305;
-static const tResIDType kTargetLowerLeftPICTID = 306;
-static const tResIDType kTargetLowerRightPICTID = 307;
-static const tResIDType kMotionHiliteLeftPICTID = 308;
-static const tResIDType kMotionHiliteRightPICTID = 309;
-static const tResIDType kMotionHiliteUpPICTID = 310;
-static const tResIDType kMotionHiliteDownPICTID = 311;
-
-const tResIDType kGlobeCountdownDigitsID = 350;
+static const ResIDType kGlobeCircleLeftPICTID = 300;
+static const ResIDType kGlobeCircleRightPICTID = 301;
+static const ResIDType kGlobeCircleUpPICTID = 302;
+static const ResIDType kGlobeCircleDownPICTID = 303;
+static const ResIDType kTargetUpperLeftPICTID = 304;
+static const ResIDType kTargetUpperRightPICTID = 305;
+static const ResIDType kTargetLowerLeftPICTID = 306;
+static const ResIDType kTargetLowerRightPICTID = 307;
+static const ResIDType kMotionHiliteLeftPICTID = 308;
+static const ResIDType kMotionHiliteRightPICTID = 309;
+static const ResIDType kMotionHiliteUpPICTID = 310;
+static const ResIDType kMotionHiliteDownPICTID = 311;
+
+static const ResIDType kGlobeCountdownDigitsID = 350;
 
 static const int kGlobeCountdownWidth = 28;
 static const int kGlobeCountdownHeight = 12;
 static const int kGlobeCountdownOffset1 = 12;
 static const int kGlobeCountdownOffset2 = 20;
 
-GlobeCountdown::GlobeCountdown(const tDisplayElementID id) : IdlerAnimation(id) {	
+GlobeCountdown::GlobeCountdown(const DisplayElementID id) : IdlerAnimation(id) {	
 	_digits.getImageFromPICTResource(((PegasusEngine *)g_engine)->_resFork, kGlobeCountdownDigitsID);
 
 	Common::Rect r;
@@ -228,7 +227,7 @@ GlobeCountdown::GlobeCountdown(const tDisplayElementID id) : IdlerAnimation(id)
 	sizeElement(kGlobeCountdownWidth, kGlobeCountdownHeight);
 }
 
-void GlobeCountdown::setDisplayOrder(const tDisplayOrder order) {
+void GlobeCountdown::setDisplayOrder(const DisplayOrder order) {
 	IdlerAnimation::setDisplayOrder(order);
 }
 
@@ -240,7 +239,7 @@ void GlobeCountdown::hide() {
 	IdlerAnimation::hide();
 }
 
-void GlobeCountdown::moveElementTo(const tCoordType x, const tCoordType y) {
+void GlobeCountdown::moveElementTo(const CoordType x, const CoordType y) {
 	IdlerAnimation::moveElementTo(x, y);
 }
 
@@ -379,11 +378,11 @@ static const TimeValue kGlobeMovieStartTime = 2 * 2 * kNumLongSlices * 600 / 15;
 
 static const TimeValue kTimePerGlobeFrame = 40;
 
-static const tNotificationFlags kGlobeSplash1Finished = 1;
-static const tNotificationFlags kGlobeTimerExpired = kGlobeSplash1Finished << 1;
-static const tNotificationFlags kMaxDeactivatedFinished = kGlobeTimerExpired << 1;
+static const NotificationFlags kGlobeSplash1Finished = 1;
+static const NotificationFlags kGlobeTimerExpired = kGlobeSplash1Finished << 1;
+static const NotificationFlags kMaxDeactivatedFinished = kGlobeTimerExpired << 1;
 
-static const tNotificationFlags kGlobeNotificationFlags = kGlobeSplash1Finished |
+static const NotificationFlags kGlobeNotificationFlags = kGlobeSplash1Finished |
 													kGlobeTimerExpired |
 													kMaxDeactivatedFinished;
 
@@ -422,7 +421,6 @@ enum {
 };
 
 // TODO: Use ScummVM equivalent
-
 static const float kPI = 3.1415926535f;
 
 float degreesToRadians(float angle) {
@@ -433,7 +431,7 @@ float radiansToDegrees(float angle) {
 	return (angle * 180) / kPI;
 }
 
-GlobeGame::GlobeGame(Neighborhood* handler) : GameInteraction(kNoradGlobeGameInteractionID, handler),
+GlobeGame::GlobeGame(Neighborhood *handler) : GameInteraction(kNoradGlobeGameInteractionID, handler),
 		_monitorMovie(kGlobeMonitorID), _globeMovie(kGlobeMovieID), _upperNamesMovie(kGlobeUpperNamesID),
 		_lowerNamesMovie(kGlobeLowerNamesID), _globeNotification(kNoradGlobeNotificationID, (PegasusEngine *)g_engine),
 		_globeCircleLeft(kGlobeCircleLeftID), _globeCircleRight(kGlobeCircleRightID),
@@ -614,7 +612,7 @@ void GlobeGame::closeInteraction() {
 	_neighborhoodNotification->cancelNotification(this);
 }
 
-void GlobeGame::receiveNotification(Notification *notification, const tNotificationFlags flags) {
+void GlobeGame::receiveNotification(Notification *notification, const NotificationFlags flags) {
 	TimeScale scale = _monitorMovie.getScale();
 
 	if (notification == _neighborhoodNotification) {
diff --git a/engines/pegasus/neighborhood/norad/delta/globegame.h b/engines/pegasus/neighborhood/norad/delta/globegame.h
index e2fe318f09..9c31a931fc 100755
--- a/engines/pegasus/neighborhood/norad/delta/globegame.h
+++ b/engines/pegasus/neighborhood/norad/delta/globegame.h
@@ -70,17 +70,17 @@ protected:
 
 class GlobeCountdown : public IdlerAnimation {
 public:
-	GlobeCountdown(const tDisplayElementID);
+	GlobeCountdown(const DisplayElementID);
 	virtual ~GlobeCountdown() {}
 
 	void setCountdownTime(const int);
 	void startCountdown();
 	void stopCountdown();
 
-	void setDisplayOrder(const tDisplayOrder);
+	void setDisplayOrder(const DisplayOrder);
 	void show();
 	void hide();
-	void moveElementTo(const tCoordType, const tCoordType);
+	void moveElementTo(const CoordType, const CoordType);
 
 	void draw(const Common::Rect &);
 
@@ -125,7 +125,7 @@ protected:
 	void initInteraction();
 	void closeInteraction();
 
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 
 	void spinGlobe(const Input &, const Hotspot *, GlobeTrackDirection);
 	void clickGlobe(const Input &);
diff --git a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
index 8f4df726a2..2b208aab71 100755
--- a/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
+++ b/engines/pegasus/neighborhood/norad/delta/noraddelta.cpp
@@ -199,7 +199,7 @@ void NoradDelta::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSp
 	}
 }
 
-GameInteraction *NoradDelta::makeInteraction(const tInteractionID interactionID) {
+GameInteraction *NoradDelta::makeInteraction(const InteractionID interactionID) {
 	if (interactionID == kNoradGlobeGameInteractionID)
 		return new GlobeGame(this);
 
@@ -210,14 +210,14 @@ void NoradDelta::playClawMonitorIntro() {
 	playSpotSoundSync(kLoadClawIntroIn, kLoadClawIntroOut);
 }
 
-void NoradDelta::getExitEntry(const tRoomID room, const tDirectionConstant direction, ExitTable::Entry &entry) {
+void NoradDelta::getExitEntry(const RoomID room, const DirectionConstant direction, ExitTable::Entry &entry) {
 	Norad::getExitEntry(room, direction, entry);
 
 	if (room == kNorad61 && direction == kSouth)
 		entry.movieStart += kNoradDeltaFrameDuration;
 }
 
-void NoradDelta::getZoomEntry(const tHotSpotID id, ZoomTable::Entry &zoomEntry) {
+void NoradDelta::getZoomEntry(const HotSpotID id, ZoomTable::Entry &zoomEntry) {
 	Norad::getZoomEntry(id, zoomEntry);
 
 	if (id == kNorad59WestSpotID && GameState.getNoradPlayedGlobeGame()) {
@@ -263,7 +263,7 @@ void NoradDelta::loadAmbientLoops() {
 */
 	
 	if (GameState.getNoradArrivedFromSub()) {
-		tRoomID room = GameState.getCurrentRoom();
+		RoomID room = GameState.getCurrentRoom();
 
 		if (room == kNorad79West) {
 			if (_privateFlags.getFlag(kNoradPrivateFinishedGlobeGameFlag))
@@ -304,7 +304,7 @@ void NoradDelta::loadAmbientLoops() {
 	}
 }
 
-void NoradDelta::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) {
+void NoradDelta::checkContinuePoint(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kNorad41, kEast):
 	case MakeRoomView(kNorad49, kEast):
@@ -317,7 +317,7 @@ void NoradDelta::checkContinuePoint(const tRoomID room, const tDirectionConstant
 	}
 }
 
-void NoradDelta::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void NoradDelta::arriveAt(const RoomID room, const DirectionConstant direction) {
 	if (room != kNorad68)
 		GameState.setNoradRetScanGood(false);
 
@@ -411,7 +411,7 @@ void NoradDelta::succeedRetinalScan() {
 	GameState.setScoringUsedRetinalChip(true);
 }
 
-void NoradDelta::getDoorEntry(const tRoomID room, const tDirectionConstant direction, DoorTable::Entry &entry) {
+void NoradDelta::getDoorEntry(const RoomID room, const DirectionConstant direction, DoorTable::Entry &entry) {
 	Norad::getDoorEntry(room, direction, entry);
 
 	if (room == kNorad68 && direction == kWest && !GameState.getNoradRetScanGood())
@@ -430,9 +430,9 @@ bool NoradDelta::playingAgainstRobot() {
 	return GameState.getNoradPlayedGlobeGame();
 }
 
-void NoradDelta::getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, tHotSpotID &clawControlSpotID, tHotSpotID &pinchClawSpotID,
-		tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID, tHotSpotID &moveClawLeftSpotID, tHotSpotID &moveClawUpSpotID,
-		tHotSpotID &clawCCWSpotID, tHotSpotID &clawCWSpotID, uint32 &clawPosition, const uint32 *&clawExtraIDs) {
+void NoradDelta::getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, HotSpotID &clawControlSpotID, HotSpotID &pinchClawSpotID,
+		HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID, HotSpotID &moveClawLeftSpotID, HotSpotID &moveClawUpSpotID,
+		HotSpotID &clawCCWSpotID, HotSpotID &clawCWSpotID, uint32 &clawPosition, const uint32 *&clawExtraIDs) {
 	outSpotID = kNorad60MonitorOutSpotID;
 	prepSpotID = kNorad60LaunchPrepSpotID;
 	clawControlSpotID = kNorad60ClawControlSpotID;
@@ -462,7 +462,7 @@ void NoradDelta::playerBeatRobotWithClaw() {
 	g_AIArea->playAIMovie(kRightAreaSignature, "Images/AI/Norad/XN59WD", false, kWarningInterruption);
 }
 
-TimeValue NoradDelta::getViewTime(const tRoomID room, const tDirectionConstant direction) {
+TimeValue NoradDelta::getViewTime(const RoomID room, const DirectionConstant direction) {
 	ExtraTable::Entry entry;
 	
 	if (room == kNorad41 && direction == kSouth && !GameState.getNoradArrivedFromSub()) {
@@ -582,7 +582,7 @@ void NoradDelta::clickInHotspot(const Input &input, const Hotspot *clickedSpot)
 	}
 }
 
-void NoradDelta::receiveNotification(Notification *notification, const tNotificationFlags flags) {	
+void NoradDelta::receiveNotification(Notification *notification, const NotificationFlags flags) {	
 	Norad::receiveNotification(notification, flags);
 
 	if ((flags & kExtraCompletedFlag) != 0) {
@@ -702,7 +702,7 @@ void NoradDelta::dropItemIntoRoom(Item *item, Hotspot *hotspot) {
 }
 
 Hotspot *NoradDelta::getItemScreenSpot(Item *item, DisplayElement *element) {
-	tHotSpotID id = kNoHotSpotID;
+	HotSpotID id = kNoHotSpotID;
 	
 	switch (item->getObjectID()) {
 	case kShieldBiochip:
@@ -814,7 +814,7 @@ Common::String NoradDelta::getHintMovie(uint hintNum) {
 	return movieName;
 }
 
-void NoradDelta::closeDoorOffScreen(const tRoomID room, const tDirectionConstant) {
+void NoradDelta::closeDoorOffScreen(const RoomID room, const DirectionConstant) {
 	switch (room) {
 	case kNorad47:
 	case kNorad48:
diff --git a/engines/pegasus/neighborhood/norad/delta/noraddelta.h b/engines/pegasus/neighborhood/norad/delta/noraddelta.h
index 69798b5189..11065f2c9d 100755
--- a/engines/pegasus/neighborhood/norad/delta/noraddelta.h
+++ b/engines/pegasus/neighborhood/norad/delta/noraddelta.h
@@ -43,14 +43,14 @@ public:
 
 	void finishedGlobeGame();
 
-	virtual GameInteraction *makeInteraction(const tInteractionID);
+	virtual GameInteraction *makeInteraction(const InteractionID);
 
 	void playClawMonitorIntro();
 
-	virtual void getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID, tHotSpotID &clawControlSpotID,
-			tHotSpotID &pinchClawSpotID, tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID,
-			tHotSpotID &moveClawLeftSpotID, tHotSpotID &moveClawUpSpotID, tHotSpotID &clawCCWSpotID,
-			tHotSpotID &clawCWSpotID, uint32 &, const uint32 *&);
+	virtual void getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID, HotSpotID &clawControlSpotID,
+			HotSpotID &pinchClawSpotID, HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID,
+			HotSpotID &moveClawLeftSpotID, HotSpotID &moveClawUpSpotID, HotSpotID &clawCCWSpotID,
+			HotSpotID &clawCWSpotID, uint32 &, const uint32 *&);
 
 	void playerBeatRobotWithClaw();
 	void playerBeatRobotWithDoor();
@@ -61,9 +61,9 @@ public:
 	Common::String getEnvScanMovie();
 	uint getNumHints();
 	Common::String getHintMovie(uint);
-	void closeDoorOffScreen(const tRoomID, const tDirectionConstant);
+	void closeDoorOffScreen(const RoomID, const DirectionConstant);
 
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 
 	bool canSolve();
 	void doSolve();
@@ -83,16 +83,16 @@ protected:
 
 	static const uint32 _noradDeltaClawExtras[22];
 
-	void getExitEntry(const tRoomID, const tDirectionConstant, ExitTable::Entry &);
-	void getZoomEntry(const tHotSpotID, ZoomTable::Entry &);
-	virtual void arriveAt(const tRoomID, const tDirectionConstant);
+	void getExitEntry(const RoomID, const DirectionConstant, ExitTable::Entry &);
+	void getZoomEntry(const HotSpotID, ZoomTable::Entry &);
+	virtual void arriveAt(const RoomID, const DirectionConstant);
 	void arriveAtNorad68West();
 	void arriveAtNorad79West();
-	TimeValue getViewTime(const tRoomID, const tDirectionConstant);
+	TimeValue getViewTime(const RoomID, const DirectionConstant);
 	void openDoor();
 	void activateHotspots();
 	void clickInHotspot(const Input &, const Hotspot *);
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void pickedUpItem(Item *item);
 	void takeItemFromRoom(Item *item);
 	void dropItemIntoRoom(Item *item, Hotspot *);
@@ -102,7 +102,7 @@ protected:
 
 	void failRetinalScan();
 	void succeedRetinalScan();
-	void getDoorEntry(const tRoomID, const tDirectionConstant, DoorTable::Entry &);
+	void getDoorEntry(const RoomID, const DirectionConstant, DoorTable::Entry &);
 
 	void bumpIntoWall();
 
diff --git a/engines/pegasus/neighborhood/norad/norad.cpp b/engines/pegasus/neighborhood/norad/norad.cpp
index 8e891f37c1..9ee8205ec1 100755
--- a/engines/pegasus/neighborhood/norad/norad.cpp
+++ b/engines/pegasus/neighborhood/norad/norad.cpp
@@ -37,14 +37,14 @@
 
 namespace Pegasus {
 
-const tNotificationFlags kDoneWithPressureDoorNotification = 1;
+const NotificationFlags kDoneWithPressureDoorNotification = 1;
 
-const tNotificationFlags kNoradNotificationFlags = kDoneWithPressureDoorNotification;
+const NotificationFlags kNoradNotificationFlags = kDoneWithPressureDoorNotification;
 
 // This class handles everything that Norad Alpha and Delta have in common, such as
 // oxygen mask usage, the elevator and the pressure doors.
 
-Norad::Norad(InputHandler *nextHandler, PegasusEngine *vm, const Common::String &resName, tNeighborhoodID id) :
+Norad::Norad(InputHandler *nextHandler, PegasusEngine *vm, const Common::String &resName, NeighborhoodID id) :
 		Neighborhood(nextHandler, vm, resName, id), _noradNotification(kNoradNotificationID, vm) {
 	_elevatorUpSpotID = kNoHotSpotID;
 	_elevatorDownSpotID = kNoHotSpotID;
@@ -81,36 +81,36 @@ Norad::Norad(InputHandler *nextHandler, PegasusEngine *vm, const Common::String
 	_noradNotification.notifyMe(this, kNoradNotificationFlags, kNoradNotificationFlags);
 }
 
-GameInteraction *Norad::makeInteraction(const tInteractionID interactionID) {
+GameInteraction *Norad::makeInteraction(const InteractionID interactionID) {
 	PressureDoor *pressureDoor;
 	SubControlRoom *subControl;
 
 	switch (interactionID) {
-		case kNoradElevatorInteractionID:
-			return new NoradElevator(this, _elevatorUpRoomID, _elevatorDownRoomID, _elevatorUpSpotID, _elevatorDownSpotID);
-		case kNoradPressureDoorInteractionID:
-			if (GameState.getCurrentRoom() == _upperPressureDoorRoom)
-				pressureDoor = new PressureDoor(this, true, _upperPressureDoorUpSpotID, _upperPressureDoorDownSpotID,
-						_upperPressureDoorAbortSpotID, _pressureSoundIn, _pressureSoundOut, _equalizeSoundIn, _equalizeSoundOut);
-			else
-				pressureDoor = new PressureDoor(this, false, _lowerPressureDoorUpSpotID, _lowerPressureDoorDownSpotID,
-						_lowerPressureDoorAbortSpotID, _pressureSoundIn, _pressureSoundOut, _equalizeSoundIn, _equalizeSoundOut);
-
-			if (GameState.getCurrentRoom() == kNorad59West && playingAgainstRobot())
-				pressureDoor->playAgainstRobot();
-
-			return pressureDoor;
-		case kNoradSubControlRoomInteractionID:
-			subControl = new SubControlRoom(this);
-
-			if (GameState.getCurrentRoom() == kNorad60West && playingAgainstRobot())
-				subControl->playAgainstRobot();
-
-			return subControl;
-		case kNoradSubPlatformInteractionID:
-			return new SubPlatform(this);
-		default:
-			return 0;
+	case kNoradElevatorInteractionID:
+		return new NoradElevator(this, _elevatorUpRoomID, _elevatorDownRoomID, _elevatorUpSpotID, _elevatorDownSpotID);
+	case kNoradPressureDoorInteractionID:
+		if (GameState.getCurrentRoom() == _upperPressureDoorRoom)
+			pressureDoor = new PressureDoor(this, true, _upperPressureDoorUpSpotID, _upperPressureDoorDownSpotID,
+					_upperPressureDoorAbortSpotID, _pressureSoundIn, _pressureSoundOut, _equalizeSoundIn, _equalizeSoundOut);
+		else
+			pressureDoor = new PressureDoor(this, false, _lowerPressureDoorUpSpotID, _lowerPressureDoorDownSpotID,
+					_lowerPressureDoorAbortSpotID, _pressureSoundIn, _pressureSoundOut, _equalizeSoundIn, _equalizeSoundOut);
+
+		if (GameState.getCurrentRoom() == kNorad59West && playingAgainstRobot())
+			pressureDoor->playAgainstRobot();
+
+		return pressureDoor;
+	case kNoradSubControlRoomInteractionID:
+		subControl = new SubControlRoom(this);
+
+		if (GameState.getCurrentRoom() == kNorad60West && playingAgainstRobot())
+			subControl->playAgainstRobot();
+
+		return subControl;
+	case kNoradSubPlatformInteractionID:
+		return new SubPlatform(this);
+	default:
+		return 0;
 	}
 }
 
@@ -126,14 +126,14 @@ void Norad::start() {
 void Norad::activateHotspots() {	
 	Neighborhood::activateHotspots();
 
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 	if (room == _elevatorUpRoomID)
 		_neighborhoodHotspots.activateOneHotspot(_elevatorDownSpotID);
 	else if (room == _elevatorDownRoomID)
 		_neighborhoodHotspots.activateOneHotspot(_elevatorUpSpotID);
 }
 
-void Norad::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void Norad::arriveAt(const RoomID room, const DirectionConstant direction) {
 	Neighborhood::arriveAt(room, direction);
 
 	if (GameState.getCurrentRoom() == _elevatorUpRoomID || GameState.getCurrentRoom() == _elevatorDownRoomID)
@@ -176,7 +176,7 @@ void Norad::arriveAtSubControlRoom() {
 	newInteraction(kNoradSubControlRoomInteractionID);
 }
 
-int16 Norad::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) {
+int16 Norad::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) {
 	int16 result = Neighborhood::getStaticCompassAngle(room, dir);
 
 	if (room == _elevatorUpRoomID || room == _elevatorDownRoomID)
@@ -189,7 +189,7 @@ int16 Norad::getStaticCompassAngle(const tRoomID room, const tDirectionConstant
 	return result;
 }
 
-tCanOpenDoorReason Norad::canOpenDoor(DoorTable::Entry &entry) {
+CanOpenDoorReason Norad::canOpenDoor(DoorTable::Entry &entry) {
 	if (((GameState.getCurrentRoom() == _subRoomEntryRoom1 && GameState.getCurrentDirection() == _subRoomEntryDir1) ||
 			(GameState.getCurrentRoom() == _subRoomEntryRoom2 && GameState.getCurrentDirection() == _subRoomEntryDir2)) &&
 			GameState.getNoradSubRoomPressure() != kNormalSubRoomPressure)
@@ -198,7 +198,7 @@ tCanOpenDoorReason Norad::canOpenDoor(DoorTable::Entry &entry) {
 	return Neighborhood::canOpenDoor(entry);
 }
 
-void Norad::cantOpenDoor(tCanOpenDoorReason reason) {
+void Norad::cantOpenDoor(CanOpenDoorReason reason) {
 	if (reason == kCantOpenBadPressure)
 		playSpotSoundSync(_pressureSoundIn, _pressureSoundOut);
 	else
@@ -251,7 +251,7 @@ void Norad::checkAirMask() {
 	loadAmbientLoops();
 }
 
-void Norad::receiveNotification(Notification *notification, const tNotificationFlags flags) {	
+void Norad::receiveNotification(Notification *notification, const NotificationFlags flags) {	
 	if (notification == &_neighborhoodNotification && (flags & kAirTimerExpiredFlag) != 0)
 		((PegasusEngine *)g_engine)->die(kDeathGassedInNorad);
 
diff --git a/engines/pegasus/neighborhood/norad/norad.h b/engines/pegasus/neighborhood/norad/norad.h
index eb4c480bf8..4723410b4c 100755
--- a/engines/pegasus/neighborhood/norad/norad.h
+++ b/engines/pegasus/neighborhood/norad/norad.h
@@ -34,23 +34,23 @@ namespace Pegasus {
 
 class Norad : public Neighborhood {
 public:
-	Norad(InputHandler *, PegasusEngine *owner, const Common::String &resName, const tNeighborhoodID);
+	Norad(InputHandler *, PegasusEngine *owner, const Common::String &resName, const NeighborhoodID);
 	virtual ~Norad() {}
 
 	void flushGameState();
 
 	virtual void start();
 
-	virtual void getClawInfo(tHotSpotID &outSpotID, tHotSpotID &prepSpotID,
-			tHotSpotID &clawControlSpotID, tHotSpotID &pinchClawSpotID,
-			tHotSpotID &moveClawDownSpotID, tHotSpotID &moveClawRightSpotID,
-			tHotSpotID &moveClawLeftSpotID,tHotSpotID &moveClawUpSpotID,
-			tHotSpotID &clawCCWSpotID, tHotSpotID &clawCWSpotID, uint32 &, const uint32 *&) = 0;
+	virtual void getClawInfo(HotSpotID &outSpotID, HotSpotID &prepSpotID,
+			HotSpotID &clawControlSpotID, HotSpotID &pinchClawSpotID,
+			HotSpotID &moveClawDownSpotID, HotSpotID &moveClawRightSpotID,
+			HotSpotID &moveClawLeftSpotID,HotSpotID &moveClawUpSpotID,
+			HotSpotID &clawCCWSpotID, HotSpotID &clawCWSpotID, uint32 &, const uint32 *&) = 0;
 	void checkAirMask();
 
 	virtual uint16 getDateResID() const;
 
-	virtual GameInteraction *makeInteraction(const tInteractionID);
+	virtual GameInteraction *makeInteraction(const InteractionID);
 
 	Common::String getBriefingMovie();
 
@@ -61,49 +61,49 @@ public:
 	void doneWithPressureDoor();
 
 protected:
-	tCanOpenDoorReason canOpenDoor(DoorTable::Entry &);
-	void cantOpenDoor(tCanOpenDoorReason);
-	int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant);
+	CanOpenDoorReason canOpenDoor(DoorTable::Entry &);
+	void cantOpenDoor(CanOpenDoorReason);
+	int16 getStaticCompassAngle(const RoomID, const DirectionConstant);
 	virtual void startExitMovie(const ExitTable::Entry &);
 	void startZoomMovie(const ZoomTable::Entry &);
 	virtual void upButton(const Input &);
 	virtual void activateHotspots();
 
-	virtual void arriveAt(const tRoomID, const tDirectionConstant);
+	virtual void arriveAt(const RoomID, const DirectionConstant);
 	virtual void arriveAtNoradElevator();
 	virtual void arriveAtUpperPressureDoorRoom();
 	virtual void arriveAtLowerPressureDoorRoom();
 	virtual void arriveAtSubPlatformRoom();
 	virtual void arriveAtSubControlRoom();
 	void setUpAirMask();
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 	virtual bool playingAgainstRobot() { return false; }
 
 	Notification _noradNotification;
 	bool _doneWithPressureDoor;
 
-	tRoomID _elevatorUpRoomID;
-	tRoomID _elevatorDownRoomID;
-	tHotSpotID _elevatorUpSpotID;
-	tHotSpotID _elevatorDownSpotID;
+	RoomID _elevatorUpRoomID;
+	RoomID _elevatorDownRoomID;
+	HotSpotID _elevatorUpSpotID;
+	HotSpotID _elevatorDownSpotID;
 
 	TimeBase _airMaskTimer;
 	NotificationCallBack _airMaskCallBack;
 
-	tRoomID _subRoomEntryRoom1;
-	tDirectionConstant _subRoomEntryDir1;
-	tRoomID _subRoomEntryRoom2;
-	tDirectionConstant _subRoomEntryDir2;
-	tRoomID _upperPressureDoorRoom;
-	tRoomID _lowerPressureDoorRoom;
+	RoomID _subRoomEntryRoom1;
+	DirectionConstant _subRoomEntryDir1;
+	RoomID _subRoomEntryRoom2;
+	DirectionConstant _subRoomEntryDir2;
+	RoomID _upperPressureDoorRoom;
+	RoomID _lowerPressureDoorRoom;
 
-	tHotSpotID _upperPressureDoorUpSpotID;
-	tHotSpotID _upperPressureDoorDownSpotID;
-	tHotSpotID _upperPressureDoorAbortSpotID;
+	HotSpotID _upperPressureDoorUpSpotID;
+	HotSpotID _upperPressureDoorDownSpotID;
+	HotSpotID _upperPressureDoorAbortSpotID;
 	
-	tHotSpotID _lowerPressureDoorUpSpotID;
-	tHotSpotID _lowerPressureDoorDownSpotID;
-	tHotSpotID _lowerPressureDoorAbortSpotID;
+	HotSpotID _lowerPressureDoorUpSpotID;
+	HotSpotID _lowerPressureDoorDownSpotID;
+	HotSpotID _lowerPressureDoorAbortSpotID;
 	
 	TimeValue _pressureSoundIn;
 	TimeValue _pressureSoundOut;
@@ -112,8 +112,8 @@ protected:
 	TimeValue _accessDeniedIn;
 	TimeValue _accessDeniedOut;
 	
-	tRoomID	 _platformRoom;
-	tRoomID _subControlRoom;
+	RoomID	 _platformRoom;
+	RoomID _subControlRoom;
 };
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/neighborhood/norad/noradelevator.cpp b/engines/pegasus/neighborhood/norad/noradelevator.cpp
index 0cdc818cab..f3f1e1ce38 100755
--- a/engines/pegasus/neighborhood/norad/noradelevator.cpp
+++ b/engines/pegasus/neighborhood/norad/noradelevator.cpp
@@ -31,15 +31,14 @@
 
 namespace Pegasus {
 
-//	Norad elevator PICTs:
-
-const tResIDType kElevatorLabelID = 200;
-const tResIDType kElevatorButtonsID = 201;
-const tResIDType kElevatorDownOnID = 202;
-const tResIDType kElevatorUpOnID = 203;
-
-NoradElevator::NoradElevator(Neighborhood *handler, const tRoomID upRoom, const tRoomID downRoom,
-		const tHotSpotID upHotspot, const tHotSpotID downHotspot) : GameInteraction(kNoradElevatorInteractionID, handler),
+// Norad elevator PICTs:
+const ResIDType kElevatorLabelID = 200;
+const ResIDType kElevatorButtonsID = 201;
+const ResIDType kElevatorDownOnID = 202;
+const ResIDType kElevatorUpOnID = 203;
+
+NoradElevator::NoradElevator(Neighborhood *handler, const RoomID upRoom, const RoomID downRoom,
+		const HotSpotID upHotspot, const HotSpotID downHotspot) : GameInteraction(kNoradElevatorInteractionID, handler),
 		_elevatorControls(kNoradElevatorControlsID), _elevatorNotification(kNoradElevatorNotificationID, ((PegasusEngine *)g_engine)) {
 	_timerExpired = false;
 	_upRoom = upRoom;
@@ -110,7 +109,7 @@ void NoradElevator::activateHotspots() {
 }
 
 void NoradElevator::clickInHotspot(const Input &input, const Hotspot *spot) {
-	tHotSpotID id = spot->getObjectID();
+	HotSpotID id = spot->getObjectID();
 
 	if (id == _upHotspot || id == _downHotspot) {
 		g_neighborhood->moveForward();
@@ -123,7 +122,7 @@ void NoradElevator::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void NoradElevator::receiveNotification(Notification *, const tNotificationFlags) {
+void NoradElevator::receiveNotification(Notification *, const NotificationFlags) {
 	_elevatorControls.setCurrentFrameIndex(1);
 	_timerExpired = true;
 }
diff --git a/engines/pegasus/neighborhood/norad/noradelevator.h b/engines/pegasus/neighborhood/norad/noradelevator.h
index 58dc8abf39..a34c77b2e0 100755
--- a/engines/pegasus/neighborhood/norad/noradelevator.h
+++ b/engines/pegasus/neighborhood/norad/noradelevator.h
@@ -37,7 +37,7 @@ class Neighborhood;
 
 class NoradElevator : public GameInteraction, private NotificationReceiver {
 public:
-	NoradElevator(Neighborhood *, const tRoomID, const tRoomID, const tHotSpotID, const tHotSpotID);
+	NoradElevator(Neighborhood *, const RoomID, const RoomID, const HotSpotID, const HotSpotID);
 	virtual ~NoradElevator() {}
 
 protected:
@@ -49,12 +49,12 @@ protected:
 	virtual void activateHotspots();
 	virtual void clickInHotspot(const Input &, const Hotspot *);
 	
-	virtual void receiveNotification(Notification*, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 	
-	tRoomID _upRoom;
-	tRoomID _downRoom;
-	tHotSpotID _upHotspot;
-	tHotSpotID _downHotspot;
+	RoomID _upRoom;
+	RoomID _downRoom;
+	HotSpotID _upHotspot;
+	HotSpotID _downHotspot;
 	Sprite _elevatorControls;
 	TimeBase _elevatorTimer;
 	NotificationCallBack _elevatorCallBack;
diff --git a/engines/pegasus/neighborhood/norad/pressuredoor.cpp b/engines/pegasus/neighborhood/norad/pressuredoor.cpp
index 7cb483f63a..3675f4373b 100755
--- a/engines/pegasus/neighborhood/norad/pressuredoor.cpp
+++ b/engines/pegasus/neighborhood/norad/pressuredoor.cpp
@@ -48,17 +48,17 @@ const TimeValue kDecreasingPressureTime = 5;
 const TimeValue kCautionLoopStart = 6;
 const TimeValue kCautionLoopStop = 7;
 
-const tNotificationFlags kSplashFinished = 1;
-const tNotificationFlags kPressureDroppingFlag = kSplashFinished << 1;
+const NotificationFlags kSplashFinished = 1;
+const NotificationFlags kPressureDroppingFlag = kSplashFinished << 1;
 
-const tNotificationFlags kPressureNotificationFlags = kSplashFinished |
+const NotificationFlags kPressureNotificationFlags = kSplashFinished |
 														kPressureDroppingFlag;
 
-const tNotificationFlags kDoorJumpsUpFlag = 1;
-const tNotificationFlags kDoorJumpsBackFlag = kDoorJumpsUpFlag << 1;
-const tNotificationFlags kDoorCrushedFlag = kDoorJumpsBackFlag << 1;
+const NotificationFlags kDoorJumpsUpFlag = 1;
+const NotificationFlags kDoorJumpsBackFlag = kDoorJumpsUpFlag << 1;
+const NotificationFlags kDoorCrushedFlag = kDoorJumpsBackFlag << 1;
 
-const tNotificationFlags kUtilityNotificationFlags = kDoorJumpsUpFlag |
+const NotificationFlags kUtilityNotificationFlags = kDoorJumpsUpFlag |
 														kDoorJumpsBackFlag |
 														kDoorCrushedFlag;
 
@@ -81,7 +81,7 @@ enum {
 	kGameOver
 };
 
-//	Pressure values range from 0 to 11.
+// Pressure values range from 0 to 11.
 const short kMinPressure = 0;
 const short kMaxPressure = 11;
 
@@ -93,20 +93,19 @@ const TimeValue kApproachPunchInTime = 122 * kNavTimePerFrame;
 const TimeValue kLoopPunchInTime = 38 * kNavTimePerFrame;
 const TimeValue kPunchThroughTime = 38 * kNavTimePerFrame;
 
-//	Pressure door PICTs:
+// Pressure door PICTs:
+const ResIDType kUpperPressureUpOffPICTID = 400;
+const ResIDType kUpperPressureUpOnPICTID = 401;
+const ResIDType kUpperPressureDownOffPICTID = 402;
+const ResIDType kUpperPressureDownOnPICTID = 403;
 
-const tResIDType kUpperPressureUpOffPICTID = 400;
-const tResIDType kUpperPressureUpOnPICTID = 401;
-const tResIDType kUpperPressureDownOffPICTID = 402;
-const tResIDType kUpperPressureDownOnPICTID = 403;
+const ResIDType kLowerPressureUpOffPICTID = 404;
+const ResIDType kLowerPressureUpOnPICTID = 405;
+const ResIDType kLowerPressureDownOffPICTID = 406;
+const ResIDType kLowerPressureDownOnPICTID = 407;
 
-const tResIDType kLowerPressureUpOffPICTID = 404;
-const tResIDType kLowerPressureUpOnPICTID = 405;
-const tResIDType kLowerPressureDownOffPICTID = 406;
-const tResIDType kLowerPressureDownOnPICTID = 407;
-
-PressureDoor::PressureDoor(Neighborhood *handler, bool isUpperDoor, const tHotSpotID upSpotID, const tHotSpotID downSpotID,
-		const tHotSpotID outSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut, TimeValue equalizeSoundIn,
+PressureDoor::PressureDoor(Neighborhood *handler, bool isUpperDoor, const HotSpotID upSpotID, const HotSpotID downSpotID,
+		const HotSpotID outSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut, TimeValue equalizeSoundIn,
 		TimeValue equalizeSoundOut) : GameInteraction(kNoradPressureDoorInteractionID, handler),
 		_levelsMovie(kPressureDoorLevelsID), _typeMovie(kPressureDoorTypeID), _upButton(kPressureDoorUpButtonID),
 		_downButton(kPressureDoorDownButtonID), _pressureNotification(kNoradPressureNotificationID, ((PegasusEngine *)g_engine)),
@@ -262,7 +261,7 @@ void PressureDoor::playAgainstRobot() {
 	_playingAgainstRobot = true;
 }
 
-void PressureDoor::receiveNotification(Notification *notification, const tNotificationFlags flags) {
+void PressureDoor::receiveNotification(Notification *notification, const NotificationFlags flags) {
 	Neighborhood *owner = getOwner();
 
 	if (notification == _neighborhoodNotification) {
@@ -443,7 +442,7 @@ void PressureDoor::activateHotspots() {
 }
 
 void PressureDoor::clickInHotspot(const Input &input, const Hotspot *spot) {
-	tHotSpotID id = spot->getObjectID();
+	HotSpotID id = spot->getObjectID();
 
 	if (id == _upHotspotID || id == _downHotspotID) {
 		if (id == _upHotspotID)
@@ -457,7 +456,7 @@ void PressureDoor::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void PressureDoor::incrementPressure(const tHotSpotID id) {
+void PressureDoor::incrementPressure(const HotSpotID id) {
 	_typeMovie.stop();
 	_typeMovie.setSegment(0, _typeMovie.getDuration());
 	_typeMovie.setFlags(0);
diff --git a/engines/pegasus/neighborhood/norad/pressuredoor.h b/engines/pegasus/neighborhood/norad/pressuredoor.h
index 94868bdd8c..5ae8c9b53a 100755
--- a/engines/pegasus/neighborhood/norad/pressuredoor.h
+++ b/engines/pegasus/neighborhood/norad/pressuredoor.h
@@ -37,12 +37,12 @@ const short kNormalSubRoomPressure = 2;
 
 class PressureDoor : public GameInteraction, public NotificationReceiver {
 public:
-	PressureDoor(Neighborhood *, bool isUpperDoor, const tHotSpotID, const tHotSpotID,
-			const tHotSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut,
+	PressureDoor(Neighborhood *, bool isUpperDoor, const HotSpotID, const HotSpotID,
+			const HotSpotID, TimeValue pressureSoundIn, TimeValue pressureSoundOut,
 			TimeValue equalizeSoundIn, TimeValue equalizeSoundOut);
 	virtual ~PressureDoor() {}
 
-	void incrementPressure(const tHotSpotID);
+	void incrementPressure(const HotSpotID);
 	void stopChangingPressure();
 
 	void playAgainstRobot();
@@ -58,7 +58,7 @@ protected:
 	virtual void activateHotspots();
 	virtual void clickInHotspot(const Input &, const Hotspot *);
 
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 
 	Movie _levelsMovie;
 	TimeScale _levelsScale;
@@ -70,9 +70,9 @@ protected:
 	NotificationCallBack _pressureCallBack;
 	Notification *_neighborhoodNotification;
 	int _gameState;
-	tHotSpotID _upHotspotID;
-	tHotSpotID _downHotspotID;
-	tHotSpotID _outHotspotID;
+	HotSpotID _upHotspotID;
+	HotSpotID _downHotspotID;
+	HotSpotID _outHotspotID;
 	PressureTracker _doorTracker;
 	TimeValue _pressureSoundIn;
 	TimeValue _pressureSoundOut;
diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
index 0515f967e8..476dd92a61 100755
--- a/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
+++ b/engines/pegasus/neighborhood/norad/subcontrolroom.cpp
@@ -141,15 +141,15 @@ const TimeValue kDeltaLaunchPrepStop = 30;
 
 // Right monitor times.
 
-const tNotificationFlags kAlphaSplashFinished = 1;
-const tNotificationFlags kAlphaPrepFinished = kAlphaSplashFinished << 1;
-const tNotificationFlags kPrepHighlightFinished = kAlphaPrepFinished << 1;
-const tNotificationFlags kClawHighlightFinished = kPrepHighlightFinished << 1;
-const tNotificationFlags kClawMenuFinished = kClawHighlightFinished << 1;
-const tNotificationFlags kDeltaSplashFinished = kClawMenuFinished << 1;
-const tNotificationFlags kDeltaPrepFinished = kDeltaSplashFinished << 1;
-
-const tNotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished |
+const NotificationFlags kAlphaSplashFinished = 1;
+const NotificationFlags kAlphaPrepFinished = kAlphaSplashFinished << 1;
+const NotificationFlags kPrepHighlightFinished = kAlphaPrepFinished << 1;
+const NotificationFlags kClawHighlightFinished = kPrepHighlightFinished << 1;
+const NotificationFlags kClawMenuFinished = kClawHighlightFinished << 1;
+const NotificationFlags kDeltaSplashFinished = kClawMenuFinished << 1;
+const NotificationFlags kDeltaPrepFinished = kDeltaSplashFinished << 1;
+
+const NotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished |
 														kAlphaPrepFinished |
 														kPrepHighlightFinished |
 														kClawHighlightFinished |
@@ -157,9 +157,9 @@ const tNotificationFlags kSubControlNotificationFlags = kAlphaSplashFinished |
 														kDeltaSplashFinished |
 														kDeltaPrepFinished;
 
-const tNotificationFlags kOneSecondOfMoveFinished = 1;
+const NotificationFlags kOneSecondOfMoveFinished = 1;
 
-const tNotificationFlags kGreenBallNotificationFlags = kOneSecondOfMoveFinished;
+const NotificationFlags kGreenBallNotificationFlags = kOneSecondOfMoveFinished;
 
 enum {
 	kButtonDimFrame,
@@ -414,10 +414,9 @@ enum {
 	kRobotWon
 };
 
-//	Sub Control Room button PICTs:
-
-const tResIDType kSubControlButtonBaseID = 500;
-const tResIDType kClawMonitorGreenBallBaseID = 600;
+// Sub Control Room button PICTs:
+const ResIDType kSubControlButtonBaseID = 500;
+const ResIDType kClawMonitorGreenBallBaseID = 600;
 
 // Constructor
 SubControlRoom::SubControlRoom(Neighborhood *handler) : GameInteraction(kNoradSubControlRoomInteractionID, handler),
@@ -558,7 +557,7 @@ void SubControlRoom::setSoundFXLevel(const uint16 fxLevel) {
 	_subControlMovie.setVolume(fxLevel);
 }
 
-void SubControlRoom::receiveNotification(Notification *notification, const tNotificationFlags flags) {	
+void SubControlRoom::receiveNotification(Notification *notification, const NotificationFlags flags) {	
 	Norad *owner = (Norad *)getOwner();
 
 	if (notification == &_subControlNotification) {
@@ -780,7 +779,7 @@ void SubControlRoom::hideButtons() {
 		_buttons[i]->hide();
 }
 
-int SubControlRoom::findActionIndex(tHotSpotID id) {	
+int SubControlRoom::findActionIndex(HotSpotID id) {	
 	for (int i = 0; i < kNumClawButtons; i++)
 		if (id == _clawButtonSpotIDs[i])
 			return i;
@@ -789,7 +788,7 @@ int SubControlRoom::findActionIndex(tHotSpotID id) {
 }
 
 void SubControlRoom::clickInHotspot(const Input &input, const Hotspot *spot) {
-	tHotSpotID clickedID = spot->getObjectID();
+	HotSpotID clickedID = spot->getObjectID();
 	int actionIndex = findActionIndex(clickedID);
 
 	if (actionIndex != kNoActionIndex) {
@@ -934,7 +933,7 @@ void SubControlRoom::setControlMonitorToTime(const TimeValue newTime, const int
 	allowInput(shouldAllowInput);
 }
 
-void SubControlRoom::playControlMonitorSection(const TimeValue in, const TimeValue out, const tNotificationFlags flags,
+void SubControlRoom::playControlMonitorSection(const TimeValue in, const TimeValue out, const NotificationFlags flags,
 		const int newState, const bool shouldAllowInput) {	
 	_subControlMovie.stop();
 	_subControlMovie.setSegment(in, out);
@@ -974,7 +973,7 @@ void SubControlRoom::setClawMonitorToTime(const TimeValue newTime) {
 	_clawMonitorMovie.redrawMovieWorld();
 }
 
-void SubControlRoom::playClawMonitorSection(const TimeValue in, const TimeValue out, const tNotificationFlags flags,
+void SubControlRoom::playClawMonitorSection(const TimeValue in, const TimeValue out, const NotificationFlags flags,
 		const int newState, const bool shouldAllowInput) {	
 	_clawMonitorMovie.stop();
 	_clawMonitorMovie.setSegment(in, out);
@@ -1168,7 +1167,7 @@ void SubControlRoom::doSolve() {
 	getOwner()->startExtraSequence(kN60ArmGrabsRobot, kExtraCompletedFlag, kFilterAllInput);
 }
 
-tInputBits SubControlRoom::getInputFilter() {
+InputBits SubControlRoom::getInputFilter() {
 	if (_playingAgainstRobot)
 		return GameInteraction::getInputFilter() & ~kFilterDownButtonAny;
 
diff --git a/engines/pegasus/neighborhood/norad/subcontrolroom.h b/engines/pegasus/neighborhood/norad/subcontrolroom.h
index deea5042d0..e7ee84929a 100755
--- a/engines/pegasus/neighborhood/norad/subcontrolroom.h
+++ b/engines/pegasus/neighborhood/norad/subcontrolroom.h
@@ -60,12 +60,12 @@ protected:
 	virtual void activateHotspots();
 	virtual void clickInHotspot(const Input &, const Hotspot *);
 
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 
 	void robotKillsPlayer(const uint32, Neighborhood *);
-	tInputBits getInputFilter();
+	InputBits getInputFilter();
 
-	int findActionIndex(tHotSpotID);
+	int findActionIndex(HotSpotID);
 	void dispatchClawAction(const int);
 	void performActionImmediately(const int, const uint32, Neighborhood *);
 
@@ -80,12 +80,12 @@ protected:
 	void moveGreenBallToD();
 
 	void setControlMonitorToTime(const TimeValue, const int, const bool);
-	void playControlMonitorSection(const TimeValue, const TimeValue, const tNotificationFlags,
+	void playControlMonitorSection(const TimeValue, const TimeValue, const NotificationFlags,
 			const int, const bool);
 	
 	void updateClawMonitor();
 	void setClawMonitorToTime(const TimeValue);
-	void playClawMonitorSection(const TimeValue, const TimeValue, const tNotificationFlags,
+	void playClawMonitorSection(const TimeValue, const TimeValue, const NotificationFlags,
 			const int, const bool);
 	
 	Movie _subControlMovie;
@@ -117,10 +117,10 @@ protected:
 	Notification _greenBallNotification;
 	NotificationCallBack _greenBallCallBack;
 
-	tHotSpotID _outSpotID;
-	tHotSpotID _prepSpotID;
-	tHotSpotID _clawControlSpotID;
-	tHotSpotID _clawButtonSpotIDs[kNumClawButtons];
+	HotSpotID _outSpotID;
+	HotSpotID _prepSpotID;
+	HotSpotID _clawControlSpotID;
+	HotSpotID _clawButtonSpotIDs[kNumClawButtons];
 
 	Notification *_neighborhoodNotification;
 
diff --git a/engines/pegasus/neighborhood/norad/subplatform.cpp b/engines/pegasus/neighborhood/norad/subplatform.cpp
index dd2058c3d9..7f1df535b5 100755
--- a/engines/pegasus/neighborhood/norad/subplatform.cpp
+++ b/engines/pegasus/neighborhood/norad/subplatform.cpp
@@ -47,12 +47,12 @@ const TimeValue kPrepIncompleteStop = 19;
 const TimeValue kDamagedStart = 19;
 const TimeValue kDamagedStop = 28;
 
-const tNotificationFlags kNormalSplashFinished = 1;
-const tNotificationFlags kPrepSubFinished = kNormalSplashFinished << 1;
-const tNotificationFlags kPrepIncompleteFinished = kPrepSubFinished << 1;
-const tNotificationFlags kDamagedFinished = kPrepIncompleteFinished << 1;
+const NotificationFlags kNormalSplashFinished = 1;
+const NotificationFlags kPrepSubFinished = kNormalSplashFinished << 1;
+const NotificationFlags kPrepIncompleteFinished = kPrepSubFinished << 1;
+const NotificationFlags kDamagedFinished = kPrepIncompleteFinished << 1;
 
-const tNotificationFlags kPlatformNotificationFlags = kNormalSplashFinished |
+const NotificationFlags kPlatformNotificationFlags = kNormalSplashFinished |
 														kPrepSubFinished |
 														kPrepIncompleteFinished |
 														kDamagedFinished;
@@ -99,7 +99,7 @@ void SubPlatform::setSoundFXLevel(const uint16 fxLevel) {
 	_platformMovie.setVolume(fxLevel);
 }
 
-void SubPlatform::receiveNotification(Notification *notification, const tNotificationFlags flags) {
+void SubPlatform::receiveNotification(Notification *notification, const NotificationFlags flags) {
 	FaderMoveSpec loop1Spec, loop2Spec;
 	ExtraTable::Entry entry;
 
diff --git a/engines/pegasus/neighborhood/norad/subplatform.h b/engines/pegasus/neighborhood/norad/subplatform.h
index ae35cceb8f..a83487db23 100755
--- a/engines/pegasus/neighborhood/norad/subplatform.h
+++ b/engines/pegasus/neighborhood/norad/subplatform.h
@@ -48,7 +48,7 @@ protected:
 	virtual void activateHotspots();
 	virtual void clickInHotspot(const Input &, const Hotspot *);
 	
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 	
 	Movie _platformMovie;
 	TimeScale _platformScale;
diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
index 50b6d87e90..b67d31ad95 100755
--- a/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
+++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.cpp
@@ -168,7 +168,7 @@ void Prehistoric::setUpAIRules() {
 	}
 }
 
-TimeValue Prehistoric::getViewTime(const tRoomID room, const tDirectionConstant direction) {
+TimeValue Prehistoric::getViewTime(const RoomID room, const DirectionConstant direction) {
 	ExtraTable::Entry extra;
 	uint32 extraID = 0xffffffff;
 
@@ -197,7 +197,7 @@ TimeValue Prehistoric::getViewTime(const tRoomID room, const tDirectionConstant
 }
 
 
-void Prehistoric::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &entry) {
+void Prehistoric::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &entry) {
 	Neighborhood::findSpotEntry(room, direction, flags, entry);
 
 	switch (MakeRoomView(room, direction)) {
@@ -220,7 +220,7 @@ void Prehistoric::findSpotEntry(const tRoomID room, const tDirectionConstant dir
 	}
 }
 
-int16 Prehistoric::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) {
+int16 Prehistoric::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) {
 	if (room == kPrehistoricDeath)
 		return g_compass->getFaderValue();
 
@@ -260,7 +260,7 @@ void Prehistoric::getExitCompassMove(const ExitTable::Entry &exitEntry, FaderMov
 	}
 }
 
-void Prehistoric::turnTo(const tDirectionConstant newDirection) {
+void Prehistoric::turnTo(const DirectionConstant newDirection) {
 	setCurrentAlternate(kAltPrehistoricNormal);
 	_privateFlags.setFlag(kPrehistoricPrivateVaultOpenFlag, false);
 	Neighborhood::turnTo(newDirection);
@@ -308,7 +308,7 @@ void Prehistoric::zoomToVault() {
 		startExtraSequence(kPre18EastZoom, kExtraCompletedFlag, kFilterNoInput);
 }
 
-void Prehistoric::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) {
+void Prehistoric::checkContinuePoint(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kPrehistoric08, kEast):
 	case MakeRoomView(kPrehistoric18, kSouth):
@@ -320,7 +320,7 @@ void Prehistoric::checkContinuePoint(const tRoomID room, const tDirectionConstan
 	}
 }
 
-void Prehistoric::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void Prehistoric::arriveAt(const RoomID room, const DirectionConstant direction) {
 	Item *keyCard;
 	
 	if (MakeRoomView(room, direction) == MakeRoomView(kPrehistoric25, kEast) &&
@@ -397,7 +397,7 @@ void Prehistoric::arriveAt(const tRoomID room, const tDirectionConstant directio
 }
 
 void Prehistoric::loadAmbientLoops() {
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 	
 	switch (room) {
 	case kPrehistoric02:
@@ -518,7 +518,7 @@ void Prehistoric::clickInHotspot(const Input &input, const Hotspot *spot) {
 	}
 }
 
-void Prehistoric::receiveNotification(Notification *notification, const tNotificationFlags flags) {
+void Prehistoric::receiveNotification(Notification *notification, const NotificationFlags flags) {
 	Neighborhood::receiveNotification(notification, flags);
 
 	if ((flags & kExtraCompletedFlag) != 0) {
diff --git a/engines/pegasus/neighborhood/prehistoric/prehistoric.h b/engines/pegasus/neighborhood/prehistoric/prehistoric.h
index 44084f5110..786a7f7a61 100755
--- a/engines/pegasus/neighborhood/prehistoric/prehistoric.h
+++ b/engines/pegasus/neighborhood/prehistoric/prehistoric.h
@@ -36,67 +36,67 @@ const TimeScale kPrehistoricFrameDuration = 40;
 
 //	Alternate IDs.
 
-const tAlternateID kAltPrehistoricNormal = 0;
-const tAlternateID kAltPrehistoricBridgeSet = 1;
+const AlternateID kAltPrehistoricNormal = 0;
+const AlternateID kAltPrehistoricBridgeSet = 1;
 
 //	Room IDs.
 
-const tRoomID kPrehistoric01 = 0;
-const tRoomID kPrehistoric02 = 1;
-const tRoomID kPrehistoric03 = 2;
-const tRoomID kPrehistoric04 = 3;
-const tRoomID kPrehistoric05 = 4;
-const tRoomID kPrehistoric06 = 5;
-const tRoomID kPrehistoric07 = 6;
-const tRoomID kPrehistoric08 = 7;
-const tRoomID kPrehistoric09 = 8;
-const tRoomID kPrehistoric10 = 9;
-const tRoomID kPrehistoric11 = 10;
-const tRoomID kPrehistoric12 = 11;
-const tRoomID kPrehistoric13 = 12;
-const tRoomID kPrehistoric14 = 13;
-const tRoomID kPrehistoric15 = 14;
-const tRoomID kPrehistoric16 = 15;
-const tRoomID kPrehistoric17 = 16;
-const tRoomID kPrehistoric18 = 17;
-const tRoomID kPrehistoric19 = 18;
-const tRoomID kPrehistoric20 = 19;
-const tRoomID kPrehistoric21 = 20;
-const tRoomID kPrehistoric22 = 21;
-const tRoomID kPrehistoric22North = 22;
-const tRoomID kPrehistoric23 = 23;
-const tRoomID kPrehistoric24 = 24;
-const tRoomID kPrehistoric25 = 25;
-const tRoomID kPrehistoricDeath = 26;
+const RoomID kPrehistoric01 = 0;
+const RoomID kPrehistoric02 = 1;
+const RoomID kPrehistoric03 = 2;
+const RoomID kPrehistoric04 = 3;
+const RoomID kPrehistoric05 = 4;
+const RoomID kPrehistoric06 = 5;
+const RoomID kPrehistoric07 = 6;
+const RoomID kPrehistoric08 = 7;
+const RoomID kPrehistoric09 = 8;
+const RoomID kPrehistoric10 = 9;
+const RoomID kPrehistoric11 = 10;
+const RoomID kPrehistoric12 = 11;
+const RoomID kPrehistoric13 = 12;
+const RoomID kPrehistoric14 = 13;
+const RoomID kPrehistoric15 = 14;
+const RoomID kPrehistoric16 = 15;
+const RoomID kPrehistoric17 = 16;
+const RoomID kPrehistoric18 = 17;
+const RoomID kPrehistoric19 = 18;
+const RoomID kPrehistoric20 = 19;
+const RoomID kPrehistoric21 = 20;
+const RoomID kPrehistoric22 = 21;
+const RoomID kPrehistoric22North = 22;
+const RoomID kPrehistoric23 = 23;
+const RoomID kPrehistoric24 = 24;
+const RoomID kPrehistoric25 = 25;
+const RoomID kPrehistoricDeath = 26;
 
 //	Hot Spot Activation IDs.
 
-const tHotSpotActivationID kActivationVaultClosed = 1;
-const tHotSpotActivationID kActivationVaultOpen = 2;
+const HotSpotActivationID kActivationVaultClosed = 1;
+const HotSpotActivationID kActivationVaultOpen = 2;
 
 //	Hot Spot IDs.
 
-const tHotSpotID kPre18EastSpotID = 5000;
-const tHotSpotID kPre22NorthSpotID = 5001;
-const tHotSpotID kPre22NorthOutSpotID = 5002;
-const tHotSpotID kPre22NorthBreakerSpotID = 5003;
-const tHotSpotID kPrehistoricKeyDropSpotID = 5004;
-const tHotSpotID kPrehistoricHistoricalLogSpotID = 5005;
+const HotSpotID kPre18EastSpotID = 5000;
+const HotSpotID kPre22NorthSpotID = 5001;
+const HotSpotID kPre22NorthOutSpotID = 5002;
+const HotSpotID kPre22NorthBreakerSpotID = 5003;
+const HotSpotID kPrehistoricKeyDropSpotID = 5004;
+const HotSpotID kPrehistoricHistoricalLogSpotID = 5005;
 
 //	Extra sequence IDs.
 
-const tExtraID kPreArrivalFromTSA = 0;
-const tExtraID kPre18EastBridgeOut = 1;
-const tExtraID kPre18EastBridgeOn = 2;
-const tExtraID kPre18EastZoom = 3;
-const tExtraID kPre18EastZoomOut = 4;
-const tExtraID kPre22ThrowBreaker = 5;
-const tExtraID kPre25EastUnlockingVaultWithLog = 6;
-const tExtraID kPre25EastVaultOpenWithLog = 7;
-const tExtraID kPre25EastViewWithLog = 8;
-const tExtraID kPre25EastUnlockingVaultNoLog = 9;
-const tExtraID kPre25EastVaultOpenNoLog = 10;
-const tExtraID kPre25EastViewNoLog = 11;
+const ExtraID kPreArrivalFromTSA = 0;
+const ExtraID kPre18EastBridgeOut = 1;
+const ExtraID kPre18EastBridgeOn = 2;
+const ExtraID kPre18EastZoom = 3;
+const ExtraID kPre18EastZoomOut = 4;
+const ExtraID kPre22ThrowBreaker = 5;
+const ExtraID kPre25EastUnlockingVaultWithLog = 6;
+const ExtraID kPre25EastVaultOpenWithLog = 7;
+const ExtraID kPre25EastViewWithLog = 8;
+const ExtraID kPre25EastUnlockingVaultNoLog = 9;
+const ExtraID kPre25EastVaultOpenNoLog = 10;
+const ExtraID kPre25EastViewNoLog = 11;
 
 class PegasusEngine;
 
@@ -108,7 +108,7 @@ public:
 	virtual uint16 getDateResID() const;
 	virtual void init();
 	
-	virtual void arriveAt(const tRoomID, const tDirectionConstant);
+	virtual void arriveAt(const RoomID, const DirectionConstant);
 	virtual void activateHotspots();
 	virtual void clickInHotspot(const Input &, const Hotspot *);
 	Common::String getBriefingMovie();
@@ -124,7 +124,7 @@ public:
 
 	void bumpIntoWall();
 
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 
 	bool canSolve();
 	void doSolve();
@@ -137,13 +137,13 @@ protected:
 	};
 
 	void setUpAIRules();
-	int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant);
+	int16 getStaticCompassAngle(const RoomID, const DirectionConstant);
 	void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &);
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
-	void turnTo(const tDirectionConstant);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
+	void turnTo(const DirectionConstant);
 	void zoomToVault();
-	TimeValue getViewTime(const tRoomID, const tDirectionConstant);
-	void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &);
+	TimeValue getViewTime(const RoomID, const DirectionConstant);
+	void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &);
 
 	void loadAmbientLoops();
 	
diff --git a/engines/pegasus/neighborhood/spot.cpp b/engines/pegasus/neighborhood/spot.cpp
index 9ccdfd2de6..00c471ed61 100755
--- a/engines/pegasus/neighborhood/spot.cpp
+++ b/engines/pegasus/neighborhood/spot.cpp
@@ -59,7 +59,7 @@ void SpotTable::clear() {
 //		In addition to having their rooms, directions and alt codes identical...
 //		They are both either loops or once only animations AND
 //		They overlap in at least one of the on arrival, on turn and on door open bits.
-SpotTable::Entry SpotTable::findEntry(tRoomID room, tDirectionConstant direction, tSpotFlags srcFlags, tAlternateID altCode) {
+SpotTable::Entry SpotTable::findEntry(RoomID room, DirectionConstant direction, SpotFlags srcFlags, AlternateID altCode) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].altCode == altCode && (_entries[i].srcFlags & kSpotLoopsMask) == (srcFlags & kSpotLoopsMask) && ((_entries[i].srcFlags & srcFlags) & kSpotTriggers) != 0)
 			return _entries[i];
diff --git a/engines/pegasus/neighborhood/spot.h b/engines/pegasus/neighborhood/spot.h
index 1d5d296f9b..086f1b2a2f 100755
--- a/engines/pegasus/neighborhood/spot.h
+++ b/engines/pegasus/neighborhood/spot.h
@@ -37,7 +37,7 @@ namespace Common {
 
 namespace Pegasus {
 
-typedef byte tSpotFlags;
+typedef byte SpotFlags;
 
 enum {
 	kSpotLoopsBit,			//	Loop or once only?
@@ -46,13 +46,13 @@ enum {
 	kSpotOnDoorOpenBit
 };
 
-static const tSpotFlags kNoSpotFlags = 0;
-static const tSpotFlags kSpotLoopsMask = 1 << kSpotLoopsBit;
-static const tSpotFlags kSpotOnArrivalMask = 1 << kSpotOnArrivalBit;
-static const tSpotFlags kSpotOnTurnMask = 1 << kSpotOnTurnBit;
-static const tSpotFlags kSpotOnDoorOpenMask = 1 << kSpotOnDoorOpenBit;
+static const SpotFlags kNoSpotFlags = 0;
+static const SpotFlags kSpotLoopsMask = 1 << kSpotLoopsBit;
+static const SpotFlags kSpotOnArrivalMask = 1 << kSpotOnArrivalBit;
+static const SpotFlags kSpotOnTurnMask = 1 << kSpotOnTurnBit;
+static const SpotFlags kSpotOnDoorOpenMask = 1 << kSpotOnDoorOpenBit;
 
-static const tSpotFlags kSpotTriggers = kSpotOnArrivalMask | kSpotOnTurnMask | kSpotOnDoorOpenMask;
+static const SpotFlags kSpotTriggers = kSpotOnArrivalMask | kSpotOnTurnMask | kSpotOnDoorOpenMask;
 
 class SpotTable {
 public:
@@ -77,16 +77,16 @@ public:
 			dstFlags = kNoSpotFlags;
 		}
 
-		tRoomID room;
-		tDirectionConstant direction;
-		tSpotFlags srcFlags;
-		tAlternateID altCode;
+		RoomID room;
+		DirectionConstant direction;
+		SpotFlags srcFlags;
+		AlternateID altCode;
 		TimeValue movieStart;
 		TimeValue movieEnd;
-		tSpotFlags dstFlags;
+		SpotFlags dstFlags;
 	};
 
-	Entry findEntry(tRoomID room, tDirectionConstant direction, tSpotFlags srcFlags, tAlternateID altCode);
+	Entry findEntry(RoomID room, DirectionConstant direction, SpotFlags srcFlags, AlternateID altCode);
 
 private:
 	Common::Array<Entry> _entries;
diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
index 3884f0f246..5ee8fe4e44 100755
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -41,35 +41,35 @@ namespace Pegasus {
 
 // TSA PICTs:
 
-const tResIDType kTBPCloseBoxPICTID = 800;
-const tResIDType kTBPRewindPICTID = 801;
-const tResIDType kUnresolvedPICTID = 802;
-const tResIDType kResolvedPICTID = 803;
-const tResIDType kJumpMenuPICTID = 804;
-const tResIDType kJumpMenuHilitedPICTID = 805;
-const tResIDType kExitPICTID = 806;
-const tResIDType kExitHilitedPICTID = 807;
-const tResIDType kLeftRipPICTID = 808;
-const tResIDType kComparisonCloseBoxPICTID = 809;
-const tResIDType kComparisonLeftRewindPICTID = 810;
-const tResIDType kComparisonRightRewindPICTID = 811;
-const tResIDType kComparisonHiliteNoradPICTID = 812;
-const tResIDType kComparisonHiliteMarsPICTID = 813;
-const tResIDType kComparisonHiliteCaldoriaPICTID = 814;
-const tResIDType kComparisonHiliteWSCPICTID = 815;
-const tResIDType kComparisonChancesNoradPICTID = 816;
-const tResIDType kComparisonChancesMarsPICTID = 817;
-const tResIDType kComparisonChancesCaldoriaPICTID = 818;
-const tResIDType kComparisonChancesWSCPICTID = 819;
-const tResIDType kRedirectionCCRolloverPICTID = 820;
-const tResIDType kRedirectionRRRolloverPICTID = 821;
-const tResIDType kRedirectionFDRolloverPICTID = 822;
-const tResIDType kRedirectionCCDoorPICTID = 823;
-const tResIDType kRedirectionRRDoorPICTID = 824;
-const tResIDType kRedirectionFDDoorPICTID = 825;
-const tResIDType kRedirectionSecuredPICTID = 826;
-const tResIDType kRedirectionNewTargetPICTID = 827;
-const tResIDType kRedirectionClosePICTID = 828;
+const ResIDType kTBPCloseBoxPICTID = 800;
+const ResIDType kTBPRewindPICTID = 801;
+const ResIDType kUnresolvedPICTID = 802;
+const ResIDType kResolvedPICTID = 803;
+const ResIDType kJumpMenuPICTID = 804;
+const ResIDType kJumpMenuHilitedPICTID = 805;
+const ResIDType kExitPICTID = 806;
+const ResIDType kExitHilitedPICTID = 807;
+const ResIDType kLeftRipPICTID = 808;
+const ResIDType kComparisonCloseBoxPICTID = 809;
+const ResIDType kComparisonLeftRewindPICTID = 810;
+const ResIDType kComparisonRightRewindPICTID = 811;
+const ResIDType kComparisonHiliteNoradPICTID = 812;
+const ResIDType kComparisonHiliteMarsPICTID = 813;
+const ResIDType kComparisonHiliteCaldoriaPICTID = 814;
+const ResIDType kComparisonHiliteWSCPICTID = 815;
+const ResIDType kComparisonChancesNoradPICTID = 816;
+const ResIDType kComparisonChancesMarsPICTID = 817;
+const ResIDType kComparisonChancesCaldoriaPICTID = 818;
+const ResIDType kComparisonChancesWSCPICTID = 819;
+const ResIDType kRedirectionCCRolloverPICTID = 820;
+const ResIDType kRedirectionRRRolloverPICTID = 821;
+const ResIDType kRedirectionFDRolloverPICTID = 822;
+const ResIDType kRedirectionCCDoorPICTID = 823;
+const ResIDType kRedirectionRRDoorPICTID = 824;
+const ResIDType kRedirectionFDDoorPICTID = 825;
+const ResIDType kRedirectionSecuredPICTID = 826;
+const ResIDType kRedirectionNewTargetPICTID = 827;
+const ResIDType kRedirectionClosePICTID = 828;
 
 const short kCompassShift = 15;
 
@@ -77,428 +77,423 @@ const TimeScale kFullTSAMovieScale = 600;
 const TimeScale kFullTSAFramesPerSecond = 15;
 const TimeScale kFullTSAFrameDuration = 40;
 
-//	Alternate IDs.
-
-const tAlternateID kAltTSANormal = 0;
-const tAlternateID kAltTSARobotsAtReadyRoom = 1;
-const tAlternateID kAltTSARobotsAtFrontDoor = 2;
-const tAlternateID kAltTSARedAlert = 3;
-
-//	Room IDs.
-
-const tRoomID kTSA01 = 1;
-const tRoomID kTSA02 = 2;
-const tRoomID kTSA03 = 3;
-const tRoomID kTSA04 = 4;
-const tRoomID kTSA05 = 5;
-const tRoomID kTSA0A = 6;
-const tRoomID kTSA06 = 7;
-const tRoomID kTSA07 = 8;
-const tRoomID kTSA08 = 9;
-const tRoomID kTSA09 = 10;
-const tRoomID kTSA10 = 11;
-const tRoomID kTSA11 = 12;
-const tRoomID kTSA12 = 13;
-const tRoomID kTSA13 = 14;
-const tRoomID kTSA14 = 15;
-const tRoomID kTSA15 = 16;
-const tRoomID kTSA16 = 17;
-const tRoomID kTSA17 = 18;
-const tRoomID kTSA18 = 19;
-const tRoomID kTSA19 = 20;
-const tRoomID kTSA0B = 21;
-const tRoomID kTSA21Cyan = 22;
-const tRoomID kTSA22Cyan = 23;
-const tRoomID kTSA23Cyan = 24;
-const tRoomID kTSA24Cyan = 25;
-const tRoomID kTSA25Cyan = 26;
-const tRoomID kTSA21Red = 27;
-const tRoomID kTSA23Red = 29;
-const tRoomID kTSA24Red = 30;
-const tRoomID kTSA25Red = 31;
-const tRoomID kTSA26 = 32;
-const tRoomID kTSA27 = 33;
-const tRoomID kTSA28 = 34;
-const tRoomID kTSA29 = 35;
-const tRoomID kTSA30 = 36;
-const tRoomID kTSA31 = 37;
-const tRoomID kTSA32 = 38;
-const tRoomID kTSA33 = 39;
-const tRoomID kTSA34 = 40;
-const tRoomID kTSA35 = 41;
-const tRoomID kTSADeathRoom = 43;
-
-//	Hot Spot Activation IDs.
-
-const tHotSpotActivationID kActivateTSAReadyForCard = 1;
-const tHotSpotActivationID kActivateTSAReadyToTransport = 2;
-const tHotSpotActivationID kActivateTSARobotsAwake = 3;
-const tHotSpotActivationID kActivateTSA0BZoomedOut = 4;
-const tHotSpotActivationID kActivateTSA0BZoomedIn = 5;
-const tHotSpotActivationID kActivateTSA0BComparisonVideo = 6;
-const tHotSpotActivationID kActivationLogReaderOpen = 7;
-const tHotSpotActivationID kActivateTSA0BTBPVideo = 8;
-const tHotSpotActivationID kActivationDoesntHaveKey = 9;
-const tHotSpotActivationID kActivationKeyVaultOpen = 10;
-const tHotSpotActivationID kActivationDoesntHaveChips = 11;
-const tHotSpotActivationID kActivationChipVaultOpen = 12;
-const tHotSpotActivationID kActivationJumpToPrehistoric = 13;
-const tHotSpotActivationID kActivationJumpToNorad = 14;
-const tHotSpotActivationID kActivationJumpToMars = 15;
-const tHotSpotActivationID kActivationJumpToWSC = 16;
-const tHotSpotActivationID kActivationReadyToExit = 17;
-const tHotSpotActivationID kActivationReadyForJumpMenu = 18;
-const tHotSpotActivationID kActivationMainJumpMenu = 19;
-
-//	Hot Spot IDs.
-
-const tHotSpotID kTSAGTCardDropSpotID = 5000;
-const tHotSpotID kTSAGTTokyoSpotID = 5001;
-const tHotSpotID kTSAGTCaldoriaSpotID = 5002;
-const tHotSpotID kTSAGTBeachSpotID = 5003;
-const tHotSpotID kTSAGTOtherSpotID = 5004;
-const tHotSpotID kTSA02DoorSpotID = 5005;
-const tHotSpotID kTSA03EastJimenezSpotID = 5006;
-const tHotSpotID kTSA03WestCrenshawSpotID = 5007;
-const tHotSpotID kTSA04EastMatsumotoSpotID = 5008;
-const tHotSpotID kTSA04WestCastilleSpotID = 5009;
-const tHotSpotID kTSA05EastSinclairSpotID = 5010;
-const tHotSpotID kTSA05WestWhiteSpotID = 5011;
-const tHotSpotID kTSA0AEastSpotID = 5012;
-const tHotSpotID kTSA0AWastSpotID = 5013;
-const tHotSpotID kTSA0BEastMonitorSpotID = 5014;
-const tHotSpotID kTSA0BEastMonitorOutSpotID = 5015;
-const tHotSpotID kTSA0BEastCompareNoradSpotID = 5016;
-const tHotSpotID kTSA0BEastCompareMarsSpotID = 5017;
-const tHotSpotID kTSA0BEastCompareCaldoriaSpotID = 5018;
-const tHotSpotID kTSA0BEastCompareWSCSpotID = 5019;
-const tHotSpotID kTSA0BEastLeftRewindSpotID = 5020;
-const tHotSpotID kTSA0BEastLeftPlaySpotID = 5021;
-const tHotSpotID kTSA0BEastRightRewindSpotID = 5022;
-const tHotSpotID kTSA0BEastRightPlaySpotID = 5023;
-const tHotSpotID kTSA0BEastCloseVideoSpotID = 5024;
-const tHotSpotID kTSA0BNorthMonitorSpotID = 5025;
-const tHotSpotID kTSA0BNorthMonitorOutSpotID = 5026;
-const tHotSpotID kTSA0BNorthHistLogSpotID = 5027;
-const tHotSpotID kTSA0BNorthRobotsToCommandCenterSpotID = 5028;
-const tHotSpotID kTSA0BNorthRobotsToReadyRoomSpotID = 5029;
-const tHotSpotID kTSA0BNorthRobotsToFrontDoorSpotID = 5030;
-const tHotSpotID kTSA0BWestMonitorSpotID = 5031;
-const tHotSpotID kTSA0BWestMonitorOutSpotID = 5032;
-const tHotSpotID kTSA0BWestTheorySpotID = 5033;
-const tHotSpotID kTSA0BWestBackgroundSpotID = 5034;
-const tHotSpotID kTSA0BWestProcedureSpotID = 5035;
-const tHotSpotID kTSA0BWestCloseVideoSpotID = 5036;
-const tHotSpotID kTSA0BWestPlayVideoSpotID = 5037;
-const tHotSpotID kTSA0BWestRewindVideoSpotID = 5038;
-const tHotSpotID kTSA22EastMonitorSpotID = 5039;
-const tHotSpotID kTSA22EastKeySpotID = 5040;
-const tHotSpotID kTSA23WestMonitorSpotID = 5041;
-const tHotSpotID kTSA23WestChipsSpotID = 5042;
-const tHotSpotID kTSA34NorthDoorSpotID = 5043;
-const tHotSpotID kTSA37NorthJumpToPrehistoricSpotID = 5044;
-const tHotSpotID kTSA37NorthJumpToNoradSpotID = 5045;
-const tHotSpotID kTSA37NorthCancelNoradSpotID = 5046;
-const tHotSpotID kTSA37NorthJumpToMarsSpotID = 5047;
-const tHotSpotID kTSA37NorthCancelMarsSpotID = 5048;
-const tHotSpotID kTSA37NorthJumpToWSCSpotID = 5049;
-const tHotSpotID kTSA37NorthCancelWSCSpotID = 5050;
-const tHotSpotID kTSA37NorthExitSpotID = 5051;
-const tHotSpotID kTSA37NorthJumpMenuSpotID = 5052;
-const tHotSpotID kTSA37NorthNoradMenuSpotID = 5053;
-const tHotSpotID kTSA37NorthMarsMenuSpotID = 5054;
-const tHotSpotID kTSA37NorthWSCMenuSpotID = 5055;
-
-//	Extra sequence IDs.
-
-const tExtraID kTSATransporterArrowLoop = 0;
-const tExtraID kTSAArriveFromCaldoria = 1;
-const tExtraID kTSAGTOtherChoice = 2;
-const tExtraID kTSAGTCardSwipe = 3;
-const tExtraID kTSAGTSelectCaldoria = 4;
-const tExtraID kTSAGTGoToCaldoria = 5;
-const tExtraID kTSAGTSelectBeach = 6;
-const tExtraID kTSAGTGoToBeach = 7;
-const tExtraID kTSAGTArriveAtBeach = 8;
-const tExtraID kTSAGTSelectTokyo = 9;
-const tExtraID kTSAGTGoToTokyo = 10;
-const tExtraID kTSAGTArriveAtTokyo = 11;
-const tExtraID kTSA02NorthZoomIn = 12;
-const tExtraID kTSA02NorthTenSecondDoor = 13;
-const tExtraID kTSA02NorthZoomOut = 14;
-const tExtraID kTSA02NorthDoorWithAgent3 = 15;
-const tExtraID kTSA03JimenezZoomIn = 16;
-const tExtraID kTSA03JimenezSpeech = 17;
-const tExtraID kTSA03JimenezZoomOut = 18;
-const tExtraID kTSA03CrenshawZoomIn = 19;
-const tExtraID kTSA03CrenshawSpeech = 20;
-const tExtraID kTSA03CrenshawZoomOut = 21;
-const tExtraID kTSA03SouthRobotDeath = 22;
-const tExtraID kTSA04NorthRobotGreeting = 23;
-const tExtraID kTSA04MatsumotoZoomIn = 24;
-const tExtraID kTSA04MatsumotoSpeech = 25;
-const tExtraID kTSA04MatsumotoZoomOut = 26;
-const tExtraID kTSA04CastilleZoomIn = 27;
-const tExtraID kTSA04CastilleSpeech = 28;
-const tExtraID kTSA04CastilleZoomOut = 29;
-const tExtraID kTSA05SinclairZoomIn = 30;
-const tExtraID kTSA05SinclairSpeech = 31;
-const tExtraID kTSA05SinclairZoomOut = 32;
-const tExtraID kTSA05WhiteZoomIn = 33;
-const tExtraID kTSA05WhiteSpeech = 34;
-const tExtraID kTSA05WhiteZoomOut = 35;
-const tExtraID kTSA0AEastRobot = 36;
-const tExtraID kTSA0AWestRobot = 37;
-const tExtraID kTSA16NorthRobotDeath = 38;
-const tExtraID kTSA0BEastZoomIn = 39;
-const tExtraID kTSA0BEastZoomedView = 40;
-const tExtraID kTSA0BEastZoomOut = 41;
-const tExtraID kTSA0BEastTurnLeft = 42;
-const tExtraID kTSA0BComparisonStartup = 43;
-const tExtraID kTSA0BComparisonView0000 = 44;
-const tExtraID kTSA0BComparisonView0002 = 45;
-const tExtraID kTSA0BComparisonView0020 = 46;
-const tExtraID kTSA0BComparisonView0022 = 47;
-const tExtraID kTSA0BComparisonView0200 = 48;
-const tExtraID kTSA0BComparisonView0202 = 49;
-const tExtraID kTSA0BComparisonView0220 = 50;
-const tExtraID kTSA0BComparisonView0222 = 51;
-const tExtraID kTSA0BComparisonView2000 = 52;
-const tExtraID kTSA0BComparisonView2002 = 53;
-const tExtraID kTSA0BComparisonView2020 = 54;
-const tExtraID kTSA0BComparisonView2022 = 55;
-const tExtraID kTSA0BComparisonView2200 = 56;
-const tExtraID kTSA0BComparisonView2202 = 57;
-const tExtraID kTSA0BComparisonView2220 = 58;
-const tExtraID kTSA0BComparisonView2222 = 59;
-const tExtraID kTSA0BNoradComparisonView = 60;
-const tExtraID kTSA0BNoradUnaltered = 61;
-const tExtraID kTSA0BNoradAltered = 62;
-const tExtraID kTSA0BMarsComparisonView = 63;
-const tExtraID kTSA0BMarsUnaltered = 64;
-const tExtraID kTSA0BMarsAltered = 65;
-const tExtraID kTSA0BWSCComparisonView = 66;
-const tExtraID kTSA0BWSCUnaltered = 67;
-const tExtraID kTSA0BWSCAltered = 68;
-const tExtraID kTSA0BCaldoriaComparisonView = 69;
-const tExtraID kTSA0BCaldoriaUnaltered = 70;
-const tExtraID kTSA0BCaldoriaAltered = 71;
-const tExtraID kTSA0BNorthZoomIn = 72;
-const tExtraID kTSA0BNorthZoomedView = 73;
-const tExtraID kTSA0BNorthZoomOut = 74;
-const tExtraID kTSA0BNorthTurnLeft = 75;
-const tExtraID kTSA0BNorthTurnRight = 76;
-const tExtraID kTSA0BNorthHistLogOpen = 77;
-const tExtraID kTSA0BNorthHistLogClose = 78;
-const tExtraID kTSA0BNorthHistLogCloseWithLog = 79;
-const tExtraID kTSA0BNorthCantChangeHistory = 80;
-const tExtraID kTSA0BNorthYoureBusted = 81;
-const tExtraID kTSA0BNorthFinallyHappened = 82;
-const tExtraID kTSA0BShowRip1 = 83;
-const tExtraID kTSA0BNorthRipView1 = 84;
-const tExtraID kTSA0BShowRip2 = 85;
-const tExtraID kTSA0BShowGuardRobots = 86;
-const tExtraID kTSA0BAIInterruption = 87;
-const tExtraID kTSA0BRobotsToCommandCenter = 88;
-const tExtraID kTSA0BNorthRobotsAtCCView = 89;
-const tExtraID kTSA0BNorthRobotsAtRRView = 90;
-const tExtraID kTSA0BNorthRobotsAtFDView = 91;
-const tExtraID kTSA0BRobotsFromCommandCenterToReadyRoom = 92;
-const tExtraID kTSA0BRobotsFromReadyRoomToCommandCenter = 93;
-const tExtraID kTSA0BRobotsFromCommandCenterToFrontDoor = 94;
-const tExtraID kTSA0BRobotsFromFrontDoorToCommandCenter = 95;
-const tExtraID kTSA0BRobotsFromFrontDoorToReadyRoom = 96;
-const tExtraID kTSA0BRobotsFromReadyRoomToFrontDoor = 97;
-const tExtraID kTSA0BWestZoomIn = 98;
-const tExtraID kTSA0BWestZoomedView = 99;
-const tExtraID kTSA0BWestZoomOut = 100;
-const tExtraID kTSA0BWestTurnRight = 101;
-const tExtraID kTSA0BTBPTheoryHighlight = 102;
-const tExtraID kTSA0BTBPBackgroundHighlight = 103;
-const tExtraID kTSA0BTBPProcedureHighlight = 104;
-const tExtraID kTSA0BTBPTheory = 105;
-const tExtraID kTSA0BTBPBackground = 106;
-const tExtraID kTSA0BTBPProcedure = 107;
-const tExtraID kTSA0BRipAlarmScreen = 108;
-const tExtraID kTSA22RedEastZoomInSequence = 109;
-const tExtraID kTSA22RedEastVaultViewWithKey = 110;
-const tExtraID kTSA22RedEastVaultViewNoKey = 111;
-const tExtraID kTSA23RedWestVaultZoomInSequence = 112;
-const tExtraID kTSA23RedWestVaultViewWithChips = 113;
-const tExtraID kTSA23RedWestVaultViewNoChips = 114;
-const tExtraID kTSA25NorthDeniedNoKey = 115;
-const tExtraID kTSA25NorthDeniedNoChip = 116;
-const tExtraID kTSA25NorthPutOnSuit = 117;
-const tExtraID kTSA25NorthAlreadyHaveSuit = 118;
-const tExtraID kTSA25NorthDescending1 = 119;
-const tExtraID kTSA25NorthDescending2 = 120;
-const tExtraID kTSA37HorseToAI1 = 121;
-const tExtraID kTSA37PegasusAI1 = 122;
-const tExtraID kTSA37AI1ToCommissioner1 = 123;
-const tExtraID kTSA37Commissioner1 = 124;
-const tExtraID kTSA37Commissioner1ToZoom = 125;
-const tExtraID kTSA37ZoomToPrehistoric = 126;
-const tExtraID kTSA37PrehistoricToAI2 = 127;
-const tExtraID kTSA37PegasusAI2 = 128;
-const tExtraID kTSA37AI2ToPrehistoric = 129;
-const tExtraID kTSA37PrehistoricToDepart = 130;
-const tExtraID kTSA37PegasusDepart = 131;
-const tExtraID kTSA37TimeJumpToPegasus = 132;
-const tExtraID kTSA37RecallToDownload = 133;
-const tExtraID kTSA37DownloadToColonel1 = 134;
-const tExtraID kTSA37Colonel1 = 135;
-const tExtraID kTSA37Colonel1ToReviewRequired = 136;
-const tExtraID kTSA37ReviewRequiredToExit = 137;
-const tExtraID kTSA37ExitHilited = 138;
-const tExtraID kTSA37ExitToHorse = 139;
-const tExtraID kTSA37HorseToColonel2 = 140;
-const tExtraID kTSA37Colonel2 = 141;
-const tExtraID kTSA37PegasusAI3 = 142;
-const tExtraID kTSA37AI3ToHorse = 143;
-const tExtraID kTSA37HorseToZoom = 144;
-const tExtraID kTSA37ZoomToMainMenu = 145;
-const tExtraID kTSA37MainMenuToAI4 = 146;
-const tExtraID kTSA37PegasusAI4 = 147;
-const tExtraID kTSA37AI4ToMainMenu = 148;
-const tExtraID kTSA37JumpMenu000 = 149;
-const tExtraID kTSA37JumpMenu001 = 150;
-const tExtraID kTSA37JumpMenu010 = 151;
-const tExtraID kTSA37JumpMenu011 = 152;
-const tExtraID kTSA37JumpMenu100 = 153;
-const tExtraID kTSA37JumpMenu101 = 154;
-const tExtraID kTSA37JumpMenu110 = 155;
-const tExtraID kTSA37JumpMenu111 = 156;
-const tExtraID kTSA37JumpToWSCMenu = 157;
-const tExtraID kTSA37CancelWSC = 158;
-const tExtraID kTSA37JumpToWSC = 159;
-const tExtraID kTSA37WSCToAI5 = 160;
-const tExtraID kTSA37PegasusAI5 = 161;
-const tExtraID kTSA37AI5ToWSC = 162;
-const tExtraID kTSA37WSCToDepart = 163;
-const tExtraID kTSA37JumpToMarsMenu = 164;
-const tExtraID kTSA37CancelMars = 165;
-const tExtraID kTSA37JumpToMars = 166;
-const tExtraID kTSA37MarsToAI6 = 167;
-const tExtraID kTSA37PegasusAI6 = 168;
-const tExtraID kTSA37AI6ToMars = 169;
-const tExtraID kTSA37MarsToDepart = 170;
-const tExtraID kTSA37JumpToNoradMenu = 171;
-const tExtraID kTSA37CancelNorad = 172;
-const tExtraID kTSA37JumpToNorad = 173;
-const tExtraID kTSA37NoradToAI7 = 174;
-const tExtraID kTSA37PegasusAI7 = 175;
-const tExtraID kTSA37AI7ToNorad = 176;
-const tExtraID kTSA37NoradToDepart = 177;
-const tExtraID kTSA37EnvironmentalScan = 178;
-const tExtraID kTSA37DownloadToMainMenu = 179;
-const tExtraID kTSA37DownloadToOpMemReview = 180;
-const tExtraID kTSA37OpMemReviewToMainMenu = 181;
-const tExtraID kTSA37OpMemReviewToAllClear = 182;
-const tExtraID kTSA37AllClearToCongratulations = 183;
-const tExtraID kTSA37Congratulations = 184;
-const tExtraID kTSA37CongratulationsToExit = 185;
-
-const tDisplayOrder kRipTimerOrder = kMonitorLayer;
-
-
-const tCoordType kUnresolvedLeft = kNavAreaLeft + 14;
-const tCoordType kUnresolvedTop = kNavAreaTop + 236;
-
-const tCoordType kResolvedLeft = kNavAreaLeft + 36;
-const tCoordType kResolvedTop = kNavAreaTop + 236;
-
-const tCoordType kJumpMenuLeft = kNavAreaLeft + 360;
-const tCoordType kJumpMenuTop = kNavAreaTop + 202;
-
-const tCoordType kJumpMenuHilitedLeft = kNavAreaLeft + 354;
-const tCoordType kJumpMenuHilitedTop = kNavAreaTop + 196;
-
-const tCoordType kExitLeft = kNavAreaLeft + 360;
-const tCoordType kExitTop = kNavAreaTop + 216;
-
-const tCoordType kExitHilitedLeft = kNavAreaLeft + 354;
-const tCoordType kExitHilitedTop = kNavAreaTop + 210;
-
-const tCoordType kRipTimerLeft = kNavAreaLeft + 95;
-const tCoordType kRipTimerTop = kNavAreaTop + 87;
-
-const tCoordType kTBPCloseLeft = kNavAreaLeft + 30;
-const tCoordType kTBPCloseTop = kNavAreaTop + 16;
-
-const tCoordType kTBPRewindLeft = kNavAreaLeft + 86;
-const tCoordType kTBPRewindTop = kNavAreaTop + 218;
-
-const tCoordType kComparisonCloseLeft = kNavAreaLeft + 50;
-const tCoordType kComparisonCloseTop = kNavAreaTop + 14;
-
-const tCoordType kComparisonLeftRewindLeft = kNavAreaLeft + 96;
-const tCoordType kComparisonLeftRewindTop = kNavAreaTop + 190;
-
-const tCoordType kComparisonRightRewindLeft = kNavAreaLeft + 282;
-const tCoordType kComparisonRightRewindTop = kNavAreaTop + 190;
-
-const tCoordType kComparisonHiliteSpriteLeft = kNavAreaLeft + 45;
-const tCoordType kComparisonHiliteSpriteTop = kNavAreaTop + 65;
-
-const tCoordType kComparisonHiliteNoradLeft = kNavAreaLeft + 45;
-const tCoordType kComparisonHiliteNoradTop = kNavAreaTop + 65;
-
-const tCoordType kComparisonHiliteMarsLeft = kNavAreaLeft + 45 + 4;
-const tCoordType kComparisonHiliteMarsTop = kNavAreaTop + 65 + 23;
-
-const tCoordType kComparisonHiliteCaldoriaLeft = kNavAreaLeft + 45 + 7;
-const tCoordType kComparisonHiliteCaldoriaTop = kNavAreaTop + 65 + 46;
-
-const tCoordType kComparisonHiliteWSCLeft = kNavAreaLeft + 45 + 11;
-const tCoordType kComparisonHiliteWSCTop = kNavAreaTop + 65 + 68;
-
-const tCoordType kComparisonChancesSpriteLeft = kNavAreaLeft + 148;
-const tCoordType kComparisonChancesSpriteTop = kNavAreaTop + 162;
+// Alternate IDs.
+const AlternateID kAltTSANormal = 0;
+const AlternateID kAltTSARobotsAtReadyRoom = 1;
+const AlternateID kAltTSARobotsAtFrontDoor = 2;
+const AlternateID kAltTSARedAlert = 3;
+
+// Room IDs.
+const RoomID kTSA01 = 1;
+const RoomID kTSA02 = 2;
+const RoomID kTSA03 = 3;
+const RoomID kTSA04 = 4;
+const RoomID kTSA05 = 5;
+const RoomID kTSA0A = 6;
+const RoomID kTSA06 = 7;
+const RoomID kTSA07 = 8;
+const RoomID kTSA08 = 9;
+const RoomID kTSA09 = 10;
+const RoomID kTSA10 = 11;
+const RoomID kTSA11 = 12;
+const RoomID kTSA12 = 13;
+const RoomID kTSA13 = 14;
+const RoomID kTSA14 = 15;
+const RoomID kTSA15 = 16;
+const RoomID kTSA16 = 17;
+const RoomID kTSA17 = 18;
+const RoomID kTSA18 = 19;
+const RoomID kTSA19 = 20;
+const RoomID kTSA0B = 21;
+const RoomID kTSA21Cyan = 22;
+const RoomID kTSA22Cyan = 23;
+const RoomID kTSA23Cyan = 24;
+const RoomID kTSA24Cyan = 25;
+const RoomID kTSA25Cyan = 26;
+const RoomID kTSA21Red = 27;
+const RoomID kTSA23Red = 29;
+const RoomID kTSA24Red = 30;
+const RoomID kTSA25Red = 31;
+const RoomID kTSA26 = 32;
+const RoomID kTSA27 = 33;
+const RoomID kTSA28 = 34;
+const RoomID kTSA29 = 35;
+const RoomID kTSA30 = 36;
+const RoomID kTSA31 = 37;
+const RoomID kTSA32 = 38;
+const RoomID kTSA33 = 39;
+const RoomID kTSA34 = 40;
+const RoomID kTSA35 = 41;
+const RoomID kTSADeathRoom = 43;
+
+// Hot Spot Activation IDs.
+const HotSpotActivationID kActivateTSAReadyForCard = 1;
+const HotSpotActivationID kActivateTSAReadyToTransport = 2;
+const HotSpotActivationID kActivateTSARobotsAwake = 3;
+const HotSpotActivationID kActivateTSA0BZoomedOut = 4;
+const HotSpotActivationID kActivateTSA0BZoomedIn = 5;
+const HotSpotActivationID kActivateTSA0BComparisonVideo = 6;
+const HotSpotActivationID kActivationLogReaderOpen = 7;
+const HotSpotActivationID kActivateTSA0BTBPVideo = 8;
+const HotSpotActivationID kActivationDoesntHaveKey = 9;
+const HotSpotActivationID kActivationKeyVaultOpen = 10;
+const HotSpotActivationID kActivationDoesntHaveChips = 11;
+const HotSpotActivationID kActivationChipVaultOpen = 12;
+const HotSpotActivationID kActivationJumpToPrehistoric = 13;
+const HotSpotActivationID kActivationJumpToNorad = 14;
+const HotSpotActivationID kActivationJumpToMars = 15;
+const HotSpotActivationID kActivationJumpToWSC = 16;
+const HotSpotActivationID kActivationReadyToExit = 17;
+const HotSpotActivationID kActivationReadyForJumpMenu = 18;
+const HotSpotActivationID kActivationMainJumpMenu = 19;
+
+// Hot Spot IDs.
+const HotSpotID kTSAGTCardDropSpotID = 5000;
+const HotSpotID kTSAGTTokyoSpotID = 5001;
+const HotSpotID kTSAGTCaldoriaSpotID = 5002;
+const HotSpotID kTSAGTBeachSpotID = 5003;
+const HotSpotID kTSAGTOtherSpotID = 5004;
+const HotSpotID kTSA02DoorSpotID = 5005;
+const HotSpotID kTSA03EastJimenezSpotID = 5006;
+const HotSpotID kTSA03WestCrenshawSpotID = 5007;
+const HotSpotID kTSA04EastMatsumotoSpotID = 5008;
+const HotSpotID kTSA04WestCastilleSpotID = 5009;
+const HotSpotID kTSA05EastSinclairSpotID = 5010;
+const HotSpotID kTSA05WestWhiteSpotID = 5011;
+const HotSpotID kTSA0AEastSpotID = 5012;
+const HotSpotID kTSA0AWastSpotID = 5013;
+const HotSpotID kTSA0BEastMonitorSpotID = 5014;
+const HotSpotID kTSA0BEastMonitorOutSpotID = 5015;
+const HotSpotID kTSA0BEastCompareNoradSpotID = 5016;
+const HotSpotID kTSA0BEastCompareMarsSpotID = 5017;
+const HotSpotID kTSA0BEastCompareCaldoriaSpotID = 5018;
+const HotSpotID kTSA0BEastCompareWSCSpotID = 5019;
+const HotSpotID kTSA0BEastLeftRewindSpotID = 5020;
+const HotSpotID kTSA0BEastLeftPlaySpotID = 5021;
+const HotSpotID kTSA0BEastRightRewindSpotID = 5022;
+const HotSpotID kTSA0BEastRightPlaySpotID = 5023;
+const HotSpotID kTSA0BEastCloseVideoSpotID = 5024;
+const HotSpotID kTSA0BNorthMonitorSpotID = 5025;
+const HotSpotID kTSA0BNorthMonitorOutSpotID = 5026;
+const HotSpotID kTSA0BNorthHistLogSpotID = 5027;
+const HotSpotID kTSA0BNorthRobotsToCommandCenterSpotID = 5028;
+const HotSpotID kTSA0BNorthRobotsToReadyRoomSpotID = 5029;
+const HotSpotID kTSA0BNorthRobotsToFrontDoorSpotID = 5030;
+const HotSpotID kTSA0BWestMonitorSpotID = 5031;
+const HotSpotID kTSA0BWestMonitorOutSpotID = 5032;
+const HotSpotID kTSA0BWestTheorySpotID = 5033;
+const HotSpotID kTSA0BWestBackgroundSpotID = 5034;
+const HotSpotID kTSA0BWestProcedureSpotID = 5035;
+const HotSpotID kTSA0BWestCloseVideoSpotID = 5036;
+const HotSpotID kTSA0BWestPlayVideoSpotID = 5037;
+const HotSpotID kTSA0BWestRewindVideoSpotID = 5038;
+const HotSpotID kTSA22EastMonitorSpotID = 5039;
+const HotSpotID kTSA22EastKeySpotID = 5040;
+const HotSpotID kTSA23WestMonitorSpotID = 5041;
+const HotSpotID kTSA23WestChipsSpotID = 5042;
+const HotSpotID kTSA34NorthDoorSpotID = 5043;
+const HotSpotID kTSA37NorthJumpToPrehistoricSpotID = 5044;
+const HotSpotID kTSA37NorthJumpToNoradSpotID = 5045;
+const HotSpotID kTSA37NorthCancelNoradSpotID = 5046;
+const HotSpotID kTSA37NorthJumpToMarsSpotID = 5047;
+const HotSpotID kTSA37NorthCancelMarsSpotID = 5048;
+const HotSpotID kTSA37NorthJumpToWSCSpotID = 5049;
+const HotSpotID kTSA37NorthCancelWSCSpotID = 5050;
+const HotSpotID kTSA37NorthExitSpotID = 5051;
+const HotSpotID kTSA37NorthJumpMenuSpotID = 5052;
+const HotSpotID kTSA37NorthNoradMenuSpotID = 5053;
+const HotSpotID kTSA37NorthMarsMenuSpotID = 5054;
+const HotSpotID kTSA37NorthWSCMenuSpotID = 5055;
+
+// Extra sequence IDs.
+const ExtraID kTSATransporterArrowLoop = 0;
+const ExtraID kTSAArriveFromCaldoria = 1;
+const ExtraID kTSAGTOtherChoice = 2;
+const ExtraID kTSAGTCardSwipe = 3;
+const ExtraID kTSAGTSelectCaldoria = 4;
+const ExtraID kTSAGTGoToCaldoria = 5;
+const ExtraID kTSAGTSelectBeach = 6;
+const ExtraID kTSAGTGoToBeach = 7;
+const ExtraID kTSAGTArriveAtBeach = 8;
+const ExtraID kTSAGTSelectTokyo = 9;
+const ExtraID kTSAGTGoToTokyo = 10;
+const ExtraID kTSAGTArriveAtTokyo = 11;
+const ExtraID kTSA02NorthZoomIn = 12;
+const ExtraID kTSA02NorthTenSecondDoor = 13;
+const ExtraID kTSA02NorthZoomOut = 14;
+const ExtraID kTSA02NorthDoorWithAgent3 = 15;
+const ExtraID kTSA03JimenezZoomIn = 16;
+const ExtraID kTSA03JimenezSpeech = 17;
+const ExtraID kTSA03JimenezZoomOut = 18;
+const ExtraID kTSA03CrenshawZoomIn = 19;
+const ExtraID kTSA03CrenshawSpeech = 20;
+const ExtraID kTSA03CrenshawZoomOut = 21;
+const ExtraID kTSA03SouthRobotDeath = 22;
+const ExtraID kTSA04NorthRobotGreeting = 23;
+const ExtraID kTSA04MatsumotoZoomIn = 24;
+const ExtraID kTSA04MatsumotoSpeech = 25;
+const ExtraID kTSA04MatsumotoZoomOut = 26;
+const ExtraID kTSA04CastilleZoomIn = 27;
+const ExtraID kTSA04CastilleSpeech = 28;
+const ExtraID kTSA04CastilleZoomOut = 29;
+const ExtraID kTSA05SinclairZoomIn = 30;
+const ExtraID kTSA05SinclairSpeech = 31;
+const ExtraID kTSA05SinclairZoomOut = 32;
+const ExtraID kTSA05WhiteZoomIn = 33;
+const ExtraID kTSA05WhiteSpeech = 34;
+const ExtraID kTSA05WhiteZoomOut = 35;
+const ExtraID kTSA0AEastRobot = 36;
+const ExtraID kTSA0AWestRobot = 37;
+const ExtraID kTSA16NorthRobotDeath = 38;
+const ExtraID kTSA0BEastZoomIn = 39;
+const ExtraID kTSA0BEastZoomedView = 40;
+const ExtraID kTSA0BEastZoomOut = 41;
+const ExtraID kTSA0BEastTurnLeft = 42;
+const ExtraID kTSA0BComparisonStartup = 43;
+const ExtraID kTSA0BComparisonView0000 = 44;
+const ExtraID kTSA0BComparisonView0002 = 45;
+const ExtraID kTSA0BComparisonView0020 = 46;
+const ExtraID kTSA0BComparisonView0022 = 47;
+const ExtraID kTSA0BComparisonView0200 = 48;
+const ExtraID kTSA0BComparisonView0202 = 49;
+const ExtraID kTSA0BComparisonView0220 = 50;
+const ExtraID kTSA0BComparisonView0222 = 51;
+const ExtraID kTSA0BComparisonView2000 = 52;
+const ExtraID kTSA0BComparisonView2002 = 53;
+const ExtraID kTSA0BComparisonView2020 = 54;
+const ExtraID kTSA0BComparisonView2022 = 55;
+const ExtraID kTSA0BComparisonView2200 = 56;
+const ExtraID kTSA0BComparisonView2202 = 57;
+const ExtraID kTSA0BComparisonView2220 = 58;
+const ExtraID kTSA0BComparisonView2222 = 59;
+const ExtraID kTSA0BNoradComparisonView = 60;
+const ExtraID kTSA0BNoradUnaltered = 61;
+const ExtraID kTSA0BNoradAltered = 62;
+const ExtraID kTSA0BMarsComparisonView = 63;
+const ExtraID kTSA0BMarsUnaltered = 64;
+const ExtraID kTSA0BMarsAltered = 65;
+const ExtraID kTSA0BWSCComparisonView = 66;
+const ExtraID kTSA0BWSCUnaltered = 67;
+const ExtraID kTSA0BWSCAltered = 68;
+const ExtraID kTSA0BCaldoriaComparisonView = 69;
+const ExtraID kTSA0BCaldoriaUnaltered = 70;
+const ExtraID kTSA0BCaldoriaAltered = 71;
+const ExtraID kTSA0BNorthZoomIn = 72;
+const ExtraID kTSA0BNorthZoomedView = 73;
+const ExtraID kTSA0BNorthZoomOut = 74;
+const ExtraID kTSA0BNorthTurnLeft = 75;
+const ExtraID kTSA0BNorthTurnRight = 76;
+const ExtraID kTSA0BNorthHistLogOpen = 77;
+const ExtraID kTSA0BNorthHistLogClose = 78;
+const ExtraID kTSA0BNorthHistLogCloseWithLog = 79;
+const ExtraID kTSA0BNorthCantChangeHistory = 80;
+const ExtraID kTSA0BNorthYoureBusted = 81;
+const ExtraID kTSA0BNorthFinallyHappened = 82;
+const ExtraID kTSA0BShowRip1 = 83;
+const ExtraID kTSA0BNorthRipView1 = 84;
+const ExtraID kTSA0BShowRip2 = 85;
+const ExtraID kTSA0BShowGuardRobots = 86;
+const ExtraID kTSA0BAIInterruption = 87;
+const ExtraID kTSA0BRobotsToCommandCenter = 88;
+const ExtraID kTSA0BNorthRobotsAtCCView = 89;
+const ExtraID kTSA0BNorthRobotsAtRRView = 90;
+const ExtraID kTSA0BNorthRobotsAtFDView = 91;
+const ExtraID kTSA0BRobotsFromCommandCenterToReadyRoom = 92;
+const ExtraID kTSA0BRobotsFromReadyRoomToCommandCenter = 93;
+const ExtraID kTSA0BRobotsFromCommandCenterToFrontDoor = 94;
+const ExtraID kTSA0BRobotsFromFrontDoorToCommandCenter = 95;
+const ExtraID kTSA0BRobotsFromFrontDoorToReadyRoom = 96;
+const ExtraID kTSA0BRobotsFromReadyRoomToFrontDoor = 97;
+const ExtraID kTSA0BWestZoomIn = 98;
+const ExtraID kTSA0BWestZoomedView = 99;
+const ExtraID kTSA0BWestZoomOut = 100;
+const ExtraID kTSA0BWestTurnRight = 101;
+const ExtraID kTSA0BTBPTheoryHighlight = 102;
+const ExtraID kTSA0BTBPBackgroundHighlight = 103;
+const ExtraID kTSA0BTBPProcedureHighlight = 104;
+const ExtraID kTSA0BTBPTheory = 105;
+const ExtraID kTSA0BTBPBackground = 106;
+const ExtraID kTSA0BTBPProcedure = 107;
+const ExtraID kTSA0BRipAlarmScreen = 108;
+const ExtraID kTSA22RedEastZoomInSequence = 109;
+const ExtraID kTSA22RedEastVaultViewWithKey = 110;
+const ExtraID kTSA22RedEastVaultViewNoKey = 111;
+const ExtraID kTSA23RedWestVaultZoomInSequence = 112;
+const ExtraID kTSA23RedWestVaultViewWithChips = 113;
+const ExtraID kTSA23RedWestVaultViewNoChips = 114;
+const ExtraID kTSA25NorthDeniedNoKey = 115;
+const ExtraID kTSA25NorthDeniedNoChip = 116;
+const ExtraID kTSA25NorthPutOnSuit = 117;
+const ExtraID kTSA25NorthAlreadyHaveSuit = 118;
+const ExtraID kTSA25NorthDescending1 = 119;
+const ExtraID kTSA25NorthDescending2 = 120;
+const ExtraID kTSA37HorseToAI1 = 121;
+const ExtraID kTSA37PegasusAI1 = 122;
+const ExtraID kTSA37AI1ToCommissioner1 = 123;
+const ExtraID kTSA37Commissioner1 = 124;
+const ExtraID kTSA37Commissioner1ToZoom = 125;
+const ExtraID kTSA37ZoomToPrehistoric = 126;
+const ExtraID kTSA37PrehistoricToAI2 = 127;
+const ExtraID kTSA37PegasusAI2 = 128;
+const ExtraID kTSA37AI2ToPrehistoric = 129;
+const ExtraID kTSA37PrehistoricToDepart = 130;
+const ExtraID kTSA37PegasusDepart = 131;
+const ExtraID kTSA37TimeJumpToPegasus = 132;
+const ExtraID kTSA37RecallToDownload = 133;
+const ExtraID kTSA37DownloadToColonel1 = 134;
+const ExtraID kTSA37Colonel1 = 135;
+const ExtraID kTSA37Colonel1ToReviewRequired = 136;
+const ExtraID kTSA37ReviewRequiredToExit = 137;
+const ExtraID kTSA37ExitHilited = 138;
+const ExtraID kTSA37ExitToHorse = 139;
+const ExtraID kTSA37HorseToColonel2 = 140;
+const ExtraID kTSA37Colonel2 = 141;
+const ExtraID kTSA37PegasusAI3 = 142;
+const ExtraID kTSA37AI3ToHorse = 143;
+const ExtraID kTSA37HorseToZoom = 144;
+const ExtraID kTSA37ZoomToMainMenu = 145;
+const ExtraID kTSA37MainMenuToAI4 = 146;
+const ExtraID kTSA37PegasusAI4 = 147;
+const ExtraID kTSA37AI4ToMainMenu = 148;
+const ExtraID kTSA37JumpMenu000 = 149;
+const ExtraID kTSA37JumpMenu001 = 150;
+const ExtraID kTSA37JumpMenu010 = 151;
+const ExtraID kTSA37JumpMenu011 = 152;
+const ExtraID kTSA37JumpMenu100 = 153;
+const ExtraID kTSA37JumpMenu101 = 154;
+const ExtraID kTSA37JumpMenu110 = 155;
+const ExtraID kTSA37JumpMenu111 = 156;
+const ExtraID kTSA37JumpToWSCMenu = 157;
+const ExtraID kTSA37CancelWSC = 158;
+const ExtraID kTSA37JumpToWSC = 159;
+const ExtraID kTSA37WSCToAI5 = 160;
+const ExtraID kTSA37PegasusAI5 = 161;
+const ExtraID kTSA37AI5ToWSC = 162;
+const ExtraID kTSA37WSCToDepart = 163;
+const ExtraID kTSA37JumpToMarsMenu = 164;
+const ExtraID kTSA37CancelMars = 165;
+const ExtraID kTSA37JumpToMars = 166;
+const ExtraID kTSA37MarsToAI6 = 167;
+const ExtraID kTSA37PegasusAI6 = 168;
+const ExtraID kTSA37AI6ToMars = 169;
+const ExtraID kTSA37MarsToDepart = 170;
+const ExtraID kTSA37JumpToNoradMenu = 171;
+const ExtraID kTSA37CancelNorad = 172;
+const ExtraID kTSA37JumpToNorad = 173;
+const ExtraID kTSA37NoradToAI7 = 174;
+const ExtraID kTSA37PegasusAI7 = 175;
+const ExtraID kTSA37AI7ToNorad = 176;
+const ExtraID kTSA37NoradToDepart = 177;
+const ExtraID kTSA37EnvironmentalScan = 178;
+const ExtraID kTSA37DownloadToMainMenu = 179;
+const ExtraID kTSA37DownloadToOpMemReview = 180;
+const ExtraID kTSA37OpMemReviewToMainMenu = 181;
+const ExtraID kTSA37OpMemReviewToAllClear = 182;
+const ExtraID kTSA37AllClearToCongratulations = 183;
+const ExtraID kTSA37Congratulations = 184;
+const ExtraID kTSA37CongratulationsToExit = 185;
+
+const DisplayOrder kRipTimerOrder = kMonitorLayer;
+
+
+const CoordType kUnresolvedLeft = kNavAreaLeft + 14;
+const CoordType kUnresolvedTop = kNavAreaTop + 236;
+
+const CoordType kResolvedLeft = kNavAreaLeft + 36;
+const CoordType kResolvedTop = kNavAreaTop + 236;
+
+const CoordType kJumpMenuLeft = kNavAreaLeft + 360;
+const CoordType kJumpMenuTop = kNavAreaTop + 202;
+
+const CoordType kJumpMenuHilitedLeft = kNavAreaLeft + 354;
+const CoordType kJumpMenuHilitedTop = kNavAreaTop + 196;
+
+const CoordType kExitLeft = kNavAreaLeft + 360;
+const CoordType kExitTop = kNavAreaTop + 216;
+
+const CoordType kExitHilitedLeft = kNavAreaLeft + 354;
+const CoordType kExitHilitedTop = kNavAreaTop + 210;
+
+const CoordType kRipTimerLeft = kNavAreaLeft + 95;
+const CoordType kRipTimerTop = kNavAreaTop + 87;
+
+const CoordType kTBPCloseLeft = kNavAreaLeft + 30;
+const CoordType kTBPCloseTop = kNavAreaTop + 16;
+
+const CoordType kTBPRewindLeft = kNavAreaLeft + 86;
+const CoordType kTBPRewindTop = kNavAreaTop + 218;
+
+const CoordType kComparisonCloseLeft = kNavAreaLeft + 50;
+const CoordType kComparisonCloseTop = kNavAreaTop + 14;
+
+const CoordType kComparisonLeftRewindLeft = kNavAreaLeft + 96;
+const CoordType kComparisonLeftRewindTop = kNavAreaTop + 190;
+
+const CoordType kComparisonRightRewindLeft = kNavAreaLeft + 282;
+const CoordType kComparisonRightRewindTop = kNavAreaTop + 190;
+
+const CoordType kComparisonHiliteSpriteLeft = kNavAreaLeft + 45;
+const CoordType kComparisonHiliteSpriteTop = kNavAreaTop + 65;
+
+const CoordType kComparisonHiliteNoradLeft = kNavAreaLeft + 45;
+const CoordType kComparisonHiliteNoradTop = kNavAreaTop + 65;
+
+const CoordType kComparisonHiliteMarsLeft = kNavAreaLeft + 45 + 4;
+const CoordType kComparisonHiliteMarsTop = kNavAreaTop + 65 + 23;
+
+const CoordType kComparisonHiliteCaldoriaLeft = kNavAreaLeft + 45 + 7;
+const CoordType kComparisonHiliteCaldoriaTop = kNavAreaTop + 65 + 46;
+
+const CoordType kComparisonHiliteWSCLeft = kNavAreaLeft + 45 + 11;
+const CoordType kComparisonHiliteWSCTop = kNavAreaTop + 65 + 68;
+
+const CoordType kComparisonChancesSpriteLeft = kNavAreaLeft + 148;
+const CoordType kComparisonChancesSpriteTop = kNavAreaTop + 162;
 
-const tCoordType kComparisonChancesNoradLeft = kNavAreaLeft + 148;
-const tCoordType kComparisonChancesNoradTop = kNavAreaTop + 162;
+const CoordType kComparisonChancesNoradLeft = kNavAreaLeft + 148;
+const CoordType kComparisonChancesNoradTop = kNavAreaTop + 162;
 
-const tCoordType kComparisonChancesMarsLeft = kNavAreaLeft + 148;
-const tCoordType kComparisonChancesMarsTop = kNavAreaTop + 162;
+const CoordType kComparisonChancesMarsLeft = kNavAreaLeft + 148;
+const CoordType kComparisonChancesMarsTop = kNavAreaTop + 162;
 
-const tCoordType kComparisonChancesCaldoriaLeft = kNavAreaLeft + 148;
-const tCoordType kComparisonChancesCaldoriaTop = kNavAreaTop + 162 + 1;
+const CoordType kComparisonChancesCaldoriaLeft = kNavAreaLeft + 148;
+const CoordType kComparisonChancesCaldoriaTop = kNavAreaTop + 162 + 1;
 
-const tCoordType kComparisonChancesWSCLeft = kNavAreaLeft + 148;
-const tCoordType kComparisonChancesWSCTop = kNavAreaTop + 162;
+const CoordType kComparisonChancesWSCLeft = kNavAreaLeft + 148;
+const CoordType kComparisonChancesWSCTop = kNavAreaTop + 162;
 
-const tCoordType kRedirectionSprite1Left = kNavAreaLeft + 58;
-const tCoordType kRedirectionSprite1Top = kNavAreaTop + 16;
+const CoordType kRedirectionSprite1Left = kNavAreaLeft + 58;
+const CoordType kRedirectionSprite1Top = kNavAreaTop + 16;
 
-const tCoordType kRedirectionSprite2Left = kNavAreaLeft + 36;
-const tCoordType kRedirectionSprite2Top = kNavAreaTop + 166;
+const CoordType kRedirectionSprite2Left = kNavAreaLeft + 36;
+const CoordType kRedirectionSprite2Top = kNavAreaTop + 166;
 
-const tCoordType kRedirectionCCRolloverLeft = kNavAreaLeft + 58;
-const tCoordType kRedirectionCCRolloverTop = kNavAreaTop + 16;
+const CoordType kRedirectionCCRolloverLeft = kNavAreaLeft + 58;
+const CoordType kRedirectionCCRolloverTop = kNavAreaTop + 16;
 
-const tCoordType kRedirectionRRRolloverLeft = kNavAreaLeft + 430;
-const tCoordType kRedirectionRRRolloverTop = kNavAreaTop + 30;
+const CoordType kRedirectionRRRolloverLeft = kNavAreaLeft + 430;
+const CoordType kRedirectionRRRolloverTop = kNavAreaTop + 30;
 
-const tCoordType kRedirectionFDRolloverLeft = kNavAreaLeft + 278;
-const tCoordType kRedirectionFDRolloverTop = kNavAreaTop + 160;
+const CoordType kRedirectionFDRolloverLeft = kNavAreaLeft + 278;
+const CoordType kRedirectionFDRolloverTop = kNavAreaTop + 160;
 
-const tCoordType kRedirectionCCDoorLeft = kNavAreaLeft + 174;
-const tCoordType kRedirectionCCDoorTop = kNavAreaTop + 36;
+const CoordType kRedirectionCCDoorLeft = kNavAreaLeft + 174;
+const CoordType kRedirectionCCDoorTop = kNavAreaTop + 36;
 
-const tCoordType kRedirectionRRDoorLeft = kNavAreaLeft + 418;
-const tCoordType kRedirectionRRDoorTop = kNavAreaTop + 32;
+const CoordType kRedirectionRRDoorLeft = kNavAreaLeft + 418;
+const CoordType kRedirectionRRDoorTop = kNavAreaTop + 32;
 
-const tCoordType kRedirectionFDDoorLeft = kNavAreaLeft + 298;
-const tCoordType kRedirectionFDDoorTop = kNavAreaTop + 240;
+const CoordType kRedirectionFDDoorLeft = kNavAreaLeft + 298;
+const CoordType kRedirectionFDDoorTop = kNavAreaTop + 240;
 
-const tCoordType kRedirectionSecuredLeft = kNavAreaLeft + 36;
-const tCoordType kRedirectionSecuredTop = kNavAreaTop + 166;
+const CoordType kRedirectionSecuredLeft = kNavAreaLeft + 36;
+const CoordType kRedirectionSecuredTop = kNavAreaTop + 166;
 
-const tCoordType kRedirectionNewTargetLeft = kNavAreaLeft + 36;
-const tCoordType kRedirectionNewTargetTop = kNavAreaTop + 166;
+const CoordType kRedirectionNewTargetLeft = kNavAreaLeft + 36;
+const CoordType kRedirectionNewTargetTop = kNavAreaTop + 166;
 
-const tCoordType kRedirectionCloseLeft = kNavAreaLeft + 56;
-const tCoordType kRedirectionCloseTop = kNavAreaTop + 220;
+const CoordType kRedirectionCloseLeft = kNavAreaLeft + 56;
+const CoordType kRedirectionCloseTop = kNavAreaTop + 220;
 
 const TimeValue kTSABumpIntoWallIn = 0;
 const TimeValue kTSABumpIntoWallOut = 148;
@@ -568,7 +563,7 @@ enum {
 										kPlayingRightComparisonMask
 };
 
-static const tExtraID s_historicalLogViews[16] = {
+static const ExtraID s_historicalLogViews[16] = {
 	kTSA0BComparisonView0000,
 	kTSA0BComparisonView0002,
 	kTSA0BComparisonView0020,
@@ -630,7 +625,7 @@ void RipTimer::timeChanged(const TimeValue newTime) {
 	Common::Rect bounds;
 	getBounds(bounds);
 
-	tCoordType newMiddle = bounds.left + bounds.width() * newTime / getDuration();
+	CoordType newMiddle = bounds.left + bounds.width() * newTime / getDuration();
 
 	if (newMiddle != _middle) {
 		_middle = newMiddle;
@@ -699,7 +694,7 @@ Common::String FullTSA::getBriefingMovie() {
 	Common::String movieName = Neighborhood::getBriefingMovie();
 
 	if (movieName.empty()) {
-		tRoomID room = GameState.getCurrentRoom();
+		RoomID room = GameState.getCurrentRoom();
 
 		switch (GameState.getTSAState()) {
 		case kTSAPlayerNotArrived:
@@ -829,7 +824,7 @@ Common::String FullTSA::getHintMovie(uint hintNum) {
 }
 
 void FullTSA::loadAmbientLoops() {
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 
 	switch (GameState.getTSAState()) {
 	case kTSAPlayerDetectedRip:
@@ -856,7 +851,7 @@ void FullTSA::loadAmbientLoops() {
 	}
 }
 
-short FullTSA::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) {
+short FullTSA::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) {
 	int16 result = Neighborhood::getStaticCompassAngle(room, dir);
 
 	switch (room) {
@@ -1010,8 +1005,8 @@ uint16 FullTSA::getDateResID() const {
 	return kDate2318ID;
 }
 
-TimeValue FullTSA::getViewTime(const tRoomID room, const tDirectionConstant direction) {
-	tExtraID extraID = 0xffffffff;
+TimeValue FullTSA::getViewTime(const RoomID room, const DirectionConstant direction) {
+	ExtraID extraID = 0xffffffff;
 	
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kTSA0B, kEast):
@@ -1084,7 +1079,7 @@ TimeValue FullTSA::getViewTime(const tRoomID room, const tDirectionConstant dire
 	return Neighborhood::getViewTime(room, direction);
 }
 
-void FullTSA::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &entry) {
+void FullTSA::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &entry) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kTSA0B, kNorth):
 	case MakeRoomView(kTSA0B, kEast):
@@ -1120,7 +1115,7 @@ void FullTSA::pickedUpItem(Item *item) {
 	}
 }
 
-void FullTSA::playExtraMovie(const ExtraTable::Entry &extraEntry, const tNotificationFlags flags, const tInputBits interruptionInput) {
+void FullTSA::playExtraMovie(const ExtraTable::Entry &extraEntry, const NotificationFlags flags, const InputBits interruptionInput) {
 	switch (extraEntry.extra) {
 	case kTSA0BNorthZoomIn:
 		if (_privateFlags.getFlag(kTSAPrivateLogReaderOpenFlag)) {
@@ -1189,8 +1184,8 @@ void FullTSA::startDoorOpenMovie(const TimeValue startTime, const TimeValue stop
 	Neighborhood::startDoorOpenMovie(startTime, stopTime);
 }
 
-tInputBits FullTSA::getInputFilter() {
-	tInputBits result = Neighborhood::getInputFilter();
+InputBits FullTSA::getInputFilter() {
+	InputBits result = Neighborhood::getInputFilter();
 
 	switch (GameState.getCurrentRoom()) {
 	case kTSA0B:
@@ -1256,14 +1251,14 @@ void FullTSA::openDoor() {
 	Neighborhood::openDoor();
 }
 
-tCanMoveForwardReason FullTSA::canMoveForward(ExitTable::Entry &entry) {
+CanMoveForwardReason FullTSA::canMoveForward(ExitTable::Entry &entry) {
 	if (GameState.getCurrentRoomAndView() == MakeRoomView(kTSA25Red, kNorth))
 		return kCantMoveBlocked;
 
 	return Neighborhood::canMoveForward(entry);
 }
 
-tCanOpenDoorReason FullTSA::canOpenDoor(DoorTable::Entry &entry) {
+CanOpenDoorReason FullTSA::canOpenDoor(DoorTable::Entry &entry) {
 	switch (GameState.getCurrentRoomAndView()) {
 	case MakeRoomView(kTSA02, kNorth):
 		if (!GameState.getTSAFrontDoorUnlockedOutside())
@@ -1610,7 +1605,7 @@ void FullTSA::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
 }
 
 void FullTSA::showMainJumpMenu() {
-	tExtraID jumpMenuView = kTSA37JumpMenu000;
+	ExtraID jumpMenuView = kTSA37JumpMenu000;
 
 	if (GameState.getNoradFinished())
 		jumpMenuView += 4;
@@ -1627,7 +1622,7 @@ void FullTSA::playTBPMonitor() {
 	InputHandler::getCurrentInputDevice()->waitInput(kFilterAllButtons);
 	
 	if ((GameState.getT0BMonitorMode() & kPlayingTBPMask) == 0) {
-		tExtraID extra;
+		ExtraID extra;
 
 		switch (GameState.getT0BMonitorMode() & kRawModeMask) {
 		case kMonitorTheory:
@@ -1662,7 +1657,7 @@ void FullTSA::playTBPMonitor() {
 	}
 }
 
-void FullTSA::initializeTBPMonitor(const int newMode, const tExtraID highlightExtra) {
+void FullTSA::initializeTBPMonitor(const int newMode, const ExtraID highlightExtra) {
 	GameState.setT0BMonitorMode(newMode);
 
 	if (newMode != kMonitorNeutral) {
@@ -1732,7 +1727,7 @@ void FullTSA::shutDownComparisonMonitor() {
 	releaseSprites();
 }
 
-void FullTSA::initializeComparisonMonitor(const int newMode, const tExtraID comparisonView) {
+void FullTSA::initializeComparisonMonitor(const int newMode, const ExtraID comparisonView) {
 	GameState.setT0BMonitorMode(newMode);
 	_privateFlags.setFlag(kTSAPrivatePlayingLeftComparisonFlag, false);
 	_privateFlags.setFlag(kTSAPrivatePlayingRightComparisonFlag, false);
@@ -1778,7 +1773,7 @@ void FullTSA::playLeftComparison() {
 	InputHandler::getCurrentInputDevice()->waitInput(kFilterAllButtons);
 
 	if ((GameState.getT0BMonitorMode() & kPlayingLeftComparisonMask) == 0) {
-		tExtraID extra;
+		ExtraID extra;
 
 		switch (GameState.getT0BMonitorMode() & kRawModeMask) {
 		case kMonitorNoradComparison:
@@ -1828,7 +1823,7 @@ void FullTSA::playRightComparison() {
 	InputHandler::getCurrentInputDevice()->waitInput(kFilterAllButtons);
 	
 	if ((GameState.getT0BMonitorMode() & kPlayingRightComparisonMask) == 0) {
-		tExtraID extra;
+		ExtraID extra;
 
 		switch (GameState.getT0BMonitorMode() & kRawModeMask) {
 		case kMonitorNoradComparison:
@@ -1951,7 +1946,7 @@ void FullTSA::setOffRipAlarm() {
 	requestExtraSequence(kTSA0BShowRip1, kExtraCompletedFlag, kFilterNoInput);
 }
 
-void FullTSA::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) {
+void FullTSA::checkContinuePoint(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kTSA04, kNorth):
 	case MakeRoomView(kTSA14, kEast):
@@ -1966,7 +1961,7 @@ void FullTSA::checkContinuePoint(const tRoomID room, const tDirectionConstant di
 	}
 }
 
-void FullTSA::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void FullTSA::arriveAt(const RoomID room, const DirectionConstant direction) {
 	checkRobotLocations(room, direction);
 	Neighborhood::arriveAt(room, direction);
 
@@ -2094,7 +2089,7 @@ void FullTSA::arriveAt(const tRoomID room, const tDirectionConstant direction) {
 	}
 }
 
-void FullTSA::checkRobotLocations(const tRoomID room, const tDirectionConstant dir) {
+void FullTSA::checkRobotLocations(const RoomID room, const DirectionConstant dir) {
 	switch (room) {
 	case kTSA03:
 	case kTSA04:
@@ -2184,7 +2179,7 @@ void FullTSA::arriveAtTSA37() {
 	}
 }
 
-void FullTSA::turnTo(const tDirectionConstant newDirection) {
+void FullTSA::turnTo(const DirectionConstant newDirection) {
 	Neighborhood::turnTo(newDirection);
 
 	switch (MakeRoomView(GameState.getCurrentRoom(), newDirection)) {
@@ -2322,7 +2317,7 @@ void FullTSA::turnTo(const tDirectionConstant newDirection) {
 	GameState.setT0BMonitorMode(kMonitorNeutral);
 }
 
-void FullTSA::closeDoorOffScreen(const tRoomID room, const tDirectionConstant) {
+void FullTSA::closeDoorOffScreen(const RoomID room, const DirectionConstant) {
 	switch (room) {
 	case kTSA00:
 	case kTSA01:
@@ -2347,8 +2342,8 @@ void FullTSA::closeDoorOffScreen(const tRoomID room, const tDirectionConstant) {
 	}
 }
 
-void FullTSA::receiveNotification(Notification *notification, const tNotificationFlags flags) {	
-	tExtraID lastExtra = _lastExtra;
+void FullTSA::receiveNotification(Notification *notification, const NotificationFlags flags) {	
+	ExtraID lastExtra = _lastExtra;
 
 	if ((flags & kExtraCompletedFlag) != 0) {
 		switch (lastExtra) {
diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.h b/engines/pegasus/neighborhood/tsa/fulltsa.h
index aa21192a33..cc0ce6221f 100755
--- a/engines/pegasus/neighborhood/tsa/fulltsa.h
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 class RipTimer : public IdlerAnimation {
 public:
-	RipTimer(const tDisplayElementID id) : IdlerAnimation(id) {}
+	RipTimer(const DisplayElementID id) : IdlerAnimation(id) {}
 	virtual ~RipTimer() {}
 
 	void initImage();
@@ -43,15 +43,15 @@ public:
 protected:
 	void timeChanged(const TimeValue);
 	
-	tCoordType _middle;
+	CoordType _middle;
 	Surface _timerImage;
 };
 
 //	Room IDs.
 
-const tRoomID kTSA00 = 0;
-const tRoomID kTSA22Red = 28;
-const tRoomID kTSA37 = 42;
+const RoomID kTSA00 = 0;
+const RoomID kTSA22Red = 28;
+const RoomID kTSA37 = 42;
 
 class FullTSA : public Neighborhood {
 friend void uncreatedInTSAFunction(FunctionPtr *, void *tsa);
@@ -68,7 +68,7 @@ public:
 
 	void flushGameState();
 
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 
 	bool canSolve();
 	void doSolve();
@@ -93,33 +93,33 @@ protected:
 	void loadAmbientLoops();
 	virtual void clickInHotspot(const Input &, const Hotspot *);
 
-	virtual int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant);
+	virtual int16 getStaticCompassAngle(const RoomID, const DirectionConstant);
 	void activateOneHotspot(HotspotInfoTable::Entry &, Hotspot *spot);
 	virtual void activateHotspots();
 	void getExitCompassMove(const ExitTable::Entry &, FaderMoveSpec &);
 	void dropItemIntoRoom(Item *, Hotspot *);
 	void downButton(const Input &);
 	void startDoorOpenMovie(const TimeValue, const TimeValue);
-	TimeValue getViewTime(const tRoomID, const tDirectionConstant);
-	void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &);
-	void turnTo(const tDirectionConstant);
-	tCanMoveForwardReason canMoveForward(ExitTable::Entry &);
-	tCanOpenDoorReason canOpenDoor(DoorTable::Entry &);
+	TimeValue getViewTime(const RoomID, const DirectionConstant);
+	void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &);
+	void turnTo(const DirectionConstant);
+	CanMoveForwardReason canMoveForward(ExitTable::Entry &);
+	CanOpenDoorReason canOpenDoor(DoorTable::Entry &);
 	void bumpIntoWall();
-	void initializeTBPMonitor(const int, const tExtraID);
+	void initializeTBPMonitor(const int, const ExtraID);
 	void playTBPMonitor();
 	void getExtraCompassMove(const ExtraTable::Entry &, FaderMoveSpec &);
 	Hotspot *getItemScreenSpot(Item *, DisplayElement *);
 	void openDoor();
 	void turnRight();
 	void turnLeft();
-	void closeDoorOffScreen(const tRoomID, const tDirectionConstant);
-	void playExtraMovie(const ExtraTable::Entry &, const tNotificationFlags, const tInputBits interruptionInput);
+	void closeDoorOffScreen(const RoomID, const DirectionConstant);
+	void playExtraMovie(const ExtraTable::Entry &, const NotificationFlags, const InputBits interruptionInput);
 	void handleInput(const Input &, const Hotspot *);
 	void arriveAtTSA25Red();
 	void startUpComparisonMonitor();
 	void shutDownComparisonMonitor();
-	void initializeComparisonMonitor(const int, const tExtraID);
+	void initializeComparisonMonitor(const int, const ExtraID);
 	void playLeftComparison();
 	void playRightComparison();
 	void startRobotGame();
@@ -134,14 +134,14 @@ protected:
 	void arriveFromMars();
 	void arriveFromWSC();
 
-	tInputBits getInputFilter();
-	void arriveAt(const tRoomID, const tDirectionConstant);
+	InputBits getInputFilter();
+	void arriveAt(const RoomID, const DirectionConstant);
 	void initializePegasusButtons(bool, bool);
 	void releaseSprites();
 	void showMainJumpMenu();
 	void arriveAtTSA37();
-	void receiveNotification(Notification *, const tNotificationFlags);
-	void checkRobotLocations(const tRoomID, const tDirectionConstant);
+	void receiveNotification(Notification *, const NotificationFlags);
+	void checkRobotLocations(const RoomID, const DirectionConstant);
 	void getExtraEntry(const uint32, ExtraTable::Entry &);
 
 	Sprite _sprite1, _sprite2, _sprite3;
diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
index da3a55c17f..823aa17d6c 100755
--- a/engines/pegasus/neighborhood/tsa/tinytsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
@@ -42,71 +42,67 @@ const TimeScale kTinyTSAMovieScale = 600;
 const TimeScale kTinyTSAFramesPerSecond = 15;
 const TimeScale kTinyTSAFrameDuration = 40;
 
-//	Alternate IDs.
-
-const tAlternateID kAltTinyTSANormal = 0;
-
-//	Hot Spot Activation IDs.
-
-const tHotSpotActivationID kActivationTinyTSAJumpToNorad = 1;
-const tHotSpotActivationID kActivationTinyTSAJumpToMars = 2;
-const tHotSpotActivationID kActivationTinyTSAJumpToWSC = 3;
-const tHotSpotActivationID kActivationTinyTSAReadyForJumpMenu = 4;
-const tHotSpotActivationID kActivationTinyTSAMainJumpMenu = 5;
-
-//	Hot Spot IDs.
-
-const tHotSpotID kTinyTSA37NorthJumpToNoradSpotID = 5000;
-const tHotSpotID kTinyTSA37NorthCancelNoradSpotID = 5001;
-const tHotSpotID kTinyTSA37NorthJumpToMarsSpotID = 5002;
-const tHotSpotID kTinyTSA37NorthCancelMarsSpotID = 5003;
-const tHotSpotID kTinyTSA37NorthJumpToWSCSpotID = 5004;
-const tHotSpotID kTinyTSA37NorthCancelWSCSpotID = 5005;
-const tHotSpotID kTinyTSA37NorthJumpMenuSpotID = 5006;
-const tHotSpotID kTinyTSA37NorthNoradMenuSpotID = 5007;
-const tHotSpotID kTinyTSA37NorthMarsMenuSpotID = 5008;
-const tHotSpotID kTinyTSA37NorthWSCMenuSpotID = 5009;
-
-//	Extra sequence IDs.
-
-const tExtraID kTinyTSA37PegasusDepart = 0;
-const tExtraID kTinyTSA37TimeJumpToPegasus = 1;
-const tExtraID kTinyTSA37RecallToDownload = 2;
-const tExtraID kTinyTSA37ExitHilited = 3;
-const tExtraID kTinyTSA37ExitToHorse = 4;
-const tExtraID kTinyTSA37JumpMenu000 = 5;
-const tExtraID kTinyTSA37JumpMenu001 = 6;
-const tExtraID kTinyTSA37JumpMenu010 = 7;
-const tExtraID kTinyTSA37JumpMenu011 = 8;
-const tExtraID kTinyTSA37JumpMenu100 = 9;
-const tExtraID kTinyTSA37JumpMenu101 = 10;
-const tExtraID kTinyTSA37JumpMenu110 = 11;
-const tExtraID kTinyTSA37JumpMenu111 = 12;
-const tExtraID kTinyTSA37JumpToWSCMenu = 13;
-const tExtraID kTinyTSA37CancelWSC = 14;
-const tExtraID kTinyTSA37JumpToWSC = 15;
-const tExtraID kTinyTSA37WSCToAI5 = 16;
-const tExtraID kTinyTSA37PegasusAI5 = 17;
-const tExtraID kTinyTSA37AI5ToWSC = 18;
-const tExtraID kTinyTSA37WSCToDepart = 19;
-const tExtraID kTinyTSA37JumpToMarsMenu = 20;
-const tExtraID kTinyTSA37CancelMars = 21;
-const tExtraID kTinyTSA37JumpToMars = 22;
-const tExtraID kTinyTSA37MarsToAI6 = 23;
-const tExtraID kTinyTSA37PegasusAI6 = 24;
-const tExtraID kTinyTSA37AI6ToMars = 25;
-const tExtraID kTinyTSA37MarsToDepart = 26;
-const tExtraID kTinyTSA37JumpToNoradMenu = 27;
-const tExtraID kTinyTSA37CancelNorad = 28;
-const tExtraID kTinyTSA37JumpToNorad = 29;
-const tExtraID kTinyTSA37NoradToAI7 = 30;
-const tExtraID kTinyTSA37PegasusAI7 = 31;
-const tExtraID kTinyTSA37AI7ToNorad = 32;
-const tExtraID kTinyTSA37NoradToDepart = 33;
-const tExtraID kTinyTSA37EnvironmentalScan = 34;
-const tExtraID kTinyTSA37DownloadToMainMenu = 35;
-const tExtraID kTinyTSA37DownloadToOpMemReview = 36;
-const tExtraID kTinyTSA37OpMemReviewToMainMenu = 37;
+// Alternate IDs.
+const AlternateID kAltTinyTSANormal = 0;
+
+// Hot Spot Activation IDs.
+const HotSpotActivationID kActivationTinyTSAJumpToNorad = 1;
+const HotSpotActivationID kActivationTinyTSAJumpToMars = 2;
+const HotSpotActivationID kActivationTinyTSAJumpToWSC = 3;
+const HotSpotActivationID kActivationTinyTSAReadyForJumpMenu = 4;
+const HotSpotActivationID kActivationTinyTSAMainJumpMenu = 5;
+
+// Hot Spot IDs.
+const HotSpotID kTinyTSA37NorthJumpToNoradSpotID = 5000;
+const HotSpotID kTinyTSA37NorthCancelNoradSpotID = 5001;
+const HotSpotID kTinyTSA37NorthJumpToMarsSpotID = 5002;
+const HotSpotID kTinyTSA37NorthCancelMarsSpotID = 5003;
+const HotSpotID kTinyTSA37NorthJumpToWSCSpotID = 5004;
+const HotSpotID kTinyTSA37NorthCancelWSCSpotID = 5005;
+const HotSpotID kTinyTSA37NorthJumpMenuSpotID = 5006;
+const HotSpotID kTinyTSA37NorthNoradMenuSpotID = 5007;
+const HotSpotID kTinyTSA37NorthMarsMenuSpotID = 5008;
+const HotSpotID kTinyTSA37NorthWSCMenuSpotID = 5009;
+
+// Extra sequence IDs.
+const ExtraID kTinyTSA37PegasusDepart = 0;
+const ExtraID kTinyTSA37TimeJumpToPegasus = 1;
+const ExtraID kTinyTSA37RecallToDownload = 2;
+const ExtraID kTinyTSA37ExitHilited = 3;
+const ExtraID kTinyTSA37ExitToHorse = 4;
+const ExtraID kTinyTSA37JumpMenu000 = 5;
+const ExtraID kTinyTSA37JumpMenu001 = 6;
+const ExtraID kTinyTSA37JumpMenu010 = 7;
+const ExtraID kTinyTSA37JumpMenu011 = 8;
+const ExtraID kTinyTSA37JumpMenu100 = 9;
+const ExtraID kTinyTSA37JumpMenu101 = 10;
+const ExtraID kTinyTSA37JumpMenu110 = 11;
+const ExtraID kTinyTSA37JumpMenu111 = 12;
+const ExtraID kTinyTSA37JumpToWSCMenu = 13;
+const ExtraID kTinyTSA37CancelWSC = 14;
+const ExtraID kTinyTSA37JumpToWSC = 15;
+const ExtraID kTinyTSA37WSCToAI5 = 16;
+const ExtraID kTinyTSA37PegasusAI5 = 17;
+const ExtraID kTinyTSA37AI5ToWSC = 18;
+const ExtraID kTinyTSA37WSCToDepart = 19;
+const ExtraID kTinyTSA37JumpToMarsMenu = 20;
+const ExtraID kTinyTSA37CancelMars = 21;
+const ExtraID kTinyTSA37JumpToMars = 22;
+const ExtraID kTinyTSA37MarsToAI6 = 23;
+const ExtraID kTinyTSA37PegasusAI6 = 24;
+const ExtraID kTinyTSA37AI6ToMars = 25;
+const ExtraID kTinyTSA37MarsToDepart = 26;
+const ExtraID kTinyTSA37JumpToNoradMenu = 27;
+const ExtraID kTinyTSA37CancelNorad = 28;
+const ExtraID kTinyTSA37JumpToNorad = 29;
+const ExtraID kTinyTSA37NoradToAI7 = 30;
+const ExtraID kTinyTSA37PegasusAI7 = 31;
+const ExtraID kTinyTSA37AI7ToNorad = 32;
+const ExtraID kTinyTSA37NoradToDepart = 33;
+const ExtraID kTinyTSA37EnvironmentalScan = 34;
+const ExtraID kTinyTSA37DownloadToMainMenu = 35;
+const ExtraID kTinyTSA37DownloadToOpMemReview = 36;
+const ExtraID kTinyTSA37OpMemReviewToMainMenu = 37;
 
 TinyTSA::TinyTSA(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHandler, owner, "Tiny TSA", kTinyTSAID) {
 }
@@ -186,16 +182,15 @@ void TinyTSA::loadAmbientLoops() {
 	loadLoopSound1("Sounds/TSA/T01NAE.NEW.22K.AIFF");
 }
 
-int16 TinyTSA::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) {
+int16 TinyTSA::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) {
 	return Neighborhood::getStaticCompassAngle(room, dir) - kCompassShift;
 }
 
-
 uint16 TinyTSA::getDateResID() const {
 	return kDate2318ID;
 }
 
-tInputBits TinyTSA::getInputFilter() {
+InputBits TinyTSA::getInputFilter() {
 	// Can't move forward...
 	return Neighborhood::getInputFilter() & ~(kFilterUpButton | kFilterUpAuto);
 }
@@ -204,6 +199,7 @@ void TinyTSA::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
 	if (clickedSpot) {
 		switch (clickedSpot->getObjectID()) {
 		case kTinyTSA37NorthJumpMenuSpotID:
+			// This hotspot isn't accessable from Tiny TSA
 			warning("jump menu spot");
 			return;
 		case kTinyTSA37NorthJumpToNoradSpotID:
@@ -252,7 +248,7 @@ void TinyTSA::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
 }
 
 void TinyTSA::showMainJumpMenu() {
-	tExtraID jumpMenuView = kTinyTSA37JumpMenu000;
+	ExtraID jumpMenuView = kTinyTSA37JumpMenu000;
 
 	if (GameState.getNoradFinished())
 		jumpMenuView += 4;
@@ -265,11 +261,11 @@ void TinyTSA::showMainJumpMenu() {
 	setCurrentActivation(kActivationTinyTSAMainJumpMenu);
 }
 
-void TinyTSA::checkContinuePoint(const tRoomID, const tDirectionConstant) {
+void TinyTSA::checkContinuePoint(const RoomID, const DirectionConstant) {
 	makeContinuePoint();
 }
 
-void TinyTSA::arriveAt(const tRoomID room, const tDirectionConstant direction) {
+void TinyTSA::arriveAt(const RoomID room, const DirectionConstant direction) {
 	Neighborhood::arriveAt(room, direction);
 
 	switch (GameState.getTSAState()) {
@@ -284,8 +280,8 @@ void TinyTSA::arriveAt(const tRoomID room, const tDirectionConstant direction) {
 	}
 }
 
-void TinyTSA::receiveNotification(Notification *notification, const tNotificationFlags flags) {
-	tExtraID lastExtra = _lastExtra;
+void TinyTSA::receiveNotification(Notification *notification, const NotificationFlags flags) {
+	ExtraID lastExtra = _lastExtra;
 	
 	Neighborhood::receiveNotification(notification, flags);
 
diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.h b/engines/pegasus/neighborhood/tsa/tinytsa.h
index 705010ece5..d7dee7f2fb 100755
--- a/engines/pegasus/neighborhood/tsa/tinytsa.h
+++ b/engines/pegasus/neighborhood/tsa/tinytsa.h
@@ -32,7 +32,7 @@ namespace Pegasus {
 
 //	Room IDs.
 
-const tRoomID kTinyTSA37 = 0;
+const RoomID kTinyTSA37 = 0;
 
 class TinyTSA : public Neighborhood {
 public:
@@ -43,7 +43,7 @@ public:
 	
 	void start();
 	
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 
 protected:
 	Common::String getBriefingMovie();
@@ -51,16 +51,16 @@ protected:
 	void loadAmbientLoops();
 	virtual void clickInHotspot(const Input &, const Hotspot *);
 	
-	virtual int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant);
+	virtual int16 getStaticCompassAngle(const RoomID, const DirectionConstant);
 	
 	void arriveFromNorad();
 	void arriveFromMars();
 	void arriveFromWSC();
 	
-	tInputBits getInputFilter();
-	void arriveAt(const tRoomID, const tDirectionConstant);
+	InputBits getInputFilter();
+	void arriveAt(const RoomID, const DirectionConstant);
 	void showMainJumpMenu();
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void receiveNotification(Notification *, const NotificationFlags);
 
 	Common::String getNavMovieName();
 	Common::String getSoundSpotsName() { return ""; }
diff --git a/engines/pegasus/neighborhood/turn.cpp b/engines/pegasus/neighborhood/turn.cpp
index 6b66b32d28..1157796f55 100755
--- a/engines/pegasus/neighborhood/turn.cpp
+++ b/engines/pegasus/neighborhood/turn.cpp
@@ -52,7 +52,7 @@ void TurnTable::clear() {
 	_entries.clear();
 }
 
-TurnTable::Entry TurnTable::findEntry(tRoomID room, tDirectionConstant direction, tTurnDirection turnDirection, tAlternateID altCode) {
+TurnTable::Entry TurnTable::findEntry(RoomID room, DirectionConstant direction, TurnDirection turnDirection, AlternateID altCode) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].turnDirection == turnDirection && _entries[i].altCode == altCode)
 			return _entries[i];
diff --git a/engines/pegasus/neighborhood/turn.h b/engines/pegasus/neighborhood/turn.h
index 48970d745e..acf770a297 100755
--- a/engines/pegasus/neighborhood/turn.h
+++ b/engines/pegasus/neighborhood/turn.h
@@ -51,14 +51,14 @@ public:
 		Entry() { endDirection = kNoDirection; }
 		bool isEmpty() { return endDirection == kNoDirection; }
 
-		tRoomID room;
-		tDirectionConstant direction;
-		tTurnDirection turnDirection;
-		tAlternateID altCode;
-		tDirectionConstant endDirection;
+		RoomID room;
+		DirectionConstant direction;
+		TurnDirection turnDirection;
+		AlternateID altCode;
+		DirectionConstant endDirection;
 	};
 
-	Entry findEntry(tRoomID room, tDirectionConstant direction, tTurnDirection turnDirection, tAlternateID altCode);
+	Entry findEntry(RoomID room, DirectionConstant direction, TurnDirection turnDirection, AlternateID altCode);
 
 private:
 	Common::Array<Entry> _entries;
diff --git a/engines/pegasus/neighborhood/view.cpp b/engines/pegasus/neighborhood/view.cpp
index e57fc88a13..4e46f5374e 100755
--- a/engines/pegasus/neighborhood/view.cpp
+++ b/engines/pegasus/neighborhood/view.cpp
@@ -49,7 +49,7 @@ void ViewTable::clear() {
 	_entries.clear();
 }
 
-ViewTable::Entry ViewTable::findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode) {
+ViewTable::Entry ViewTable::findEntry(RoomID room, DirectionConstant direction, AlternateID altCode) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].room == room && _entries[i].direction == direction && _entries[i].altCode == altCode)
 			return _entries[i];
diff --git a/engines/pegasus/neighborhood/view.h b/engines/pegasus/neighborhood/view.h
index 6a732d507e..1c57351671 100755
--- a/engines/pegasus/neighborhood/view.h
+++ b/engines/pegasus/neighborhood/view.h
@@ -51,13 +51,13 @@ public:
 		Entry() { time = 0xffffffff; }
 		bool isEmpty() { return time == 0xffffffff; }
 
-		tRoomID	room;
-		tDirectionConstant direction;
-		tAlternateID altCode;
+		RoomID	room;
+		DirectionConstant direction;
+		AlternateID altCode;
 		TimeValue time;
 	};
 
-	Entry findEntry(tRoomID room, tDirectionConstant direction, tAlternateID altCode);
+	Entry findEntry(RoomID room, DirectionConstant direction, AlternateID altCode);
 
 private:
 	Common::Array<Entry> _entries;
diff --git a/engines/pegasus/neighborhood/wsc/moleculebin.cpp b/engines/pegasus/neighborhood/wsc/moleculebin.cpp
index 429902d641..210c0ad313 100755
--- a/engines/pegasus/neighborhood/wsc/moleculebin.cpp
+++ b/engines/pegasus/neighborhood/wsc/moleculebin.cpp
@@ -29,14 +29,14 @@
 
 namespace Pegasus {
 
-static const tCoordType kMoleculeBinWidth = 138;
-static const tCoordType kMoleculeBinHeight = 128;
+static const CoordType kMoleculeBinWidth = 138;
+static const CoordType kMoleculeBinHeight = 128;
 
-static const tCoordType kMoleculeWidth = 66;
-static const tCoordType kMoleculeHeight = 40;
+static const CoordType kMoleculeWidth = 66;
+static const CoordType kMoleculeHeight = 40;
 
-static const tCoordType kMoleculeBinLeft = kNavAreaLeft + 286;
-static const tCoordType kMoleculeBinTop = kNavAreaLeft + 96;
+static const CoordType kMoleculeBinLeft = kNavAreaLeft + 286;
+static const CoordType kMoleculeBinTop = kNavAreaLeft + 96;
 
 //	Layouts:
 
diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index e42b90e821..6bc3a85c3f 100755
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -33,11 +33,11 @@
 
 namespace Pegasus {
 
-const tCanMoveForwardReason kCantMoveWatchingDiagnosis = kCantMoveLastReason + 1;
+const CanMoveForwardReason kCantMoveWatchingDiagnosis = kCantMoveLastReason + 1;
 
-const tCanTurnReason kCantTurnWatchingDiagnosis = kCantTurnLastReason + 1;
-const tCanTurnReason kCantTurnWatchingAnalysis = kCantTurnWatchingDiagnosis + 1;
-const tCanTurnReason kCantTurnInMoleculeGame = kCantTurnWatchingAnalysis + 1;
+const CanTurnReason kCantTurnWatchingDiagnosis = kCantTurnLastReason + 1;
+const CanTurnReason kCantTurnWatchingAnalysis = kCantTurnWatchingDiagnosis + 1;
+const CanTurnReason kCantTurnInMoleculeGame = kCantTurnWatchingAnalysis + 1;
 
 const TimeScale kMoleculesMovieScale = 600;
 const TimeValue kMoleculeLoopTime = 4 * kMoleculesMovieScale;
@@ -163,319 +163,314 @@ const TimeScale kWSCMovieScale = 600;
 const TimeScale kWSCFramesPerSecond = 15;
 const TimeScale kWSCFrameDuration = 40;
 
-//	Alternate IDs.
-
-const tAlternateID kAltWSCNormal = 0;
-const tAlternateID kAltWSCTookMachineGun = 1;
-const tAlternateID kAltWSCW0ZDoorOpen = 2;
-const tAlternateID kAltWSCPeopleAtW19North = 3;
-
-//	Room IDs.
-
-const tRoomID kWSC02 = 1;
-const tRoomID kWSC03 = 4;
-const tRoomID kWSC04 = 5;
-const tRoomID kWSC06 = 6;
-const tRoomID kWSC07 = 7;
-const tRoomID kWSC08 = 8;
-const tRoomID kWSC09 = 9;
-const tRoomID kWSC10 = 10;
-const tRoomID kWSC11 = 11;
-const tRoomID kWSC13 = 12;
-const tRoomID kWSC14 = 13;
-const tRoomID kWSC15 = 14;
-const tRoomID kWSC16 = 15;
-const tRoomID kWSC17 = 16;
-const tRoomID kWSC18 = 17;
-const tRoomID kWSC19 = 18;
-const tRoomID kWSC20 = 19;
-const tRoomID kWSC21 = 20;
-const tRoomID kWSC22 = 21;
-const tRoomID kWSC23 = 22;
-const tRoomID kWSC24 = 23;
-const tRoomID kWSC25 = 24;
-const tRoomID kWSC26 = 25;
-const tRoomID kWSC27 = 26;
-const tRoomID kWSC28 = 27;
-const tRoomID kWSC29 = 28;
-const tRoomID kWSC31 = 29;
-const tRoomID kWSC32 = 30;
-const tRoomID kWSC33 = 31;
-const tRoomID kWSC34 = 32;
-const tRoomID kWSC35 = 33;
-const tRoomID kWSC36 = 34;
-const tRoomID kWSC37 = 35;
-const tRoomID kWSC38 = 36;
-const tRoomID kWSC39 = 37;
-const tRoomID kWSC40 = 38;
-const tRoomID kWSC41 = 39;
-const tRoomID kWSC42 = 40;
-const tRoomID kWSC43 = 41;
-const tRoomID kWSC44 = 42;
-const tRoomID kWSC45 = 43;
-const tRoomID kWSC46 = 44;
-const tRoomID kWSC47 = 45;
-const tRoomID kWSC48 = 46;
-const tRoomID kWSC49 = 47;
-const tRoomID kWSC50 = 48;
-const tRoomID kWSC52 = 49;
-const tRoomID kWSC53 = 50;
-const tRoomID kWSC54 = 51;
-const tRoomID kWSC55 = 52;
-const tRoomID kWSC56 = 53;
-const tRoomID kWSC57 = 54;
-const tRoomID kWSC58 = 55;
-const tRoomID kWSC60 = 56;
-const tRoomID kWSC60East = 57;
-const tRoomID kWSC60North = 58;
-const tRoomID kWSC61 = 59;
-const tRoomID kWSC61South = 60;
-const tRoomID kWSC61West = 61;
-const tRoomID kWSC63 = 63;
-const tRoomID kWSC64 = 64;
-const tRoomID kWSC65 = 65;
-const tRoomID kWSC65Screen = 66;
-const tRoomID kWSC66 = 67;
-const tRoomID kWSC67 = 68;
-const tRoomID kWSC68 = 69;
-const tRoomID kWSC69 = 70;
-const tRoomID kWSC70 = 71;
-const tRoomID kWSC71 = 72;
-const tRoomID kWSC72 = 73;
-const tRoomID kWSC73 = 74;
-const tRoomID kWSC74 = 75;
-const tRoomID kWSC75 = 76;
-const tRoomID kWSC0Z = 77;
-const tRoomID kWSC76 = 78;
-const tRoomID kWSC77 = 79;
-const tRoomID kWSC78 = 80;
-const tRoomID kWSC79 = 81;
-const tRoomID kWSC80 = 82;
-const tRoomID kWSC81 = 83;
-const tRoomID kWSC82 = 84;
-const tRoomID kWSC83 = 85;
-const tRoomID kWSC84 = 86;
-const tRoomID kWSC85 = 87;
-const tRoomID kWSC86 = 88;
-const tRoomID kWSC87 = 89;
-const tRoomID kWSC88 = 90;
-const tRoomID kWSC89 = 91;
-const tRoomID kWSC90 = 92;
-const tRoomID kWSC91 = 93;
-const tRoomID kWSC92 = 94;
-const tRoomID kWSC93 = 95;
-const tRoomID kWSC94 = 96;
-const tRoomID kWSC95 = 97;
-const tRoomID kWSC96 = 98;
-const tRoomID kWSC97 = 99;
-const tRoomID kWSC98 = 100;
-const tRoomID kWSCDeathRoom = 101;
-
-//	Hot Spot Activation IDs.
-
-const tHotSpotActivationID kActivationZoomedInToAnalyzer = 1;
-const tHotSpotActivationID kActivationShotByRobot = 2;
-const tHotSpotActivationID kActivationWarnedAboutPoison = 3;
-const tHotSpotActivationID kActivationMorphScreenOff = 4;
-const tHotSpotActivationID kActivationReadyForMorph = 5;
-const tHotSpotActivationID kActivationMorphLooping = 6;
-const tHotSpotActivationID kActivationMorphInterrupted = 7;
-const tHotSpotActivationID kActivationW03NorthOff = 8;
-const tHotSpotActivationID kActivationW03NorthReadyForInstructions = 9;
-const tHotSpotActivationID kActivationW03NorthSawInstructions = 10;
-const tHotSpotActivationID kActivationW03NorthInGame = 11;
-const tHotSpotActivationID kActivationReadyForSynthesis = 12;
-const tHotSpotActivationID kActivationSynthesizerLooping = 13;
-const tHotSpotActivationID kActivationReadyForMap = 14;
-const tHotSpotActivationID kActivationSinclairOfficeLocked = 15;
-const tHotSpotActivationID kActivationW58SouthDoorLocked = 16;
-const tHotSpotActivationID kActivationW61SouthOff = 17;
-const tHotSpotActivationID kActivationW61SouthOn = 18;
-const tHotSpotActivationID kActivationW61MessagesOff = 19;
-const tHotSpotActivationID kActivationW61MessagesOn = 20;
-const tHotSpotActivationID kActivationWSCRobotHeadOpen = 21;
-const tHotSpotActivationID kActivationRobotTurning = 22;
-const tHotSpotActivationID kActivationRobotDead = 23;
-const tHotSpotActivationID kActivationRobotGone = 24;
-
-//	Hot Spot IDs.
-
-const tHotSpotID kWSCDropDartSpotID = 5000;
-const tHotSpotID kWSCTurnOnAnalyzerSpotID = 5001;
-const tHotSpotID kWSCAnalyzerScreenSpotID = 5002;
-const tHotSpotID kWSCSpinRobotSpotID = 5003;
-const tHotSpotID kWSC01YesSpotID = 5004;
-const tHotSpotID kWSC01NoSpotID = 5005;
-const tHotSpotID kWSC01AcknowledgeWarningSpotID = 5006;
-const tHotSpotID kWSC02SouthMorphSpotID = 5007;
-const tHotSpotID kWSC02SouthMessagesSpotID = 5008;
-const tHotSpotID kWSC02SouthMorphOutSpotID = 5009;
-const tHotSpotID kWSC02ActivateMorphScreenSpotID = 5010;
-const tHotSpotID kWSC02SouthStartMorphSpotID = 5011;
-const tHotSpotID kWSC02SouthInterruptMorphSpotID = 5012;
-const tHotSpotID kWSC02SouthMorphFinishedSpotID = 5013;
-const tHotSpotID kWSC02SouthTakeArgonSpotID = 5014;
-const tHotSpotID kWSC02SouthMessagesOutSpotID = 5015;
-const tHotSpotID kWSC02SouthTakeNitrogenSpotID = 5016;
-const tHotSpotID kWSC02SouthPlayMessagesSpotID = 5017;
-const tHotSpotID kWSC03NorthActivateScreenSpotID = 5018;
-const tHotSpotID kWSC03NorthBuildMoleculeSpotID = 5019;
-const tHotSpotID kWSC03NorthProceedSpotID = 5020;
-const tHotSpotID kWSC03NorthMolecule1SpotID = 5021;
-const tHotSpotID kWSC03NorthMolecule2SpotID = 5022;
-const tHotSpotID kWSC03NorthMolecule3SpotID = 5023;
-const tHotSpotID kWSC03NorthMolecule4SpotID = 5024;
-const tHotSpotID kWSC03NorthMolecule5SpotID = 5025;
-const tHotSpotID kWSC03NorthMolecule6SpotID = 5026;
-const tHotSpotID kWSC03SouthActivateSynthesizerSpotID = 5027;
-const tHotSpotID kWSC03SouthPickUpAntidoteSpotID = 5028;
-const tHotSpotID kWSC07SouthMapSpotID = 5029;
-const tHotSpotID kW42EastUnlockDoorSpotID = 5030;
-const tHotSpotID kW56NorthMapSpotID = 5031;
-const tHotSpotID kW58SouthPryDoorSpotID = 5032;
-const tHotSpotID kWSC60EastSpotID = 5033;
-const tHotSpotID kWSC60NorthSpotID = 5034;
-const tHotSpotID kWSC60EastOutSpotID = 5035;
-const tHotSpotID kWSC60NorthOutSpotID = 5036;
-const tHotSpotID kWSC61EastSpotID = 5037;
-const tHotSpotID kWSC61SouthSpotID = 5038;
-const tHotSpotID kW61SouthMachineGunSpotID = 5039;
-const tHotSpotID kW61SouthDropMachineGunSpotID = 5040;
-const tHotSpotID kWSC61WestSpotID = 5041;
-const tHotSpotID kWSC61SouthOutSpotID = 5042;
-const tHotSpotID kW61SouthActivateSpotID = 5043;
-const tHotSpotID kW61SmartAlloysSpotID = 5044;
-const tHotSpotID kW61MorphingSpotID = 5045;
-const tHotSpotID kW61TimeBendingSpotID = 5046;
-const tHotSpotID kWSC61WestOutSpotID = 5047;
-const tHotSpotID kW61TurnOnMessagesSpotID = 5048;
-const tHotSpotID kW61WhiteMessageSpotID = 5049;
-const tHotSpotID kW61WalchekMessageSpotID = 5050;
-const tHotSpotID kWSC65SouthScreenSpotID = 5051;
-const tHotSpotID kWSC65SouthScreenOutSpotID = 5052;
-const tHotSpotID kW98RetinalChipSpotID = 5053;
-const tHotSpotID kW98MapChipSpotID = 5054;
-const tHotSpotID kW98OpticalChipSpotID = 5055;
-const tHotSpotID kW98DropArgonSpotID = 5056;
-const tHotSpotID kW98GrabCableSpotID = 5057;
-const tHotSpotID kW98OpenRobotSpotID = 5058;
-const tHotSpotID kW98StunGunSpotID = 5059;
-
-//	Extra sequence IDs.
-
-const tExtraID kWSCArrivalFromTSA = 0;
-const tExtraID kWSCShotByRobot = 1;
-const tExtraID kWSCDartScan1 = 2;
-const tExtraID kWSCDartScan2 = 3;
-const tExtraID kWSCDartScanNo = 4;
-const tExtraID kWSCDartScan3 = 5;
-const tExtraID kWSCAnalyzerPowerUp = 6;
-const tExtraID kWSCAnalyzerPowerUpWithDart = 7;
-const tExtraID kWSCDropDartIntoAnalyzer = 8;
-const tExtraID kWSCAnalyzeDart = 9;
-const tExtraID kWSCZoomOutFromAnalyzer = 10;
-const tExtraID kWSCSpinRobot = 11;
-const tExtraID kWSC02MorphZoomNoArgon = 12;
-const tExtraID kWSC02MessagesZoomNoNitrogen = 13;
-const tExtraID kWSC02ZoomOutNoArgon = 14;
-const tExtraID kWSC02TurnOnMorphScreen = 15;
-const tExtraID kWSC02DropToMorphExperiment = 16;
-const tExtraID kWSC02MorphLoop = 17;
-const tExtraID kWSC02MorphInterruption = 18;
-const tExtraID kWSC02MorphFinished = 19;
-const tExtraID kWSC02TurnOffMorphScreen = 20;
-const tExtraID kWSC02SouthViewNoArgon = 21;
-const tExtraID kMessagesMovedToOffice = 22;
-const tExtraID kMessagesOff = 23;
-const tExtraID kMessagesZoomOutNoNitrogen = 24;
-const tExtraID kMessagesMovedToOfficeNoNitrogen = 25;
-const tExtraID kMessagesOffNoNitrogen = 26;
-const tExtraID kMessagesViewNoNitrogen = 27;
-const tExtraID kMessagesViewMachineOnNoNitrogen = 28;
-const tExtraID kW03NorthActivate = 29;
-const tExtraID kW03NorthGetData = 30;
-const tExtraID kW03NorthInstructions = 31;
-const tExtraID kW03NorthPrepMolecule1 = 32;
-const tExtraID kW03NorthPrepMolecule2 = 33;
-const tExtraID kW03NorthPrepMolecule3 = 34;
-const tExtraID kW03NorthFinishSynthesis = 35;
-const tExtraID kW03SouthCreateAntidote = 36;
-const tExtraID kW03SouthAntidoteLoop = 37;
-const tExtraID kW03SouthDeactivate = 38;
-const tExtraID kW03SouthViewNoAntidote = 39;
-const tExtraID kWSC07SouthMap = 40;
-const tExtraID kW17WestPeopleCrossing = 41;
-const tExtraID kW17WestPeopleCrossingView = 42;
-const tExtraID kW21SouthPeopleCrossing = 43;
-const tExtraID kW24SouthPeopleCrossing = 44;
-const tExtraID kW34EastPeopleCrossing = 45;
-const tExtraID kW36WestPeopleCrossing = 46;
-const tExtraID kW38NorthPeopleCrossing = 47;
-const tExtraID kW46SouthPeopleCrossing = 48;
-const tExtraID kW49NorthPeopleCrossing = 49;
-const tExtraID kW49NorthPeopleCrossingView = 50;
-const tExtraID kWSC56SouthMap = 51;
-const tExtraID kNerdAtTheDoor1 = 52;
-const tExtraID kNerdAtTheDoor2 = 53;
-const tExtraID kW61SouthZoomInNoGun = 54;
-const tExtraID kW61Brochure = 55;
-const tExtraID kW61SouthScreenOnWithGun = 56;
-const tExtraID kW61SouthScreenOffWithGun = 57;
-const tExtraID kW61SouthSmartAlloysWithGun = 58;
-const tExtraID kW61SouthMorphingWithGun = 59;
-const tExtraID kW61SouthTimeBendingWithGun = 60;
-const tExtraID kW61SouthZoomOutNoGun = 61;
-const tExtraID kW61SouthScreenOnNoGun = 62;
-const tExtraID kW61SouthScreenOffNoGun = 63;
-const tExtraID kW61SouthSmartAlloysNoGun = 64;
-const tExtraID kW61SouthMorphingNoGun = 65;
-const tExtraID kW61SouthTimeBendingNoGun = 66;
-const tExtraID kW61MessagesOn = 67;
-const tExtraID kW61MessagesOff = 68;
-const tExtraID kW61WhiteMessage = 69;
-const tExtraID kW61WalchekMessage = 70;
-const tExtraID kW61WalchekEasterEgg1 = 71;
-const tExtraID kW62SouthPlasmaRobotAppears = 72;
-const tExtraID kW62ZoomToRobot = 73;
-const tExtraID kW62ZoomOutFromRobot = 74;
-const tExtraID kW62PlasmaDodgeSurvive = 75;
-const tExtraID kW62PlasmaDodgeDie = 76;
-const tExtraID kW65SouthSinclairLecture = 77;
-const tExtraID kW73WestPeopleCrossing = 78;
-const tExtraID kW73WestPeopleCrossingView = 79;
-const tExtraID kW0ZSpottedByWomen = 80;
-const tExtraID kW95RobotShoots = 81;
-const tExtraID kW98MorphsToRobot = 82;
-const tExtraID kW98RobotShoots = 83;
-const tExtraID kW98RobotShocked = 84;
-const tExtraID kW98RobotGassed = 85;
-const tExtraID kW98RobotHeadOpensDark = 86;
-const tExtraID kW98RobotHead000Dark = 87;
-const tExtraID kW98RobotHead001Dark = 88;
-const tExtraID kW98RobotHead010Dark = 89;
-const tExtraID kW98RobotHead011Dark = 90;
-const tExtraID kW98RobotHead100Dark = 91;
-const tExtraID kW98RobotHead101Dark = 92;
-const tExtraID kW98RobotHead110Dark = 93;
-const tExtraID kW98RobotHead111Dark = 94;
-const tExtraID kW98RobotHeadClosesDark = 95;
-const tExtraID kW98WestViewWithGunDark = 96;
-const tExtraID kW98WestViewNoGunDark = 97;
-const tExtraID kW98RobotHeadOpensLight = 98;
-const tExtraID kW98RobotHead000Light = 99;
-const tExtraID kW98RobotHead001Light = 100;
-const tExtraID kW98RobotHead010Light = 101;
-const tExtraID kW98RobotHead011Light = 102;
-const tExtraID kW98RobotHead100Light = 103;
-const tExtraID kW98RobotHead101Light = 104;
-const tExtraID kW98RobotHead110Light = 105;
-const tExtraID kW98RobotHead111Light = 106;
-const tExtraID kW98RobotHeadClosesLight = 107;
-const tExtraID kW98WestViewWithGunLight = 108;
-const tExtraID kW98WestViewNoGunLight = 109;
-
-const tCoordType kMoleculesMovieLeft = kNavAreaLeft + 112;
-const tCoordType kMoleculesMovieTop = kNavAreaTop + 40;
+// Alternate IDs.
+const AlternateID kAltWSCNormal = 0;
+const AlternateID kAltWSCTookMachineGun = 1;
+const AlternateID kAltWSCW0ZDoorOpen = 2;
+const AlternateID kAltWSCPeopleAtW19North = 3;
+
+// Room IDs.
+const RoomID kWSC02 = 1;
+const RoomID kWSC03 = 4;
+const RoomID kWSC04 = 5;
+const RoomID kWSC06 = 6;
+const RoomID kWSC07 = 7;
+const RoomID kWSC08 = 8;
+const RoomID kWSC09 = 9;
+const RoomID kWSC10 = 10;
+const RoomID kWSC11 = 11;
+const RoomID kWSC13 = 12;
+const RoomID kWSC14 = 13;
+const RoomID kWSC15 = 14;
+const RoomID kWSC16 = 15;
+const RoomID kWSC17 = 16;
+const RoomID kWSC18 = 17;
+const RoomID kWSC19 = 18;
+const RoomID kWSC20 = 19;
+const RoomID kWSC21 = 20;
+const RoomID kWSC22 = 21;
+const RoomID kWSC23 = 22;
+const RoomID kWSC24 = 23;
+const RoomID kWSC25 = 24;
+const RoomID kWSC26 = 25;
+const RoomID kWSC27 = 26;
+const RoomID kWSC28 = 27;
+const RoomID kWSC29 = 28;
+const RoomID kWSC31 = 29;
+const RoomID kWSC32 = 30;
+const RoomID kWSC33 = 31;
+const RoomID kWSC34 = 32;
+const RoomID kWSC35 = 33;
+const RoomID kWSC36 = 34;
+const RoomID kWSC37 = 35;
+const RoomID kWSC38 = 36;
+const RoomID kWSC39 = 37;
+const RoomID kWSC40 = 38;
+const RoomID kWSC41 = 39;
+const RoomID kWSC42 = 40;
+const RoomID kWSC43 = 41;
+const RoomID kWSC44 = 42;
+const RoomID kWSC45 = 43;
+const RoomID kWSC46 = 44;
+const RoomID kWSC47 = 45;
+const RoomID kWSC48 = 46;
+const RoomID kWSC49 = 47;
+const RoomID kWSC50 = 48;
+const RoomID kWSC52 = 49;
+const RoomID kWSC53 = 50;
+const RoomID kWSC54 = 51;
+const RoomID kWSC55 = 52;
+const RoomID kWSC56 = 53;
+const RoomID kWSC57 = 54;
+const RoomID kWSC58 = 55;
+const RoomID kWSC60 = 56;
+const RoomID kWSC60East = 57;
+const RoomID kWSC60North = 58;
+const RoomID kWSC61 = 59;
+const RoomID kWSC61South = 60;
+const RoomID kWSC61West = 61;
+const RoomID kWSC63 = 63;
+const RoomID kWSC64 = 64;
+const RoomID kWSC65 = 65;
+const RoomID kWSC65Screen = 66;
+const RoomID kWSC66 = 67;
+const RoomID kWSC67 = 68;
+const RoomID kWSC68 = 69;
+const RoomID kWSC69 = 70;
+const RoomID kWSC70 = 71;
+const RoomID kWSC71 = 72;
+const RoomID kWSC72 = 73;
+const RoomID kWSC73 = 74;
+const RoomID kWSC74 = 75;
+const RoomID kWSC75 = 76;
+const RoomID kWSC0Z = 77;
+const RoomID kWSC76 = 78;
+const RoomID kWSC77 = 79;
+const RoomID kWSC78 = 80;
+const RoomID kWSC79 = 81;
+const RoomID kWSC80 = 82;
+const RoomID kWSC81 = 83;
+const RoomID kWSC82 = 84;
+const RoomID kWSC83 = 85;
+const RoomID kWSC84 = 86;
+const RoomID kWSC85 = 87;
+const RoomID kWSC86 = 88;
+const RoomID kWSC87 = 89;
+const RoomID kWSC88 = 90;
+const RoomID kWSC89 = 91;
+const RoomID kWSC90 = 92;
+const RoomID kWSC91 = 93;
+const RoomID kWSC92 = 94;
+const RoomID kWSC93 = 95;
+const RoomID kWSC94 = 96;
+const RoomID kWSC95 = 97;
+const RoomID kWSC96 = 98;
+const RoomID kWSC97 = 99;
+const RoomID kWSC98 = 100;
+const RoomID kWSCDeathRoom = 101;
+
+// Hot Spot Activation IDs.
+const HotSpotActivationID kActivationZoomedInToAnalyzer = 1;
+const HotSpotActivationID kActivationShotByRobot = 2;
+const HotSpotActivationID kActivationWarnedAboutPoison = 3;
+const HotSpotActivationID kActivationMorphScreenOff = 4;
+const HotSpotActivationID kActivationReadyForMorph = 5;
+const HotSpotActivationID kActivationMorphLooping = 6;
+const HotSpotActivationID kActivationMorphInterrupted = 7;
+const HotSpotActivationID kActivationW03NorthOff = 8;
+const HotSpotActivationID kActivationW03NorthReadyForInstructions = 9;
+const HotSpotActivationID kActivationW03NorthSawInstructions = 10;
+const HotSpotActivationID kActivationW03NorthInGame = 11;
+const HotSpotActivationID kActivationReadyForSynthesis = 12;
+const HotSpotActivationID kActivationSynthesizerLooping = 13;
+const HotSpotActivationID kActivationReadyForMap = 14;
+const HotSpotActivationID kActivationSinclairOfficeLocked = 15;
+const HotSpotActivationID kActivationW58SouthDoorLocked = 16;
+const HotSpotActivationID kActivationW61SouthOff = 17;
+const HotSpotActivationID kActivationW61SouthOn = 18;
+const HotSpotActivationID kActivationW61MessagesOff = 19;
+const HotSpotActivationID kActivationW61MessagesOn = 20;
+const HotSpotActivationID kActivationWSCRobotHeadOpen = 21;
+const HotSpotActivationID kActivationRobotTurning = 22;
+const HotSpotActivationID kActivationRobotDead = 23;
+const HotSpotActivationID kActivationRobotGone = 24;
+
+// Hot Spot IDs.
+const HotSpotID kWSCDropDartSpotID = 5000;
+const HotSpotID kWSCTurnOnAnalyzerSpotID = 5001;
+const HotSpotID kWSCAnalyzerScreenSpotID = 5002;
+const HotSpotID kWSCSpinRobotSpotID = 5003;
+const HotSpotID kWSC01YesSpotID = 5004;
+const HotSpotID kWSC01NoSpotID = 5005;
+const HotSpotID kWSC01AcknowledgeWarningSpotID = 5006;
+const HotSpotID kWSC02SouthMorphSpotID = 5007;
+const HotSpotID kWSC02SouthMessagesSpotID = 5008;
+const HotSpotID kWSC02SouthMorphOutSpotID = 5009;
+const HotSpotID kWSC02ActivateMorphScreenSpotID = 5010;
+const HotSpotID kWSC02SouthStartMorphSpotID = 5011;
+const HotSpotID kWSC02SouthInterruptMorphSpotID = 5012;
+const HotSpotID kWSC02SouthMorphFinishedSpotID = 5013;
+const HotSpotID kWSC02SouthTakeArgonSpotID = 5014;
+const HotSpotID kWSC02SouthMessagesOutSpotID = 5015;
+const HotSpotID kWSC02SouthTakeNitrogenSpotID = 5016;
+const HotSpotID kWSC02SouthPlayMessagesSpotID = 5017;
+const HotSpotID kWSC03NorthActivateScreenSpotID = 5018;
+const HotSpotID kWSC03NorthBuildMoleculeSpotID = 5019;
+const HotSpotID kWSC03NorthProceedSpotID = 5020;
+const HotSpotID kWSC03NorthMolecule1SpotID = 5021;
+const HotSpotID kWSC03NorthMolecule2SpotID = 5022;
+const HotSpotID kWSC03NorthMolecule3SpotID = 5023;
+const HotSpotID kWSC03NorthMolecule4SpotID = 5024;
+const HotSpotID kWSC03NorthMolecule5SpotID = 5025;
+const HotSpotID kWSC03NorthMolecule6SpotID = 5026;
+const HotSpotID kWSC03SouthActivateSynthesizerSpotID = 5027;
+const HotSpotID kWSC03SouthPickUpAntidoteSpotID = 5028;
+const HotSpotID kWSC07SouthMapSpotID = 5029;
+const HotSpotID kW42EastUnlockDoorSpotID = 5030;
+const HotSpotID kW56NorthMapSpotID = 5031;
+const HotSpotID kW58SouthPryDoorSpotID = 5032;
+const HotSpotID kWSC60EastSpotID = 5033;
+const HotSpotID kWSC60NorthSpotID = 5034;
+const HotSpotID kWSC60EastOutSpotID = 5035;
+const HotSpotID kWSC60NorthOutSpotID = 5036;
+const HotSpotID kWSC61EastSpotID = 5037;
+const HotSpotID kWSC61SouthSpotID = 5038;
+const HotSpotID kW61SouthMachineGunSpotID = 5039;
+const HotSpotID kW61SouthDropMachineGunSpotID = 5040;
+const HotSpotID kWSC61WestSpotID = 5041;
+const HotSpotID kWSC61SouthOutSpotID = 5042;
+const HotSpotID kW61SouthActivateSpotID = 5043;
+const HotSpotID kW61SmartAlloysSpotID = 5044;
+const HotSpotID kW61MorphingSpotID = 5045;
+const HotSpotID kW61TimeBendingSpotID = 5046;
+const HotSpotID kWSC61WestOutSpotID = 5047;
+const HotSpotID kW61TurnOnMessagesSpotID = 5048;
+const HotSpotID kW61WhiteMessageSpotID = 5049;
+const HotSpotID kW61WalchekMessageSpotID = 5050;
+const HotSpotID kWSC65SouthScreenSpotID = 5051;
+const HotSpotID kWSC65SouthScreenOutSpotID = 5052;
+const HotSpotID kW98RetinalChipSpotID = 5053;
+const HotSpotID kW98MapChipSpotID = 5054;
+const HotSpotID kW98OpticalChipSpotID = 5055;
+const HotSpotID kW98DropArgonSpotID = 5056;
+const HotSpotID kW98GrabCableSpotID = 5057;
+const HotSpotID kW98OpenRobotSpotID = 5058;
+const HotSpotID kW98StunGunSpotID = 5059;
+
+// Extra sequence IDs.
+const ExtraID kWSCArrivalFromTSA = 0;
+const ExtraID kWSCShotByRobot = 1;
+const ExtraID kWSCDartScan1 = 2;
+const ExtraID kWSCDartScan2 = 3;
+const ExtraID kWSCDartScanNo = 4;
+const ExtraID kWSCDartScan3 = 5;
+const ExtraID kWSCAnalyzerPowerUp = 6;
+const ExtraID kWSCAnalyzerPowerUpWithDart = 7;
+const ExtraID kWSCDropDartIntoAnalyzer = 8;
+const ExtraID kWSCAnalyzeDart = 9;
+const ExtraID kWSCZoomOutFromAnalyzer = 10;
+const ExtraID kWSCSpinRobot = 11;
+const ExtraID kWSC02MorphZoomNoArgon = 12;
+const ExtraID kWSC02MessagesZoomNoNitrogen = 13;
+const ExtraID kWSC02ZoomOutNoArgon = 14;
+const ExtraID kWSC02TurnOnMorphScreen = 15;
+const ExtraID kWSC02DropToMorphExperiment = 16;
+const ExtraID kWSC02MorphLoop = 17;
+const ExtraID kWSC02MorphInterruption = 18;
+const ExtraID kWSC02MorphFinished = 19;
+const ExtraID kWSC02TurnOffMorphScreen = 20;
+const ExtraID kWSC02SouthViewNoArgon = 21;
+const ExtraID kMessagesMovedToOffice = 22;
+const ExtraID kMessagesOff = 23;
+const ExtraID kMessagesZoomOutNoNitrogen = 24;
+const ExtraID kMessagesMovedToOfficeNoNitrogen = 25;
+const ExtraID kMessagesOffNoNitrogen = 26;
+const ExtraID kMessagesViewNoNitrogen = 27;
+const ExtraID kMessagesViewMachineOnNoNitrogen = 28;
+const ExtraID kW03NorthActivate = 29;
+const ExtraID kW03NorthGetData = 30;
+const ExtraID kW03NorthInstructions = 31;
+const ExtraID kW03NorthPrepMolecule1 = 32;
+const ExtraID kW03NorthPrepMolecule2 = 33;
+const ExtraID kW03NorthPrepMolecule3 = 34;
+const ExtraID kW03NorthFinishSynthesis = 35;
+const ExtraID kW03SouthCreateAntidote = 36;
+const ExtraID kW03SouthAntidoteLoop = 37;
+const ExtraID kW03SouthDeactivate = 38;
+const ExtraID kW03SouthViewNoAntidote = 39;
+const ExtraID kWSC07SouthMap = 40;
+const ExtraID kW17WestPeopleCrossing = 41;
+const ExtraID kW17WestPeopleCrossingView = 42;
+const ExtraID kW21SouthPeopleCrossing = 43;
+const ExtraID kW24SouthPeopleCrossing = 44;
+const ExtraID kW34EastPeopleCrossing = 45;
+const ExtraID kW36WestPeopleCrossing = 46;
+const ExtraID kW38NorthPeopleCrossing = 47;
+const ExtraID kW46SouthPeopleCrossing = 48;
+const ExtraID kW49NorthPeopleCrossing = 49;
+const ExtraID kW49NorthPeopleCrossingView = 50;
+const ExtraID kWSC56SouthMap = 51;
+const ExtraID kNerdAtTheDoor1 = 52;
+const ExtraID kNerdAtTheDoor2 = 53;
+const ExtraID kW61SouthZoomInNoGun = 54;
+const ExtraID kW61Brochure = 55;
+const ExtraID kW61SouthScreenOnWithGun = 56;
+const ExtraID kW61SouthScreenOffWithGun = 57;
+const ExtraID kW61SouthSmartAlloysWithGun = 58;
+const ExtraID kW61SouthMorphingWithGun = 59;
+const ExtraID kW61SouthTimeBendingWithGun = 60;
+const ExtraID kW61SouthZoomOutNoGun = 61;
+const ExtraID kW61SouthScreenOnNoGun = 62;
+const ExtraID kW61SouthScreenOffNoGun = 63;
+const ExtraID kW61SouthSmartAlloysNoGun = 64;
+const ExtraID kW61SouthMorphingNoGun = 65;
+const ExtraID kW61SouthTimeBendingNoGun = 66;
+const ExtraID kW61MessagesOn = 67;
+const ExtraID kW61MessagesOff = 68;
+const ExtraID kW61WhiteMessage = 69;
+const ExtraID kW61WalchekMessage = 70;
+const ExtraID kW61WalchekEasterEgg1 = 71;
+const ExtraID kW62SouthPlasmaRobotAppears = 72;
+const ExtraID kW62ZoomToRobot = 73;
+const ExtraID kW62ZoomOutFromRobot = 74;
+const ExtraID kW62PlasmaDodgeSurvive = 75;
+const ExtraID kW62PlasmaDodgeDie = 76;
+const ExtraID kW65SouthSinclairLecture = 77;
+const ExtraID kW73WestPeopleCrossing = 78;
+const ExtraID kW73WestPeopleCrossingView = 79;
+const ExtraID kW0ZSpottedByWomen = 80;
+const ExtraID kW95RobotShoots = 81;
+const ExtraID kW98MorphsToRobot = 82;
+const ExtraID kW98RobotShoots = 83;
+const ExtraID kW98RobotShocked = 84;
+const ExtraID kW98RobotGassed = 85;
+const ExtraID kW98RobotHeadOpensDark = 86;
+const ExtraID kW98RobotHead000Dark = 87;
+const ExtraID kW98RobotHead001Dark = 88;
+const ExtraID kW98RobotHead010Dark = 89;
+const ExtraID kW98RobotHead011Dark = 90;
+const ExtraID kW98RobotHead100Dark = 91;
+const ExtraID kW98RobotHead101Dark = 92;
+const ExtraID kW98RobotHead110Dark = 93;
+const ExtraID kW98RobotHead111Dark = 94;
+const ExtraID kW98RobotHeadClosesDark = 95;
+const ExtraID kW98WestViewWithGunDark = 96;
+const ExtraID kW98WestViewNoGunDark = 97;
+const ExtraID kW98RobotHeadOpensLight = 98;
+const ExtraID kW98RobotHead000Light = 99;
+const ExtraID kW98RobotHead001Light = 100;
+const ExtraID kW98RobotHead010Light = 101;
+const ExtraID kW98RobotHead011Light = 102;
+const ExtraID kW98RobotHead100Light = 103;
+const ExtraID kW98RobotHead101Light = 104;
+const ExtraID kW98RobotHead110Light = 105;
+const ExtraID kW98RobotHead111Light = 106;
+const ExtraID kW98RobotHeadClosesLight = 107;
+const ExtraID kW98WestViewWithGunLight = 108;
+const ExtraID kW98WestViewNoGunLight = 109;
+
+const CoordType kMoleculesMovieLeft = kNavAreaLeft + 112;
+const CoordType kMoleculesMovieTop = kNavAreaTop + 40;
 
 WSC::WSC(InputHandler *nextHandler, PegasusEngine *owner) : Neighborhood(nextHandler, owner, "WSC", kWSCID),
 		_moleculesMovie(kNoDisplayElement) {
@@ -618,7 +613,7 @@ Common::String WSC::getBriefingMovie() {
 }
 
 Common::String WSC::getEnvScanMovie() {
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 	
 	if (room >= kWSC01 && room <= kWSC04)
 		return "Images/AI/WSC/XWE1";
@@ -849,8 +844,8 @@ bool WSC::okayToJump() {
 	return result;
 }
 
-TimeValue WSC::getViewTime(const tRoomID room, const tDirectionConstant direction) {
-	tExtraID viewExtra = 0xffffffff;
+TimeValue WSC::getViewTime(const RoomID room, const DirectionConstant direction) {
+	ExtraID viewExtra = 0xffffffff;
 	ExtraTable::Entry extra;
 
 	switch (MakeRoomView(room, direction)) {
@@ -935,7 +930,7 @@ TimeValue WSC::getViewTime(const tRoomID room, const tDirectionConstant directio
 	return Neighborhood::getViewTime(room, direction);
 }
 
-void WSC::findSpotEntry(const tRoomID room, const tDirectionConstant direction, tSpotFlags flags, SpotTable::Entry &spotEntry) {
+void WSC::findSpotEntry(const RoomID room, const DirectionConstant direction, SpotFlags flags, SpotTable::Entry &spotEntry) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kWSC58, kSouth):
 	case MakeRoomView(kWSC79, kWest):
@@ -949,11 +944,11 @@ void WSC::findSpotEntry(const tRoomID room, const tDirectionConstant direction,
 	Neighborhood::findSpotEntry(room, direction, flags, spotEntry);
 }
 
-void WSC::getZoomEntry(const tHotSpotID id, ZoomTable::Entry &zoomEntry) {
+void WSC::getZoomEntry(const HotSpotID id, ZoomTable::Entry &zoomEntry) {
 	Neighborhood::getZoomEntry(id, zoomEntry);
 
 	ExtraTable::Entry extra;
-	tExtraID zoomExtra = 0xffffffff;
+	ExtraID zoomExtra = 0xffffffff;
 
 	switch (id) {
 	case kWSC02SouthMessagesSpotID:
@@ -1037,7 +1032,7 @@ void WSC::getExtraEntry(const uint32 id, ExtraTable::Entry &extraEntry) {
 	}
 }
 
-tCanMoveForwardReason WSC::canMoveForward(ExitTable::Entry &entry) {
+CanMoveForwardReason WSC::canMoveForward(ExitTable::Entry &entry) {
 	if (GameState.getCurrentRoomAndView() == MakeRoomView(kWSC01, kWest) &&
 			getCurrentActivation() != kActivateHotSpotAlways)
 		return kCantMoveWatchingDiagnosis;
@@ -1046,7 +1041,7 @@ tCanMoveForwardReason WSC::canMoveForward(ExitTable::Entry &entry) {
 }
 
 // Also add cases here for compound analyzer...
-tCanTurnReason WSC::canTurn(tTurnDirection turnDirection, tDirectionConstant &nextDir) {
+CanTurnReason WSC::canTurn(TurnDirection turnDirection, DirectionConstant &nextDir) {
 	switch (GameState.getCurrentRoomAndView()) {
 	case MakeRoomView(kWSC01, kWest):
 		if (getCurrentActivation() != kActivateHotSpotAlways)
@@ -1065,7 +1060,7 @@ tCanTurnReason WSC::canTurn(tTurnDirection turnDirection, tDirectionConstant &ne
 	return Neighborhood::canTurn(turnDirection, nextDir);
 }
 
-tCanOpenDoorReason WSC::canOpenDoor(DoorTable::Entry &entry) {
+CanOpenDoorReason WSC::canOpenDoor(DoorTable::Entry &entry) {
 	switch (GameState.getCurrentRoom()) {
 	case kWSC42:
 		if (!_privateFlags.getFlag(kWSCPrivateSinclairOfficeOpenFlag))
@@ -1085,7 +1080,7 @@ void WSC::bumpIntoWall() {
 	Neighborhood::bumpIntoWall();
 }
 
-void WSC::closeDoorOffScreen(const tRoomID room, const tDirectionConstant) {
+void WSC::closeDoorOffScreen(const RoomID room, const DirectionConstant) {
 	Item *keyCard;
 
 	switch (room) {
@@ -1122,12 +1117,12 @@ void WSC::closeDoorOffScreen(const tRoomID room, const tDirectionConstant) {
 	}
 }
 
-void WSC::cantMoveThatWay(tCanMoveForwardReason reason) {
+void WSC::cantMoveThatWay(CanMoveForwardReason reason) {
 	if (reason != kCantMoveWatchingDiagnosis)
 		Neighborhood::cantMoveThatWay(reason);
 }
 
-void WSC::cantOpenDoor(tCanOpenDoorReason reason) {
+void WSC::cantOpenDoor(CanOpenDoorReason reason) {
 	switch (GameState.getCurrentRoomAndView()) {
 	case MakeRoomView(kWSC22, kWest):
 		playSpotSoundSync(kNakamuraNotHomeIn, kNakamuraNotHomeOut);
@@ -1294,14 +1289,14 @@ void WSC::zoomTo(const Hotspot *hotspot) {
 	Neighborhood::zoomTo(hotspot);
 }
 
-void WSC::startExtraSequence(const tExtraID extraID, const tNotificationFlags flags, const tInputBits interruptionFilter) {
+void WSC::startExtraSequence(const ExtraID extraID, const NotificationFlags flags, const InputBits interruptionFilter) {
 	if (extraID == kW61Brochure)
 		loadLoopSound1("");
 
 	Neighborhood::startExtraSequence(extraID, flags, interruptionFilter);
 }
 
-int16 WSC::getStaticCompassAngle(const tRoomID room, const tDirectionConstant dir) {
+int16 WSC::getStaticCompassAngle(const RoomID room, const DirectionConstant dir) {
 	int16 angle = Neighborhood::getStaticCompassAngle(room, dir);
 
 	switch (room) {
@@ -1369,7 +1364,7 @@ void WSC::getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSpec &com
 }
 
 void WSC::loadAmbientLoops() {
-	tRoomID room = GameState.getCurrentRoom();
+	RoomID room = GameState.getCurrentRoom();
 
 	if (room >= kWSC01 && room <= kWSC04) {
 		if (GameState.getWSCSeenTimeStream())
@@ -1385,7 +1380,7 @@ void WSC::loadAmbientLoops() {
 		loadLoopSound1("Sounds/World Science Center/WCatLoop.22K.AIFF");
 }
 
-void WSC::checkContinuePoint(const tRoomID room, const tDirectionConstant direction) {
+void WSC::checkContinuePoint(const RoomID room, const DirectionConstant direction) {
 	switch (MakeRoomView(room, direction)) {
 	case MakeRoomView(kWSC07, kNorth):
 	case MakeRoomView(kWSC11, kSouth):
@@ -1432,7 +1427,7 @@ void WSC::checkContinuePoint(const tRoomID room, const tDirectionConstant direct
 	}
 }
 
-void WSC::arriveAt(const tRoomID room, const tDirectionConstant dir) {	
+void WSC::arriveAt(const RoomID room, const DirectionConstant dir) {	
 	switch (MakeRoomView(room, dir)) {
 	case MakeRoomView(kWSC60, kNorth):
 	case MakeRoomView(kWSC60, kSouth):
@@ -1595,7 +1590,7 @@ void WSC::arriveAt(const tRoomID room, const tDirectionConstant dir) {
 	setUpPoison();
 }
 
-void WSC::turnTo(const tDirectionConstant direction) {
+void WSC::turnTo(const DirectionConstant direction) {
 	Neighborhood::turnTo(direction);
 
 	switch (MakeRoomView(GameState.getCurrentRoom(), direction)) {
@@ -1649,7 +1644,7 @@ void WSC::turnTo(const tDirectionConstant direction) {
 	checkPeopleCrossing();
 }
 
-void WSC::receiveNotification(Notification *notification, const tNotificationFlags flags) {
+void WSC::receiveNotification(Notification *notification, const NotificationFlags flags) {
 	int32 currentEnergy;
 	Item *item;
 	
@@ -1916,7 +1911,7 @@ void WSC::receiveNotification(Notification *notification, const tNotificationFla
 			setCurrentActivation(kActivationRobotDead);
 			GameState.setWSCRobotDead(true);
 
-			// Unused?
+			// Video is not present
 			//g_AIArea->playAIMovie(kRightAreaSignature, "Images/AI/WSC/XN59WD", false, kWarningInterruption);
 			break;
 		case kW98RobotGassed:
@@ -1925,7 +1920,7 @@ void WSC::receiveNotification(Notification *notification, const tNotificationFla
 			setCurrentActivation(kActivationRobotDead);
 			GameState.setWSCRobotDead(true);
 
-			// Unused?
+			// Video is not present
 			//g_AIArea->playAIMovie(kRightAreaSignature, "Images/AI/WSC/XN59WD", false, kWarningInterruption);
 			break;
 		case kW98RobotHeadOpensLight:
@@ -2008,7 +2003,7 @@ void WSC::startMoleculeGameLevel() {
 	_moleculesMovie.start();
 }
 
-void WSC::moleculeGameClick(const tHotSpotID id) {
+void WSC::moleculeGameClick(const HotSpotID id) {
 	uint32 molecule = id - kWSC03NorthMolecule1SpotID;
 
 	_moleculeBin.highlightMolecule(molecule);
@@ -2203,7 +2198,7 @@ void WSC::clickInHotspot(const Input &input, const Hotspot *clickedSpot) {
 }
 
 void WSC::dropItemIntoRoom(Item *item, Hotspot *dropSpot) {
-	tCoordType h, v;
+	CoordType h, v;
 
 	switch (item->getObjectID()) {
 	case kPoisonDart:
@@ -2297,7 +2292,7 @@ void WSC::takeItemFromRoom(Item *item) {
 }
 
 Hotspot *WSC::getItemScreenSpot(Item *item, DisplayElement *element) {
-	tHotSpotID destSpotID;
+	HotSpotID destSpotID;
 	
 	switch (item->getObjectID()) {
 	case kNitrogenCanister:
diff --git a/engines/pegasus/neighborhood/wsc/wsc.h b/engines/pegasus/neighborhood/wsc/wsc.h
index 8646da3dbe..845b587b94 100755
--- a/engines/pegasus/neighborhood/wsc/wsc.h
+++ b/engines/pegasus/neighborhood/wsc/wsc.h
@@ -31,13 +31,13 @@
 
 namespace Pegasus {
 
-const tDisplayOrder kWSCMoleculeBinOrder = kMonitorLayer;
-const tDisplayOrder kWSCMoleculesMovieOrder = kWSCMoleculeBinOrder + 1;
+const DisplayOrder kWSCMoleculeBinOrder = kMonitorLayer;
+const DisplayOrder kWSCMoleculesMovieOrder = kWSCMoleculeBinOrder + 1;
 
-const tRoomID kWSC01 = 0;
-const tRoomID kWSC02Morph = 2;
-const tRoomID kWSC02Messages = 3;
-const tRoomID kWSC62 = 62;
+const RoomID kWSC01 = 0;
+const RoomID kWSC02Morph = 2;
+const RoomID kWSC02Messages = 3;
+const RoomID kWSC62 = 62;
 
 class WSC : public Neighborhood {
 public:
@@ -50,7 +50,7 @@ public:
 
 	bool okayToJump();
 
-	void checkContinuePoint(const tRoomID, const tDirectionConstant);
+	void checkContinuePoint(const RoomID, const DirectionConstant);
 	
 	bool inSynthesizerGame();
 	
@@ -104,28 +104,28 @@ protected:
 		kNumWSCPrivateFlags
 	};
 
-	void arriveAt(const tRoomID, const tDirectionConstant);
-	void turnTo(const tDirectionConstant);
-	void receiveNotification(Notification *, const tNotificationFlags);
+	void arriveAt(const RoomID, const DirectionConstant);
+	void turnTo(const DirectionConstant);
+	void receiveNotification(Notification *, const NotificationFlags);
 	void dropItemIntoRoom(Item *, Hotspot *);
 	void clickInHotspot(const Input &, const Hotspot *);
-	TimeValue getViewTime(const tRoomID, const tDirectionConstant);
-	void getZoomEntry(const tHotSpotID, ZoomTable::Entry &);
-	tCanMoveForwardReason canMoveForward(ExitTable::Entry &entry);
-	void cantMoveThatWay(tCanMoveForwardReason reason);
-	tCanTurnReason canTurn(tTurnDirection turn, tDirectionConstant &nextDir);
+	TimeValue getViewTime(const RoomID, const DirectionConstant);
+	void getZoomEntry(const HotSpotID, ZoomTable::Entry &);
+	CanMoveForwardReason canMoveForward(ExitTable::Entry &entry);
+	void cantMoveThatWay(CanMoveForwardReason reason);
+	CanTurnReason canTurn(TurnDirection turn, DirectionConstant &nextDir);
 	void zoomTo(const Hotspot *hotspot);
 	void activateOneHotspot(HotspotInfoTable::Entry &, Hotspot *);
 	void setUpMoleculeGame();
 	void nextMoleculeGameLevel();
 	void startMoleculeGameLevel();
-	void moleculeGameClick(const tHotSpotID);
+	void moleculeGameClick(const HotSpotID);
 	void loadAmbientLoops();
-	tCanOpenDoorReason canOpenDoor(DoorTable::Entry &);
-	void cantOpenDoor(tCanOpenDoorReason);
+	CanOpenDoorReason canOpenDoor(DoorTable::Entry &);
+	void cantOpenDoor(CanOpenDoorReason);
 	void pickedUpItem(Item *);
 	void doorOpened();
-	void startExtraSequence(const tExtraID, const tNotificationFlags, const tInputBits);
+	void startExtraSequence(const ExtraID, const NotificationFlags, const InputBits);
 	void getExtraEntry(const uint32, ExtraTable::Entry &);
 	void takeItemFromRoom(Item *item);
 	void checkPeopleCrossing();
@@ -133,7 +133,7 @@ protected:
 	void turnRight();
 	void moveForward();
 	Hotspot *getItemScreenSpot(Item *, DisplayElement *);
-	int16 getStaticCompassAngle(const tRoomID, const tDirectionConstant);
+	int16 getStaticCompassAngle(const RoomID, const DirectionConstant);
 	void getExitCompassMove(const ExitTable::Entry &exitEntry, FaderMoveSpec &compassMove);
 	void getExtraCompassMove(const ExtraTable::Entry &entry, FaderMoveSpec &compassMove);
 	void bumpIntoWall();
@@ -143,9 +143,9 @@ protected:
 	Common::String getEnvScanMovie();
 	uint getNumHints();
 	Common::String getHintMovie(uint);
-	void closeDoorOffScreen(const tRoomID, const tDirectionConstant);
+	void closeDoorOffScreen(const RoomID, const DirectionConstant);
 	void setUpPoison();
-	void findSpotEntry(const tRoomID, const tDirectionConstant, tSpotFlags, SpotTable::Entry &);
+	void findSpotEntry(const RoomID, const DirectionConstant, SpotFlags, SpotTable::Entry &);
 	void timerExpired(const uint32);
 
 	Common::String getSoundSpotsName();
diff --git a/engines/pegasus/neighborhood/zoom.cpp b/engines/pegasus/neighborhood/zoom.cpp
index ee2d8be24a..b7cadfaeb5 100755
--- a/engines/pegasus/neighborhood/zoom.cpp
+++ b/engines/pegasus/neighborhood/zoom.cpp
@@ -63,7 +63,7 @@ void ZoomTable::Entry::clear() {
 	direction = kNoDirection;
 }
 
-ZoomTable::Entry ZoomTable::findEntry(tHotSpotID hotspot) {
+ZoomTable::Entry ZoomTable::findEntry(HotSpotID hotspot) {
 	for (uint32 i = 0; i < _entries.size(); i++)
 		if (_entries[i].hotspot == hotspot)
 			return _entries[i];
diff --git a/engines/pegasus/neighborhood/zoom.h b/engines/pegasus/neighborhood/zoom.h
index 27290a88d5..f822bb719c 100755
--- a/engines/pegasus/neighborhood/zoom.h
+++ b/engines/pegasus/neighborhood/zoom.h
@@ -52,14 +52,14 @@ public:
 		void clear();
 		bool isEmpty() { return movieStart == 0xffffffff; }
 
-		tHotSpotID hotspot;
+		HotSpotID hotspot;
 		TimeValue movieStart;
 		TimeValue movieEnd;
-		tRoomID	room;
-		tDirectionConstant direction;
+		RoomID	room;
+		DirectionConstant direction;
 	};
 
-	Entry findEntry(tHotSpotID hotspot);
+	Entry findEntry(HotSpotID hotspot);
 
 private:
 	Common::Array<Entry> _entries;
diff --git a/engines/pegasus/notification.cpp b/engines/pegasus/notification.cpp
index 5ded610e28..cc917a845c 100755
--- a/engines/pegasus/notification.cpp
+++ b/engines/pegasus/notification.cpp
@@ -28,9 +28,9 @@
 
 namespace Pegasus {
 
-typedef tReceiverList::iterator tReceiverIterator;
+typedef ReceiverList::iterator ReceiverIterator;
 
-Notification::Notification(const tNotificationID id, NotificationManager *owner) : IDObject(id) {
+Notification::Notification(const NotificationID id, NotificationManager *owner) : IDObject(id) {
 	_owner = owner;
 	_currentFlags = kNoNotificationFlags;
 	if (_owner)
@@ -38,7 +38,7 @@ Notification::Notification(const tNotificationID id, NotificationManager *owner)
 }
 
 Notification::~Notification() {
-	for (tReceiverIterator it = _receivers.begin(); it != _receivers.end(); it++)
+	for (ReceiverIterator it = _receivers.begin(); it != _receivers.end(); it++)
 		it->receiver->newNotification(NULL);
 
 	if (_owner)
@@ -48,8 +48,8 @@ Notification::~Notification() {
 //	Selectively set or clear notificiation bits.
 //	Wherever mask is 0, leave existing bits untouched.
 //	Wherever mask is 1, set bit equivalent to flags.
-void Notification::notifyMe(NotificationReceiver *receiver, tNotificationFlags flags, tNotificationFlags mask) {
-	for (tReceiverIterator it = _receivers.begin(); it != _receivers.end(); it++) {
+void Notification::notifyMe(NotificationReceiver *receiver, NotificationFlags flags, NotificationFlags mask) {
+	for (ReceiverIterator it = _receivers.begin(); it != _receivers.end(); it++) {
 		if (it->receiver == receiver) {
 			it->mask = (it->mask & ~mask) | (flags & mask);
 			receiver->newNotification(this);
@@ -57,7 +57,7 @@ void Notification::notifyMe(NotificationReceiver *receiver, tNotificationFlags f
 		}
 	}
 
-	tReceiverEntry newEntry;
+	ReceiverEntry newEntry;
 	newEntry.receiver = receiver;
 	newEntry.mask = flags;
 	_receivers.push_back(newEntry);
@@ -66,7 +66,7 @@ void Notification::notifyMe(NotificationReceiver *receiver, tNotificationFlags f
 }
 
 void Notification::cancelNotification(NotificationReceiver *receiver) {
-	for (tReceiverIterator it = _receivers.begin(); it != _receivers.end();) {
+	for (ReceiverIterator it = _receivers.begin(); it != _receivers.end();) {
 		if (it->receiver == receiver)
 			it = _receivers.erase(it);
 		else
@@ -74,26 +74,26 @@ void Notification::cancelNotification(NotificationReceiver *receiver) {
 	}
 }
 
-void Notification::setNotificationFlags(tNotificationFlags flags, tNotificationFlags mask) {
+void Notification::setNotificationFlags(NotificationFlags flags, NotificationFlags mask) {
 	_currentFlags = (_currentFlags & ~mask) | flags;
 }
 
 void Notification::checkReceivers() {	
-	tNotificationFlags currentFlags = _currentFlags;
+	NotificationFlags currentFlags = _currentFlags;
 	_currentFlags = kNoNotificationFlags;
 
-	for (tReceiverIterator it = _receivers.begin(); it != _receivers.end(); it++)
+	for (ReceiverIterator it = _receivers.begin(); it != _receivers.end(); it++)
 		if (it->mask & currentFlags)
 			it->receiver->receiveNotification(this, currentFlags);
 }
 
 //	Receiver entries are equal if their receivers are equal.
 
-int operator==(const tReceiverEntry &entry1, const tReceiverEntry &entry2) {
+int operator==(const ReceiverEntry &entry1, const ReceiverEntry &entry2) {
 	return	entry1.receiver == entry2.receiver;
 }
 
-int operator!=(const tReceiverEntry &entry1, const tReceiverEntry &entry2) {
+int operator!=(const ReceiverEntry &entry1, const ReceiverEntry &entry2) {
 	return	entry1.receiver != entry2.receiver;
 }
 
@@ -106,14 +106,14 @@ NotificationReceiver::~NotificationReceiver() {
 		_notification->cancelNotification(this);
 }
 
-void NotificationReceiver::receiveNotification(Notification *, const tNotificationFlags) {
+void NotificationReceiver::receiveNotification(Notification *, const NotificationFlags) {
 }
 
 void NotificationReceiver::newNotification(Notification *notification) {
 	_notification = notification;
 }
 
-typedef tNotificationList::iterator tNotificationIterator;
+typedef NotificationList::iterator NotificationIterator;
 
 NotificationManager::NotificationManager() {
 }
@@ -127,7 +127,7 @@ void NotificationManager::addNotification(Notification *notification) {
 }
 
 void NotificationManager::removeNotification(Notification *notification) {
-	for (tNotificationIterator it = _notifications.begin(); it != _notifications.end();) {
+	for (NotificationIterator it = _notifications.begin(); it != _notifications.end();) {
 		if ((*it) == notification)
 			it = _notifications.erase(it);
 		else
@@ -136,12 +136,12 @@ void NotificationManager::removeNotification(Notification *notification) {
 }
 
 void NotificationManager::detachNotifications() {
-	for (tNotificationIterator it = _notifications.begin(); it != _notifications.end(); it++)
+	for (NotificationIterator it = _notifications.begin(); it != _notifications.end(); it++)
 		(*it)->_owner = 0;
 }
 
 void NotificationManager::checkNotifications() {
-	for (tNotificationIterator it = _notifications.begin(); it != _notifications.end(); it++)
+	for (NotificationIterator it = _notifications.begin(); it != _notifications.end(); it++)
 		if ((*it)->_currentFlags != kNoNotificationFlags)
 			(*it)->checkReceivers();
 }
diff --git a/engines/pegasus/notification.h b/engines/pegasus/notification.h
index 70fcd822a9..91901c9287 100755
--- a/engines/pegasus/notification.h
+++ b/engines/pegasus/notification.h
@@ -36,15 +36,15 @@ namespace Pegasus {
 class NotificationManager;
 class NotificationReceiver;
 
-struct tReceiverEntry {
+struct ReceiverEntry {
 	NotificationReceiver *receiver;
-	tNotificationFlags mask;
+	NotificationFlags mask;
 };
 
-int operator==(const tReceiverEntry &entry1, const tReceiverEntry &entry2);
-int operator!=(const tReceiverEntry &entry1, const tReceiverEntry &entry2);
+int operator==(const ReceiverEntry &entry1, const ReceiverEntry &entry2);
+int operator!=(const ReceiverEntry &entry1, const ReceiverEntry &entry2);
 
-typedef Common::List<tReceiverEntry> tReceiverList;
+typedef Common::List<ReceiverEntry> ReceiverList;
 
 /*
 	A notification can have 32 flags associated with it, which can be user-defined.
@@ -54,7 +54,7 @@ class Notification : public IDObject {
 friend class NotificationManager;
 
 public:
-	Notification(const tNotificationID id, NotificationManager *owner);
+	Notification(const NotificationID id, NotificationManager *owner);
 	virtual ~Notification();
 
 	//	NotifyMe will have this receiver notified when any of the specified notification
@@ -64,20 +64,20 @@ public:
 
 	//	Can selectively set or clear notification bits by using the flags and mask argument.
 
-	void notifyMe(NotificationReceiver*, tNotificationFlags flags, tNotificationFlags mask);
+	void notifyMe(NotificationReceiver*, NotificationFlags flags, NotificationFlags mask);
 	void cancelNotification(NotificationReceiver *receiver);
 	
-	void setNotificationFlags(tNotificationFlags flags,	tNotificationFlags mask);
-	tNotificationFlags getNotificationFlags() { return _currentFlags; }
+	void setNotificationFlags(NotificationFlags flags,	NotificationFlags mask);
+	NotificationFlags getNotificationFlags() { return _currentFlags; }
 	
-	void clearNotificationFlags() { setNotificationFlags(0, ~(tNotificationFlags)0); }
+	void clearNotificationFlags() { setNotificationFlags(0, ~(NotificationFlags)0); }
 
 protected:
 	void checkReceivers();
 	
 	NotificationManager *_owner;
-	tReceiverList _receivers;
-	tNotificationFlags _currentFlags;
+	ReceiverList _receivers;
+	NotificationFlags _currentFlags;
 };
 
 class NotificationReceiver {
@@ -91,14 +91,14 @@ protected:
 	//	ReceiveNotification is called automatically whenever a notification that this
 	//	receiver depends on has its flags set
 	
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 	virtual void newNotification(Notification *notification);
 
 private:
 	Notification *_notification;
 };
 
-typedef Common::List<Notification *> tNotificationList;
+typedef Common::List<Notification *> NotificationList;
 
 class NotificationManager : public NotificationReceiver {
 friend class Notification;
@@ -114,7 +114,7 @@ protected:
 	void removeNotification(Notification *notification);
 	void detachNotifications();
 	
-	tNotificationList _notifications;
+	NotificationList _notifications;
 };
 
 } // End of namespace Pegasus
diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index e2cb560988..5e7d188d7b 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -215,10 +215,10 @@ void PegasusEngine::createItems() {
 	uint16 entryCount = res->readUint16BE();
 
 	for (uint16 i = 0; i < entryCount; i++) {
-		tItemID itemID = res->readUint16BE();
-		tNeighborhoodID neighborhoodID = res->readUint16BE();
-		tRoomID roomID = res->readUint16BE();
-		tDirectionConstant direction = res->readByte();
+		ItemID itemID = res->readUint16BE();
+		NeighborhoodID neighborhoodID = res->readUint16BE();
+		RoomID roomID = res->readUint16BE();
+		DirectionConstant direction = res->readByte();
 		res->readByte(); // alignment
 
 		createItem(itemID, neighborhoodID, roomID, direction);
@@ -227,7 +227,7 @@ void PegasusEngine::createItems() {
 	delete res;
 }
 
-void PegasusEngine::createItem(tItemID itemID, tNeighborhoodID neighborhoodID, tRoomID roomID, tDirectionConstant direction) {
+void PegasusEngine::createItem(ItemID itemID, NeighborhoodID neighborhoodID, RoomID roomID, DirectionConstant direction) {
 	switch (itemID) {
 	case kInterfaceBiochip:
 		// Unused in game, but still in the data and we need to create
@@ -421,11 +421,11 @@ bool PegasusEngine::loadFromStream(Common::ReadStream *stream) {
 
 	if (itemCount > 0) {
 		for (byte i = 0; i < itemCount; i++) {
-			InventoryItem *inv = (InventoryItem *)g_allItems.findItemByID((tItemID)stream->readUint16BE());
+			InventoryItem *inv = (InventoryItem *)g_allItems.findItemByID((ItemID)stream->readUint16BE());
 			addItemToInventory(inv);
 		}
 
-		g_interface->setCurrentInventoryItemID((tItemID)stream->readUint16BE());
+		g_interface->setCurrentInventoryItemID((ItemID)stream->readUint16BE());
 	}
 
 	// Biochips
@@ -433,11 +433,11 @@ bool PegasusEngine::loadFromStream(Common::ReadStream *stream) {
 
 	if (biochipCount > 0) {
 		for (byte i = 0; i < biochipCount; i++) {
-			BiochipItem *biochip = (BiochipItem *)g_allItems.findItemByID((tItemID)stream->readUint16BE());
+			BiochipItem *biochip = (BiochipItem *)g_allItems.findItemByID((ItemID)stream->readUint16BE());
 			addItemToBiochips(biochip);
 		}
 
-		g_interface->setCurrentBiochipID((tItemID)stream->readUint16BE());
+		g_interface->setCurrentBiochipID((ItemID)stream->readUint16BE());
 	}
 
 
@@ -560,7 +560,7 @@ Common::Error PegasusEngine::saveGameState(int slot, const Common::String &desc)
 	return valid ? Common::kNoError : Common::kUnknownError;
 }
 
-void PegasusEngine::receiveNotification(Notification *notification, const tNotificationFlags flags) {
+void PegasusEngine::receiveNotification(Notification *notification, const NotificationFlags flags) {
 	if (&_shellNotification == notification) {
 		switch (flags) {
 		case kGameStartingFlag: {
@@ -626,7 +626,7 @@ void PegasusEngine::useMenu(GameMenu *newMenu) {
 }
 
 bool PegasusEngine::checkGameMenu() {
-	tGameMenuCommand command = kMenuCmdNoCommand;
+	GameMenuCommand command = kMenuCmdNoCommand;
 
 	if (_gameMenu) {
 		command = _gameMenu->getLastCommand();
@@ -639,7 +639,7 @@ bool PegasusEngine::checkGameMenu() {
 	return command != kMenuCmdNoCommand;
 }
 
-void PegasusEngine::doGameMenuCommand(const tGameMenuCommand command) {
+void PegasusEngine::doGameMenuCommand(const GameMenuCommand command) {
 	switch (command) {
 	case kMenuCmdStartAdventure:
 		GameState.setWalkthroughMode(false);
@@ -996,7 +996,7 @@ bool PegasusEngine::playerHasItem(const Item *item) {
 	return playerHasItemID(item->getObjectID());
 }
 
-bool PegasusEngine::playerHasItemID(const tItemID itemID) {
+bool PegasusEngine::playerHasItemID(const ItemID itemID) {
 	return itemInInventory(itemID) || itemInBiochips(itemID);
 }
 
@@ -1011,7 +1011,7 @@ bool PegasusEngine::itemInInventory(InventoryItem *item) {
 	return _items.itemInInventory(item);
 }
 
-bool PegasusEngine::itemInInventory(tItemID id) {
+bool PegasusEngine::itemInInventory(ItemID id) {
 	return _items.itemInInventory(id);
 }
 
@@ -1026,7 +1026,7 @@ bool PegasusEngine::itemInBiochips(BiochipItem *item) {
 	return _biochips.itemInInventory(item);
 }
 
-bool PegasusEngine::itemInBiochips(tItemID id) {
+bool PegasusEngine::itemInBiochips(ItemID id) {
 	return _biochips.itemInInventory(id);
 }
 
@@ -1079,7 +1079,7 @@ void PegasusEngine::cleanUpAfterAIHint(const Common::String &movieName) {
 		g_neighborhood->cleanUpAfterAIHint(movieName);
 }
 
-void PegasusEngine::jumpToNewEnvironment(const tNeighborhoodID neighborhoodID, const tRoomID roomID, const tDirectionConstant direction) {
+void PegasusEngine::jumpToNewEnvironment(const NeighborhoodID neighborhoodID, const RoomID roomID, const DirectionConstant direction) {
 	GameState.setNextLocation(neighborhoodID, roomID, direction);
 	_shellNotification.setNotificationFlags(kNeedNewJumpFlag, kNeedNewJumpFlag);
 }
@@ -1111,7 +1111,7 @@ bool PegasusEngine::playMovieScaled(Video::SeekableVideoDecoder *video, uint16 x
 	return skipped;
 }
 
-void PegasusEngine::die(const tDeathReason reason) {
+void PegasusEngine::die(const DeathReason reason) {
 	Input dummy;
 	if (isDragging())
 		_itemDragger.stopTracking(dummy);
@@ -1160,14 +1160,14 @@ void PegasusEngine::createInterface() {
 	g_interface->createInterface();
 }
 
-void PegasusEngine::setGameMode(const tGameMode newMode) {
+void PegasusEngine::setGameMode(const GameMode newMode) {
 	if (newMode != _gameMode && canSwitchGameMode(newMode, _gameMode)) {
 		switchGameMode(newMode, _gameMode);
 		_gameMode = newMode;
 	}
 }
 
-void PegasusEngine::switchGameMode(const tGameMode newMode, const tGameMode oldMode) {
+void PegasusEngine::switchGameMode(const GameMode newMode, const GameMode oldMode) {
 	// Start raising panels before lowering panels, to give the activating panel time
 	// to set itself up without cutting into the lowering panel's animation time.
 	
@@ -1202,7 +1202,7 @@ void PegasusEngine::switchGameMode(const tGameMode newMode, const tGameMode oldM
 	}
 }
 
-bool PegasusEngine::canSwitchGameMode(const tGameMode newMode, const tGameMode oldMode) {
+bool PegasusEngine::canSwitchGameMode(const GameMode newMode, const GameMode oldMode) {
 	if (newMode == kModeInventoryPick && oldMode == kModeBiochipPick)
 		return false;
 	if (newMode == kModeBiochipPick && oldMode == kModeInventoryPick)
@@ -1210,10 +1210,10 @@ bool PegasusEngine::canSwitchGameMode(const tGameMode newMode, const tGameMode o
 	return true;
 }
 
-bool PegasusEngine::itemInLocation(const tItemID itemID, const tNeighborhoodID neighborhood, const tRoomID room, const tDirectionConstant direction) {
-	tNeighborhoodID itemNeighborhood;
-	tRoomID itemRoom;
-	tDirectionConstant itemDirection;
+bool PegasusEngine::itemInLocation(const ItemID itemID, const NeighborhoodID neighborhood, const RoomID room, const DirectionConstant direction) {
+	NeighborhoodID itemNeighborhood;
+	RoomID itemRoom;
+	DirectionConstant itemDirection;
 	
 	Item *item = g_allItems.findItemByID(itemID);
 	item->getItemRoom(itemNeighborhood, itemRoom, itemDirection);
@@ -1221,8 +1221,8 @@ bool PegasusEngine::itemInLocation(const tItemID itemID, const tNeighborhoodID n
 	return itemNeighborhood == neighborhood && itemRoom == room && itemDirection == direction;
 }
 
-tInventoryResult PegasusEngine::addItemToInventory(InventoryItem *item) {
-	tInventoryResult result;
+InventoryResult PegasusEngine::addItemToInventory(InventoryItem *item) {
+	InventoryResult result;
 	
 	do {
 		if (g_interface)
@@ -1257,7 +1257,7 @@ void PegasusEngine::useNeighborhood(Neighborhood *neighborhood) {
 	}
 }
 
-void PegasusEngine::performJump(tNeighborhoodID neighborhoodID) {
+void PegasusEngine::performJump(NeighborhoodID neighborhoodID) {
 	if (_neighborhood)
 		useNeighborhood(0);
 
@@ -1349,7 +1349,7 @@ void PegasusEngine::startNewGame() {
 	startNeighborhood();
 }
 
-void PegasusEngine::makeNeighborhood(tNeighborhoodID neighborhoodID, Neighborhood *&neighborhood) {
+void PegasusEngine::makeNeighborhood(NeighborhoodID neighborhoodID, Neighborhood *&neighborhood) {
 	// TODO: CD check
 
 	switch (neighborhoodID) {
@@ -1404,7 +1404,7 @@ void PegasusEngine::updateCursor(const Common::Point, const Hotspot *cursorSpot)
 					_cursor->setCurrentFrameIndex(0);
 				break;
 			default:
-				tHotSpotFlags flags = cursorSpot->getHotspotFlags();
+				HotSpotFlags flags = cursorSpot->getHotspotFlags();
 
 				if (flags & kZoomInSpotFlag)
 					_cursor->setCurrentFrameIndex(1);
@@ -1540,7 +1540,7 @@ void PegasusEngine::toggleInfo() {
 
 void PegasusEngine::dragTerminated(const Input &) {
 	Hotspot *finalSpot = _itemDragger.getLastHotspot();
-	tInventoryResult result;
+	InventoryResult result;
 
 	if (_dragType == kDragInventoryPickup) {
 		if (finalSpot && finalSpot->getObjectID() == kInventoryDropSpotID)
@@ -1582,7 +1582,7 @@ void PegasusEngine::dragTerminated(const Input &) {
 }
 
 
-void PegasusEngine::dragItem(const Input &input, Item *item, tDragType type) {	
+void PegasusEngine::dragItem(const Input &input, Item *item, DragType type) {	
 	_draggingItem = item;
 	_dragType = type;
 
@@ -1622,7 +1622,7 @@ void PegasusEngine::dragItem(const Input &input, Item *item, tDragType type) {
 void PegasusEngine::shellGameInput(const Input &input, const Hotspot *cursorSpot) {
 	if (_gameMode == kModeInfoScreen) {
 		if (JMPPPInput::isToggleAIMiddleInput(input)) {
-			tLowerClientSignature middleOwner = g_AIArea->getMiddleAreaOwner();
+			LowerClientSignature middleOwner = g_AIArea->getMiddleAreaOwner();
 			g_AIArea->toggleMiddleAreaOwner();
 
 			if (middleOwner != g_AIArea->getMiddleAreaOwner()) {
@@ -1677,7 +1677,7 @@ bool PegasusEngine::isClickInput(const Input &input, const Hotspot *cursorSpot)
 		return false;
 }
 
-tInputBits PegasusEngine::getClickFilter() {
+InputBits PegasusEngine::getClickFilter() {
 	return JMPPPInput::getClickInputFilter();
 }
 
@@ -1693,8 +1693,8 @@ void PegasusEngine::clickInHotspot(const Input &input, const Hotspot *clickedSpo
 	}
 }
 
-tInventoryResult PegasusEngine::removeItemFromInventory(InventoryItem *item) {
-	tInventoryResult result;
+InventoryResult PegasusEngine::removeItemFromInventory(InventoryItem *item) {
+	InventoryResult result;
 	
 	if (g_interface)
 		result = g_interface->removeInventoryItem(item);
@@ -1725,8 +1725,8 @@ void PegasusEngine::removeAllItemsFromInventory() {
 // Because of this we need to make sure that no more than one copy of each biochip
 // is ever added.
 
-tInventoryResult PegasusEngine::addItemToBiochips(BiochipItem *biochip) {
-	tInventoryResult result;
+InventoryResult PegasusEngine::addItemToBiochips(BiochipItem *biochip) {
+	InventoryResult result;
 
 	if (g_interface)
 		result = g_interface->addBiochip(biochip);
@@ -1858,7 +1858,7 @@ void PegasusEngine::autoDragItemIntoInventory(Item *, Sprite *draggingSprite) {
 		g_AIArea->unlockAI();
 }
 
-tNeighborhoodID PegasusEngine::getCurrentNeighborhoodID() const {
+NeighborhoodID PegasusEngine::getCurrentNeighborhoodID() const {
 	if (_neighborhood)
 		return _neighborhood->getObjectID();
 
@@ -1961,7 +1961,7 @@ void PegasusEngine::drawScaledFrame(const Graphics::Surface *frame, uint16 x, ui
 	scaledFrame.free();
 }
 
-void PegasusEngine::destroyInventoryItem(const tItemID itemID) {
+void PegasusEngine::destroyInventoryItem(const ItemID itemID) {
 	InventoryItem *item = (InventoryItem *)g_allItems.findItemByID(itemID);
 
 	ItemExtraEntry entry;
@@ -2012,7 +2012,7 @@ void PegasusEngine::destroyInventoryItem(const tItemID itemID) {
 	removeItemFromInventory(item);
 }
 
-tItemID PegasusEngine::pickItemToDestroy() {
+ItemID PegasusEngine::pickItemToDestroy() {
 /*
 	Must pick an item to destroy
 	
diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h
index 2dcd317b07..86ba267e54 100644
--- a/engines/pegasus/pegasus.h
+++ b/engines/pegasus/pegasus.h
@@ -104,8 +104,8 @@ public:
 	void processShell();
 	void checkCallBacks();
 	void createInterface();
-	void setGameMode(const tGameMode);
-	tGameMode getGameMode() const { return _gameMode; }
+	void setGameMode(const GameMode);
+	GameMode getGameMode() const { return _gameMode; }
 	uint getRandomBit();
 	uint getRandomNumber(uint max);
 	void shuffleArray(int32 *arr, int32 count);
@@ -116,10 +116,10 @@ public:
 	int32 getSavedEnergyValue() { return _savedEnergyValue; }
 
 	// Death
-	void setEnergyDeathReason(const tDeathReason reason) { _deathReason = reason; } 
-	tDeathReason getEnergyDeathReason() { return _deathReason; }
+	void setEnergyDeathReason(const DeathReason reason) { _deathReason = reason; } 
+	DeathReason getEnergyDeathReason() { return _deathReason; }
 	void resetEnergyDeathReason();
-	void die(const tDeathReason);
+	void die(const DeathReason);
 	void playEndMessage();
 
 	// Volume
@@ -130,27 +130,27 @@ public:
 
 	// Items
 	bool playerHasItem(const Item *);
-	bool playerHasItemID(const tItemID);
+	bool playerHasItemID(const ItemID);
 	void checkFlashlight();
-	bool itemInLocation(const tItemID, const tNeighborhoodID, const tRoomID, const tDirectionConstant);
+	bool itemInLocation(const ItemID, const NeighborhoodID, const RoomID, const DirectionConstant);
 
 	// Inventory Items
 	InventoryItem *getCurrentInventoryItem();
 	bool itemInInventory(InventoryItem *);
-	bool itemInInventory(tItemID);
+	bool itemInInventory(ItemID);
 	Inventory *getItemsInventory() { return &_items; }
-	tInventoryResult addItemToInventory(InventoryItem *);
+	InventoryResult addItemToInventory(InventoryItem *);
 	void removeAllItemsFromInventory();
-	tInventoryResult removeItemFromInventory(InventoryItem *);
+	InventoryResult removeItemFromInventory(InventoryItem *);
 	uint32 countInventoryItems() { return _items.getNumItems(); }
 
 	// Biochips
 	BiochipItem *getCurrentBiochip();
 	bool itemInBiochips(BiochipItem *);
-	bool itemInBiochips(tItemID);
+	bool itemInBiochips(ItemID);
 	Inventory *getBiochipsInventory() { return &_biochips; }
 	void removeAllItemsFromBiochips();
-	tInventoryResult addItemToBiochips(BiochipItem *);
+	InventoryResult addItemToBiochips(BiochipItem *);
 
 	// AI
 	Common::String getBriefingMovie();
@@ -162,13 +162,13 @@ public:
 	void cleanUpAfterAIHint(const Common::String &);
 
 	// Neighborhood
-	void jumpToNewEnvironment(const tNeighborhoodID, const tRoomID, const tDirectionConstant);
-	tNeighborhoodID getCurrentNeighborhoodID() const;
+	void jumpToNewEnvironment(const NeighborhoodID, const RoomID, const DirectionConstant);
+	NeighborhoodID getCurrentNeighborhoodID() const;
 
 	// Dragging
-	void dragItem(const Input &, Item *, tDragType);
+	void dragItem(const Input &, Item *, DragType);
 	bool isDragging() const { return _dragType != kDragNoDrag; }
-	tDragType getDragType() const { return _dragType; }
+	DragType getDragType() const { return _dragType; }
 	Item *getDraggingItem() const { return _draggingItem; }
 	void dragTerminated(const Input &);
 	void autoDragItemIntoRoom(Item *, Sprite *);
@@ -192,11 +192,11 @@ protected:
 	void pauseEngineIntern(bool pause);
 
 	Notification _shellNotification;
-	virtual void receiveNotification(Notification *notification, const tNotificationFlags flags);
+	virtual void receiveNotification(Notification *notification, const NotificationFlags flags);
 
 	void handleInput(const Input &input, const Hotspot *cursorSpot);
 	virtual bool isClickInput(const Input &, const Hotspot *);
-	virtual tInputBits getClickFilter();
+	virtual InputBits getClickFilter();
 
 	void clickInHotspot(const Input &, const Hotspot *);
 	void activateHotspots(void);
@@ -219,13 +219,13 @@ private:
 
 	// Items
 	void createItems();
-	void createItem(tItemID itemID, tNeighborhoodID neighborhoodID, tRoomID roomID, tDirectionConstant direction);
+	void createItem(ItemID itemID, NeighborhoodID neighborhoodID, RoomID roomID, DirectionConstant direction);
 	Inventory _items;
 	Inventory _biochips;
-	tItemID _currentItemID;
-	tItemID _currentBiochipID;
-	void destroyInventoryItem(const tItemID itemID);
-	tItemID pickItemToDestroy();
+	ItemID _currentItemID;
+	ItemID _currentBiochipID;
+	void destroyInventoryItem(const ItemID itemID);
+	ItemID pickItemToDestroy();
 
 	// TimeBases
 	Common::List<TimeBase *> _timeBases;
@@ -250,7 +250,7 @@ private:
 
 	// Menu
 	GameMenu *_gameMenu;
-	void doGameMenuCommand(const tGameMenuCommand);
+	void doGameMenuCommand(const GameMenuCommand);
 	void doInterfaceOverview();
 	ScreenDimmer _screenDimmer;
 	void pauseMenu(bool menuUp);
@@ -259,32 +259,32 @@ private:
 	int32 _savedEnergyValue;
 
 	// Death
-	tDeathReason _deathReason;
+	DeathReason _deathReason;
 	void doDeath();
 
 	// Neighborhood
 	Neighborhood *_neighborhood;
 	void useNeighborhood(Neighborhood *neighborhood);
-	void performJump(tNeighborhoodID start);
+	void performJump(NeighborhoodID start);
 	void startNewGame();
 	void startNeighborhood();
-	void makeNeighborhood(tNeighborhoodID, Neighborhood *&);
+	void makeNeighborhood(NeighborhoodID, Neighborhood *&);
 
 	// Sound
 	uint16 _ambientLevel;
 	uint16 _FXLevel;
 
 	// Game Mode
-	tGameMode _gameMode;
+	GameMode _gameMode;
 	bool _switchModesSync;
-	void switchGameMode(const tGameMode, const tGameMode);
-	bool canSwitchGameMode(const tGameMode, const tGameMode);
+	void switchGameMode(const GameMode, const GameMode);
+	bool canSwitchGameMode(const GameMode, const GameMode);
 
 	// Dragging
 	ItemDragger _itemDragger;
 	Item *_draggingItem;
 	Sprite *_draggingSprite;
-	tDragType _dragType;
+	DragType _dragType;
 	AutoDragger _autoDragger;
 
 	// Interface
diff --git a/engines/pegasus/scoring.h b/engines/pegasus/scoring.h
index bd09f2b834..41dcb4b9a6 100755
--- a/engines/pegasus/scoring.h
+++ b/engines/pegasus/scoring.h
@@ -34,55 +34,55 @@ namespace Pegasus {
 //
 //	Scoring.
 
-const tCoordType kDeathScreenScoreLeft = 151;
-const tCoordType kDeathScreenScoreTop = 212;
-const tCoordType kDeathScreenScoreWidth = 124;
-const tCoordType kDeathScreenScoreHeight = 12;
-const tCoordType kDeathScreenScoreSkipVert = -16;
+const CoordType kDeathScreenScoreLeft = 151;
+const CoordType kDeathScreenScoreTop = 212;
+const CoordType kDeathScreenScoreWidth = 124;
+const CoordType kDeathScreenScoreHeight = 12;
+const CoordType kDeathScreenScoreSkipVert = -16;
 
 //	Caldoria & TSA
 
-const tGameScoreType kSawINNScore					= 5;
-const tGameScoreType kTookShowerScore				= 2;
-const tGameScoreType kFixedHairScore				= 2;
-const tGameScoreType kGotKeyCardScore				= 5;
-const tGameScoreType kReadPaperScore				= 2;
-const tGameScoreType kLookThroughTelescopeScore		= 2;
-const tGameScoreType kSawCaldoriaKioskScore			= 2;
-const tGameScoreType kGoToTSAScore					= 3;
+const GameScoreType kSawINNScore					= 5;
+const GameScoreType kTookShowerScore				= 2;
+const GameScoreType kFixedHairScore				= 2;
+const GameScoreType kGotKeyCardScore				= 5;
+const GameScoreType kReadPaperScore				= 2;
+const GameScoreType kLookThroughTelescopeScore		= 2;
+const GameScoreType kSawCaldoriaKioskScore			= 2;
+const GameScoreType kGoToTSAScore					= 3;
 
-const tGameScoreType kEnterTSAScore					= 2;
-const tGameScoreType kSawBust1Score					= 2;
-const tGameScoreType kSawBust2Score					= 2;
-const tGameScoreType kSawBust3Score					= 2;
-const tGameScoreType kSawBust4Score					= 2;
-const tGameScoreType kSawBust5Score					= 2;
-const tGameScoreType kSawBust6Score					= 2;
-const tGameScoreType kSawTheoryScore				= 4;
-const tGameScoreType kSawBackgroundScore			= 4;
-const tGameScoreType kSawProcedureScore				= 4;
-const tGameScoreType kGotJourneymanKeyScore			= 5;
-const tGameScoreType kGotPegasusBiochipScore		= 5;
-const tGameScoreType kGotBiosuitScore				= 5;
-const tGameScoreType kGoToPrehistoricScore			= 5;
+const GameScoreType kEnterTSAScore					= 2;
+const GameScoreType kSawBust1Score					= 2;
+const GameScoreType kSawBust2Score					= 2;
+const GameScoreType kSawBust3Score					= 2;
+const GameScoreType kSawBust4Score					= 2;
+const GameScoreType kSawBust5Score					= 2;
+const GameScoreType kSawBust6Score					= 2;
+const GameScoreType kSawTheoryScore				= 4;
+const GameScoreType kSawBackgroundScore			= 4;
+const GameScoreType kSawProcedureScore				= 4;
+const GameScoreType kGotJourneymanKeyScore			= 5;
+const GameScoreType kGotPegasusBiochipScore		= 5;
+const GameScoreType kGotBiosuitScore				= 5;
+const GameScoreType kGoToPrehistoricScore			= 5;
 
-const tGameScoreType kPutLogInReaderScore			= 5;
-const tGameScoreType kSawCaldoriaNormalScore		= 2;
-const tGameScoreType kSawCaldoriaAlteredScore		= 2;
-const tGameScoreType kSawNoradNormalScore			= 2;
-const tGameScoreType kSawNoradAlteredScore			= 2;
-const tGameScoreType kSawMarsNormalScore			= 2;
-const tGameScoreType kSawMarsAlteredScore			= 2;
-const tGameScoreType kSawWSCNormalScore				= 2;
-const tGameScoreType kSawWSCAlteredScore			= 2;
-const tGameScoreType kWentToReadyRoom2Score			= 5;
-const tGameScoreType kWentAfterSinclairScore		= 5;
-const tGameScoreType kUsedCardBombScore				= 10;
-const tGameScoreType kShieldedCardBombScore			= 5;
-const tGameScoreType kStunnedSinclairScore			= 10;
-const tGameScoreType kDisarmedNukeScore				= 10;
+const GameScoreType kPutLogInReaderScore			= 5;
+const GameScoreType kSawCaldoriaNormalScore		= 2;
+const GameScoreType kSawCaldoriaAlteredScore		= 2;
+const GameScoreType kSawNoradNormalScore			= 2;
+const GameScoreType kSawNoradAlteredScore			= 2;
+const GameScoreType kSawMarsNormalScore			= 2;
+const GameScoreType kSawMarsAlteredScore			= 2;
+const GameScoreType kSawWSCNormalScore				= 2;
+const GameScoreType kSawWSCAlteredScore			= 2;
+const GameScoreType kWentToReadyRoom2Score			= 5;
+const GameScoreType kWentAfterSinclairScore		= 5;
+const GameScoreType kUsedCardBombScore				= 10;
+const GameScoreType kShieldedCardBombScore			= 5;
+const GameScoreType kStunnedSinclairScore			= 10;
+const GameScoreType kDisarmedNukeScore				= 10;
 
-const tGameScoreType kMaxCaldoriaTSAScoreBefore		=	kSawINNScore +
+const GameScoreType kMaxCaldoriaTSAScoreBefore		=	kSawINNScore +
 														kTookShowerScore +
 														kFixedHairScore +
 														kGotKeyCardScore +
@@ -115,52 +115,52 @@ const tGameScoreType kMaxCaldoriaTSAScoreBefore		=	kSawINNScore +
 														kSawWSCAlteredScore +
 														kWentToReadyRoom2Score;
 
-const tGameScoreType kMaxCaldoriaTSAScoreAfter		=	kWentAfterSinclairScore +
+const GameScoreType kMaxCaldoriaTSAScoreAfter		=	kWentAfterSinclairScore +
 														kUsedCardBombScore +
 														kShieldedCardBombScore +
 														kStunnedSinclairScore +
 														kDisarmedNukeScore;
 
-const tGameScoreType kMaxCaldoriaTSAScore			=	kMaxCaldoriaTSAScoreBefore +
+const GameScoreType kMaxCaldoriaTSAScore			=	kMaxCaldoriaTSAScoreBefore +
 														kMaxCaldoriaTSAScoreAfter;
 
 //	Prehistoric
 
-const tGameScoreType kThrewBreakerScore				= 10;
-const tGameScoreType kExtendedBridgeScore			= 10;
-const tGameScoreType kGotHistoricalLogScore			= 5;
-const tGameScoreType kFinishedPrehistoricScore		= 10;
+const GameScoreType kThrewBreakerScore				= 10;
+const GameScoreType kExtendedBridgeScore			= 10;
+const GameScoreType kGotHistoricalLogScore			= 5;
+const GameScoreType kFinishedPrehistoricScore		= 10;
 
-const tGameScoreType kMaxPrehistoricScore			=	kThrewBreakerScore +
+const GameScoreType kMaxPrehistoricScore			=	kThrewBreakerScore +
 														kExtendedBridgeScore +
 														kGotHistoricalLogScore +
 														kFinishedPrehistoricScore;
 
 //	Mars
 
-const tGameScoreType kThrownByRobotScore			= 3;
-const tGameScoreType kGotMarsCardScore				= 5;
-const tGameScoreType kSawMarsKioskScore				= 2;
-const tGameScoreType kSawTransportMapScore			= 2;
-const tGameScoreType kGotCrowBarScore				= 5;
-const tGameScoreType kTurnedOnTransportScore		= 5;
-const tGameScoreType kGotOxygenMaskScore			= 5;
-const tGameScoreType kAvoidedRobotScore				= 5;
-const tGameScoreType kActivatedPlatformScore		= 2;
-const tGameScoreType kUsedLiquidNitrogenScore		= 3;
-const tGameScoreType kUsedCrowBarScore				= 3;
-const tGameScoreType kFoundCardBombScore			= 4;
-const tGameScoreType kDisarmedCardBombScore			= 8;
-const tGameScoreType kGotCardBombScore				= 5;
-const tGameScoreType kThreadedMazeScore				= 5;
-const tGameScoreType kThreadedGearRoomScore			= 2;
-const tGameScoreType kEnteredShuttleScore			= 2;
-const tGameScoreType kEnteredLaunchTubeScore		= 4;
-const tGameScoreType kStoppedRobotsShuttleScore		= 10;
-const tGameScoreType kGotMarsOpMemChipScore			= 10;
-const tGameScoreType kFinishedMarsScore				= 10;
+const GameScoreType kThrownByRobotScore			= 3;
+const GameScoreType kGotMarsCardScore				= 5;
+const GameScoreType kSawMarsKioskScore				= 2;
+const GameScoreType kSawTransportMapScore			= 2;
+const GameScoreType kGotCrowBarScore				= 5;
+const GameScoreType kTurnedOnTransportScore		= 5;
+const GameScoreType kGotOxygenMaskScore			= 5;
+const GameScoreType kAvoidedRobotScore				= 5;
+const GameScoreType kActivatedPlatformScore		= 2;
+const GameScoreType kUsedLiquidNitrogenScore		= 3;
+const GameScoreType kUsedCrowBarScore				= 3;
+const GameScoreType kFoundCardBombScore			= 4;
+const GameScoreType kDisarmedCardBombScore			= 8;
+const GameScoreType kGotCardBombScore				= 5;
+const GameScoreType kThreadedMazeScore				= 5;
+const GameScoreType kThreadedGearRoomScore			= 2;
+const GameScoreType kEnteredShuttleScore			= 2;
+const GameScoreType kEnteredLaunchTubeScore		= 4;
+const GameScoreType kStoppedRobotsShuttleScore		= 10;
+const GameScoreType kGotMarsOpMemChipScore			= 10;
+const GameScoreType kFinishedMarsScore				= 10;
 
-const tGameScoreType kMaxMarsScore					=	kThrownByRobotScore +
+const GameScoreType kMaxMarsScore					=	kThrownByRobotScore +
 														kGotMarsCardScore +
 														kSawMarsKioskScore +
 														kSawTransportMapScore +
@@ -184,23 +184,23 @@ const tGameScoreType kMaxMarsScore					=	kThrownByRobotScore +
 
 //	Norad
 
-const tGameScoreType kSawSecurityMonitorScore		= 5;
-const tGameScoreType kFilledOxygenCanisterScore		= 5;
-const tGameScoreType kFilledArgonCanisterScore		= 5;
-const tGameScoreType kSawUnconsciousOperatorScore	= 5;
-const tGameScoreType kWentThroughPressureDoorScore	= 5;
-const tGameScoreType kPreppedSubScore				= 5;
-const tGameScoreType kEnteredSubScore				= 5;
-const tGameScoreType kExitedSubScore				= 10;
-const tGameScoreType kSawRobotAt54NorthScore		= 5;
-const tGameScoreType kPlayedWithClawScore			= 5;
-const tGameScoreType kUsedRetinalChipScore			= 5;
-const tGameScoreType kFinishedGlobeGameScore		= 10;
-const tGameScoreType kStoppedNoradRobotScore		= 10;
-const tGameScoreType kGotNoradOpMemChipScore		= 10;
-const tGameScoreType kFinishedNoradScore			= 10;
+const GameScoreType kSawSecurityMonitorScore		= 5;
+const GameScoreType kFilledOxygenCanisterScore		= 5;
+const GameScoreType kFilledArgonCanisterScore		= 5;
+const GameScoreType kSawUnconsciousOperatorScore	= 5;
+const GameScoreType kWentThroughPressureDoorScore	= 5;
+const GameScoreType kPreppedSubScore				= 5;
+const GameScoreType kEnteredSubScore				= 5;
+const GameScoreType kExitedSubScore				= 10;
+const GameScoreType kSawRobotAt54NorthScore		= 5;
+const GameScoreType kPlayedWithClawScore			= 5;
+const GameScoreType kUsedRetinalChipScore			= 5;
+const GameScoreType kFinishedGlobeGameScore		= 10;
+const GameScoreType kStoppedNoradRobotScore		= 10;
+const GameScoreType kGotNoradOpMemChipScore		= 10;
+const GameScoreType kFinishedNoradScore			= 10;
 
-const tGameScoreType kMaxNoradScore					=	kSawSecurityMonitorScore +
+const GameScoreType kMaxNoradScore					=	kSawSecurityMonitorScore +
 														kFilledOxygenCanisterScore +
 														kFilledArgonCanisterScore +
 														kSawUnconsciousOperatorScore +
@@ -218,28 +218,28 @@ const tGameScoreType kMaxNoradScore					=	kSawSecurityMonitorScore +
 
 //	WSC
 
-const tGameScoreType kRemovedDartScore				= 5;
-const tGameScoreType kAnalyzedDartScore				= 5;
-const tGameScoreType kBuiltAntidoteScore			= 5;
-const tGameScoreType kGotSinclairKeyScore			= 5;
-const tGameScoreType kGotArgonCanisterScore 		= 5;
-const tGameScoreType kGotNitrogenCanisterScore		= 5;
-const tGameScoreType kPlayedWithMessagesScore		= 2;
-const tGameScoreType kSawMorphExperimentScore		= 3;
-const tGameScoreType kEnteredSinclairOfficeScore	= 2;
-const tGameScoreType kSawBrochureScore				= 3;
-const tGameScoreType kSawSinclairEntry1Score		= 3;
-const tGameScoreType kSawSinclairEntry2Score		= 3;
-const tGameScoreType kSawSinclairEntry3Score		= 3;
-const tGameScoreType kSawWSCDirectoryScore			= 3;
-const tGameScoreType kUsedCrowBarInWSCScore			= 5;
-const tGameScoreType kFinishedPlasmaDodgeScore		= 10;
-const tGameScoreType kOpenedCatwalkScore			= 3;
-const tGameScoreType kStoppedWSCRobotScore			= 10;
-const tGameScoreType kGotWSCOpMemChipScore			= 10;
-const tGameScoreType kFinishedWSCScore				= 10;
+const GameScoreType kRemovedDartScore				= 5;
+const GameScoreType kAnalyzedDartScore				= 5;
+const GameScoreType kBuiltAntidoteScore			= 5;
+const GameScoreType kGotSinclairKeyScore			= 5;
+const GameScoreType kGotArgonCanisterScore 		= 5;
+const GameScoreType kGotNitrogenCanisterScore		= 5;
+const GameScoreType kPlayedWithMessagesScore		= 2;
+const GameScoreType kSawMorphExperimentScore		= 3;
+const GameScoreType kEnteredSinclairOfficeScore	= 2;
+const GameScoreType kSawBrochureScore				= 3;
+const GameScoreType kSawSinclairEntry1Score		= 3;
+const GameScoreType kSawSinclairEntry2Score		= 3;
+const GameScoreType kSawSinclairEntry3Score		= 3;
+const GameScoreType kSawWSCDirectoryScore			= 3;
+const GameScoreType kUsedCrowBarInWSCScore			= 5;
+const GameScoreType kFinishedPlasmaDodgeScore		= 10;
+const GameScoreType kOpenedCatwalkScore			= 3;
+const GameScoreType kStoppedWSCRobotScore			= 10;
+const GameScoreType kGotWSCOpMemChipScore			= 10;
+const GameScoreType kFinishedWSCScore				= 10;
 
-const tGameScoreType kMaxWSCScore					=	kRemovedDartScore +
+const GameScoreType kMaxWSCScore					=	kRemovedDartScore +
 														kAnalyzedDartScore +
 														kBuiltAntidoteScore +
 														kGotSinclairKeyScore +
@@ -262,15 +262,15 @@ const tGameScoreType kMaxWSCScore					=	kRemovedDartScore +
 
 //	Gandhi
 
-const tGameScoreType kMarsGandhiScore				= 10;
-const tGameScoreType kNoradGandhiScore				= 10;
-const tGameScoreType kWSCGandhiScore				= 10;
+const GameScoreType kMarsGandhiScore				= 10;
+const GameScoreType kNoradGandhiScore				= 10;
+const GameScoreType kWSCGandhiScore				= 10;
 
-const tGameScoreType kMaxGandhiScore				=	kMarsGandhiScore +
+const GameScoreType kMaxGandhiScore				=	kMarsGandhiScore +
 														kNoradGandhiScore +
 														kWSCGandhiScore;
 
-const tGameScoreType kMaxTotalScore					=	kMaxCaldoriaTSAScore +
+const GameScoreType kMaxTotalScore					=	kMaxCaldoriaTSAScore +
 														kMaxPrehistoricScore +
 														kMaxMarsScore +
 														kMaxNoradScore +
diff --git a/engines/pegasus/surface.h b/engines/pegasus/surface.h
index 3ccbf5913e..34a88dbd53 100755
--- a/engines/pegasus/surface.h
+++ b/engines/pegasus/surface.h
@@ -125,7 +125,7 @@ protected:
 
 class Picture : public DisplayElement, public Frame {
 public:
-	Picture(const tDisplayElementID id) : DisplayElement(id) {}
+	Picture(const DisplayElementID id) : DisplayElement(id) {}
 	virtual ~Picture() {}
 
 	virtual void initFromPICTFile(const Common::String &fileName, bool transparent = false);
diff --git a/engines/pegasus/timers.cpp b/engines/pegasus/timers.cpp
index c9be3655b9..a5cfa44a45 100755
--- a/engines/pegasus/timers.cpp
+++ b/engines/pegasus/timers.cpp
@@ -370,7 +370,7 @@ void NotificationCallBack::callBack() {
 		_notifier->setNotificationFlags(_callBackFlag, _callBackFlag);
 }
 
-static const tNotificationFlags kFuseExpiredFlag = 1;
+static const NotificationFlags kFuseExpiredFlag = 1;
 
 Fuse::Fuse() : _fuseNotification(0, (NotificationManager *)((PegasusEngine *)g_engine)) {
 	_fuseNotification.notifyMe(this, kFuseExpiredFlag, kFuseExpiredFlag);
@@ -412,7 +412,7 @@ TimeValue Fuse::getTimeRemaining() {
 	return _fuseTimer.getStop() - _fuseTimer.getTime();
 }
 
-void Fuse::receiveNotification(Notification *, const tNotificationFlags) {
+void Fuse::receiveNotification(Notification *, const NotificationFlags) {
 	stopFuse();
 	invokeAction();
 }
diff --git a/engines/pegasus/timers.h b/engines/pegasus/timers.h
index 80cec52a45..5c96b6dda3 100755
--- a/engines/pegasus/timers.h
+++ b/engines/pegasus/timers.h
@@ -201,14 +201,14 @@ public:
 	
 	void setNotification(Notification *notifier) { _notifier = notifier; }
 
-	void setCallBackFlag(const tNotificationFlags flag) { _callBackFlag = flag; }
-	tNotificationFlags getCallBackFlag() const { return _callBackFlag; }
+	void setCallBackFlag(const NotificationFlags flag) { _callBackFlag = flag; }
+	NotificationFlags getCallBackFlag() const { return _callBackFlag; }
 	
 protected:
 	void callBack();
 	
 	Notification *_notifier;
-	tNotificationFlags _callBackFlag;
+	NotificationFlags _callBackFlag;
 };
 
 class DynamicElement : public TimeBase {
@@ -234,7 +234,7 @@ public:
 	bool isFusePaused() { return _fuseTimer.isPaused(); }
 
 protected:
-	virtual void receiveNotification(Notification *, const tNotificationFlags);
+	virtual void receiveNotification(Notification *, const NotificationFlags);
 	virtual void invokeAction() {}
 
 	TimeBase _fuseTimer;
diff --git a/engines/pegasus/transition.cpp b/engines/pegasus/transition.cpp
index 73bd277233..24e9aaf4a2 100755
--- a/engines/pegasus/transition.cpp
+++ b/engines/pegasus/transition.cpp
@@ -63,7 +63,7 @@ uint32 ScreenFader::getBlack() {
 	return g_system->getScreenFormat().RGBToColor(0, 0, 0);
 }
 
-Transition::Transition(const tDisplayElementID id) : FaderAnimation(id) {
+Transition::Transition(const DisplayElementID id) : FaderAnimation(id) {
 	_outPicture = 0;
 	_inPicture = 0;
 }
diff --git a/engines/pegasus/transition.h b/engines/pegasus/transition.h
index 718808c5d8..8be095adf2 100755
--- a/engines/pegasus/transition.h
+++ b/engines/pegasus/transition.h
@@ -57,7 +57,7 @@ const long kTransitionRange = kTransitionTop - kTransitionBottom;
 
 class Transition : public FaderAnimation {
 public:
-	Transition(const tDisplayElementID id);
+	Transition(const DisplayElementID id);
 	virtual ~Transition() {}
 	
 	virtual void setBounds(const Common::Rect &);
@@ -70,30 +70,30 @@ protected:
 	DisplayElement *_outPicture;
 	DisplayElement *_inPicture;
 
-	tCoordType _boundsWidth, _boundsHeight;
+	CoordType _boundsWidth, _boundsHeight;
 };
 
 class Slide : public Transition {
 public:
-	Slide(const tDisplayElementID id) : Transition(id) {}
+	Slide(const DisplayElementID id) : Transition(id) {}
 	virtual ~Slide() {}
 
-	virtual void setSlideDirection(tSlideDirection dir) { _direction = dir; }
+	virtual void setSlideDirection(SlideDirection dir) { _direction = dir; }
 	virtual void draw(const Common::Rect &);
 
-	virtual void setDirection(const tSlideDirection dir) { _direction = dir; }
+	virtual void setDirection(const SlideDirection dir) { _direction = dir; }
 
 protected:
 	virtual void adjustSlideRects(Common::Rect &, Common::Rect &);
 	virtual void drawElements(const Common::Rect &, const Common::Rect &, const Common::Rect &);
 	virtual void drawSlideElement(const Common::Rect &, const Common::Rect &, DisplayElement *);
 
-	tSlideDirection _direction;
+	SlideDirection _direction;
 };
 
 class Push : public Slide {
 public:
-	Push(const tDisplayElementID id) : Slide(id) {}
+	Push(const DisplayElementID id) : Slide(id) {}
 	virtual ~Push() {}
 
 protected:
diff --git a/engines/pegasus/types.h b/engines/pegasus/types.h
index d02573744e..6527e2ce27 100755
--- a/engines/pegasus/types.h
+++ b/engines/pegasus/types.h
@@ -32,23 +32,23 @@ namespace Pegasus {
 
 // TODO: Probably all of these don't really need to be typedef'd...
 
-typedef int32 tDisplayElementID;
-typedef int32 tDisplayOrder;
+typedef int32 DisplayElementID;
+typedef int32 DisplayOrder;
 
-typedef int16 tHotSpotID;
-typedef uint32 tHotSpotFlags;
+typedef int16 HotSpotID;
+typedef uint32 HotSpotFlags;
 
-typedef byte tButtonState;
-typedef uint32 tInputBits;
+typedef byte ButtonState;
+typedef uint32 InputBits;
 
-typedef int32 tNotificationID;
-typedef uint32 tNotificationFlags;
+typedef int32 NotificationID;
+typedef uint32 NotificationFlags;
 
 // Mac types.
-typedef int16 tResIDType;
-typedef int16 tCoordType;
+typedef int16 ResIDType;
+typedef int16 CoordType;
 
-enum tSlideDirection {
+enum SlideDirection {
 	kSlideLeftMask = 1,
 	kSlideRightMask = kSlideLeftMask << 1,
 	kSlideUpMask = kSlideRightMask << 1 << 1,
@@ -67,56 +67,56 @@ enum tSlideDirection {
 typedef uint TimeValue;
 typedef uint TimeScale;
 
-typedef int16 tGameID;
+typedef int16 GameID;
 
-typedef tGameID tItemID;
-typedef tGameID tActorID;
-typedef tGameID tRoomID;
-typedef tGameID tNeighborhoodID;
-typedef byte tAlternateID;
-typedef int8 tHotSpotActivationID;
+typedef GameID ItemID;
+typedef GameID ActorID;
+typedef GameID RoomID;
+typedef GameID NeighborhoodID;
+typedef byte AlternateID;
+typedef int8 HotSpotActivationID;
 
-typedef int16 tWeightType;
+typedef int16 WeightType;
 
-typedef byte tDirectionConstant;
-typedef byte tTurnDirection;
+typedef byte DirectionConstant;
+typedef byte TurnDirection;
 
 // Meant to be room in low 16 bits and direction in high 16 bits.
-typedef uint32 tRoomViewID;
+typedef uint32 RoomViewID;
 
-#define MakeRoomView(room, direction) (((tRoomViewID) (room)) | (((tRoomViewID) (direction)) << 16))
+#define MakeRoomView(room, direction) (((RoomViewID) (room)) | (((RoomViewID) (direction)) << 16))
 
-typedef uint32 tExtraID;
+typedef uint32 ExtraID;
 
-typedef int16 tGameMode;
+typedef int16 GameMode;
 
-typedef int16 tWeightType;
+typedef int16 WeightType;
 
-typedef int16 tItemState;
+typedef int16 ItemState;
 
-typedef int8 tDeathReason;
+typedef int8 DeathReason;
 
-typedef int32 tGameMenuCommand;
+typedef int32 GameMenuCommand;
 
-typedef int32 tGameScoreType;
+typedef int32 GameScoreType;
 
-typedef long tCanMoveForwardReason;
+typedef long CanMoveForwardReason;
 
-typedef long tCanTurnReason;
+typedef long CanTurnReason;
 
-typedef long tCanOpenDoorReason;
+typedef long CanOpenDoorReason;
 
-enum tInventoryResult {
+enum InventoryResult {
 	kInventoryOK,
 	kTooMuchWeight,
 	kItemNotInInventory
 };
 
-typedef int32 tInteractionID;
+typedef int32 InteractionID;
 
-typedef int32 tAIConditionID;
+typedef int32 AIConditionID;
 
-enum tEnergyStage {
+enum EnergyStage {
 	kStageNoStage,
 	kStageCasual,				//	more than 50% energy
 	kStageWorried,				//	more than 25% energy
@@ -124,32 +124,32 @@ enum tEnergyStage {
 	kStagePanicStricken			//	less than 5% energy
 };
 
-enum tNoradSubPrepState {
+enum NoradSubPrepState {
 	kSubNotPrepped,
 	kSubPrepped,
 	kSubDamaged
 };
 
-enum tLowerClientSignature {
+enum LowerClientSignature {
 	kNoClientSignature,
 	kInventorySignature,
 	kBiochipSignature,
 	kAISignature
 };
 
-enum tLowerAreaSignature {
+enum LowerAreaSignature {
 	kLeftAreaSignature,
 	kMiddleAreaSignature,
 	kRightAreaSignature
 };
 
-enum tAirQuality {
+enum AirQuality {
 	kAirQualityGood,
 	kAirQualityDirty,
 	kAirQualityVacuum
 };
 
-enum tDragType {
+enum DragType {
 	kDragNoDrag,
 	kDragInventoryPickup,
 	kDragBiochipPickup,