SWORD25: removed BS_ prefix from rest of the classes.

The things which are intentionally left with the prefix:
BS_LOG, BS_ASSERT, BS_Rect, BS_String.

svn-id: r53261

1 files changed, 79 insertions, 79 deletions

diff --git a/engines/sword25/kernel/kernel_script.cpp b/engines/sword25/kernel/kernel_script.cpp
index 9ae78d1e95..f1c75bd691 100644
--- a/engines/sword25/kernel/kernel_script.cpp
+++ b/engines/sword25/kernel/kernel_script.cpp
@@ -50,7 +50,7 @@ namespace Sword25 {
 // -----------------------------------------------------------------------------
 
 static int DisconnectService(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushboolean(L, pKernel->DisconnectService(luaL_checkstring(L, 1)));
@@ -61,7 +61,7 @@ static int DisconnectService(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetActiveServiceIdentifier(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushstring(L, pKernel->GetActiveServiceIdentifier(luaL_checkstring(L, 1)).c_str());
@@ -72,7 +72,7 @@ static int GetActiveServiceIdentifier(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetSuperclassCount(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushnumber(L, pKernel->GetSuperclassCount());
@@ -83,7 +83,7 @@ static int GetSuperclassCount(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetSuperclassIdentifier(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushstring(L, pKernel->GetSuperclassIdentifier(
@@ -95,7 +95,7 @@ static int GetSuperclassIdentifier(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetServiceCount(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushnumber(L, pKernel->GetServiceCount(luaL_checkstring(L, 1)));
@@ -106,7 +106,7 @@ static int GetServiceCount(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetServiceIdentifier(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushstring(L, pKernel->GetServiceIdentifier(luaL_checkstring(L, 1),
@@ -118,7 +118,7 @@ static int GetServiceIdentifier(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetMilliTicks(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushnumber(L, pKernel->GetMilliTicks());
@@ -129,7 +129,7 @@ static int GetMilliTicks(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetTimer(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushnumber(L, static_cast<lua_Number>(pKernel->GetMicroTicks()) / 1000000.0);
@@ -140,7 +140,7 @@ static int GetTimer(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int StartService(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 
 	lua_pushbooleancpp(L, pKernel->NewService(luaL_checkstring(L, 1), luaL_checkstring(L, 2)) != NULL);
@@ -151,7 +151,7 @@ static int StartService(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int Sleep(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 	pKernel->Sleep(static_cast<unsigned int>(luaL_checknumber(L, 1) * 1000));
 	return 0;
@@ -160,7 +160,7 @@ static int Sleep(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int Crash(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 	pKernel->Crash();
 	return 0;
@@ -169,7 +169,7 @@ static int Crash(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int ExecuteFile(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
 	ScriptEngine *pSE = static_cast<ScriptEngine *>(pKernel->GetService("script"));
 	BS_ASSERT(pSE);
@@ -182,28 +182,28 @@ static int ExecuteFile(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetUserdataDirectory(lua_State *L) {
-	lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetUserdataDirectory().c_str());
+	lua_pushstring(L, FileSystemUtil::GetInstance().GetUserdataDirectory().c_str());
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int GetPathSeparator(lua_State *L) {
-	lua_pushstring(L, BS_FileSystemUtil::GetInstance().GetPathSeparator().c_str());
+	lua_pushstring(L, FileSystemUtil::GetInstance().GetPathSeparator().c_str());
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int FileExists(lua_State *L) {
-	lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().FileExists(luaL_checkstring(L, 1)));
+	lua_pushbooleancpp(L, FileSystemUtil::GetInstance().FileExists(luaL_checkstring(L, 1)));
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int CreateDirectory(lua_State *L) {
-	lua_pushbooleancpp(L, BS_FileSystemUtil::GetInstance().CreateDirectory(luaL_checkstring(L, 1)));
+	lua_pushbooleancpp(L, FileSystemUtil::GetInstance().CreateDirectory(luaL_checkstring(L, 1)));
 	return 1;
 }
 
@@ -225,7 +225,7 @@ static int GetSubversionRevision(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetUsedMemory(lua_State *L) {
-	lua_pushnumber(L, BS_Kernel::GetInstance()->GetUsedMemory());
+	lua_pushnumber(L, Kernel::GetInstance()->GetUsedMemory());
 	return 1;
 }
 
@@ -259,9 +259,9 @@ static const luaL_reg KERNEL_FUNCTIONS[] = {
 // -----------------------------------------------------------------------------
 
 static int IsVisible(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushbooleancpp(L, pWindow->IsVisible());
@@ -272,9 +272,9 @@ static int IsVisible(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int SetVisible(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	pWindow->SetVisible(lua_tobooleancpp(L, 1));
@@ -285,9 +285,9 @@ static int SetVisible(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetX(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushnumber(L, pWindow->GetX());
@@ -298,9 +298,9 @@ static int GetX(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetY(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushnumber(L, pWindow->GetY());
@@ -311,9 +311,9 @@ static int GetY(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int SetX(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	pWindow->SetX(static_cast<int>(luaL_checknumber(L, 1)));
@@ -324,9 +324,9 @@ static int SetX(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int SetY(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	pWindow->SetY(static_cast<int>(luaL_checknumber(L, 1)));
@@ -337,9 +337,9 @@ static int SetY(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetClientX(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushnumber(L, pWindow->GetClientX());
@@ -350,9 +350,9 @@ static int GetClientX(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetClientY(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushnumber(L, pWindow->GetClientY());
@@ -363,9 +363,9 @@ static int GetClientY(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetWidth(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushnumber(L, pWindow->GetWidth());
@@ -376,9 +376,9 @@ static int GetWidth(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetHeight(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushnumber(L, pWindow->GetHeight());
@@ -389,9 +389,9 @@ static int GetHeight(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int SetWidth(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	pWindow->SetWidth(static_cast<int>(luaL_checknumber(L, 1)));
@@ -402,9 +402,9 @@ static int SetWidth(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int SetHeight(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	pWindow->SetHeight(static_cast<int>(luaL_checknumber(L, 1)));
@@ -415,9 +415,9 @@ static int SetHeight(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetTitle(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushstring(L, pWindow->GetTitle().c_str());
@@ -428,9 +428,9 @@ static int GetTitle(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int SetTitle(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	pWindow->SetTitle(luaL_checkstring(L, 1));
@@ -441,9 +441,9 @@ static int SetTitle(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int ProcessMessages(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushbooleancpp(L, pWindow->ProcessMessages());
@@ -454,9 +454,9 @@ static int ProcessMessages(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int CloseWanted(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushbooleancpp(L, pWindow->CloseWanted());
@@ -467,9 +467,9 @@ static int CloseWanted(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int WaitForFocus(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushbooleancpp(L, pWindow->WaitForFocus());
@@ -480,9 +480,9 @@ static int WaitForFocus(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int HasFocus(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_Window *pWindow = pKernel->GetWindow();
+	Window *pWindow = pKernel->GetWindow();
 	BS_ASSERT(pWindow);
 
 	lua_pushbooleancpp(L, pWindow->HasFocus());
@@ -519,9 +519,9 @@ static const luaL_reg WINDOW_FUNCTIONS[] = {
 // -----------------------------------------------------------------------------
 
 static int PrecacheResource(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ResourceManager *pResource = pKernel->GetResourceManager();
+	ResourceManager *pResource = pKernel->GetResourceManager();
 	BS_ASSERT(pResource);
 
 	lua_pushbooleancpp(L, pResource->PrecacheResource(luaL_checkstring(L, 1)));
@@ -532,9 +532,9 @@ static int PrecacheResource(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int ForcePrecacheResource(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ResourceManager *pResource = pKernel->GetResourceManager();
+	ResourceManager *pResource = pKernel->GetResourceManager();
 	BS_ASSERT(pResource);
 
 	lua_pushbooleancpp(L, pResource->PrecacheResource(luaL_checkstring(L, 1), true));
@@ -545,9 +545,9 @@ static int ForcePrecacheResource(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetMaxMemoryUsage(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ResourceManager *pResource = pKernel->GetResourceManager();
+	ResourceManager *pResource = pKernel->GetResourceManager();
 	BS_ASSERT(pResource);
 
 	lua_pushnumber(L, pResource->GetMaxMemoryUsage());
@@ -558,9 +558,9 @@ static int GetMaxMemoryUsage(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int SetMaxMemoryUsage(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ResourceManager *pResource = pKernel->GetResourceManager();
+	ResourceManager *pResource = pKernel->GetResourceManager();
 	BS_ASSERT(pResource);
 
 	pResource->SetMaxMemoryUsage(static_cast<unsigned int>(lua_tonumber(L, 1)));
@@ -571,9 +571,9 @@ static int SetMaxMemoryUsage(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int EmptyCache(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ResourceManager *pResource = pKernel->GetResourceManager();
+	ResourceManager *pResource = pKernel->GetResourceManager();
 	BS_ASSERT(pResource);
 
 	pResource->EmptyCache();
@@ -584,9 +584,9 @@ static int EmptyCache(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int IsLogCacheMiss(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ResourceManager *pResource = pKernel->GetResourceManager();
+	ResourceManager *pResource = pKernel->GetResourceManager();
 	BS_ASSERT(pResource);
 
 	lua_pushbooleancpp(L, pResource->IsLogCacheMiss());
@@ -597,9 +597,9 @@ static int IsLogCacheMiss(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int SetLogCacheMiss(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ResourceManager *pResource = pKernel->GetResourceManager();
+	ResourceManager *pResource = pKernel->GetResourceManager();
 	BS_ASSERT(pResource);
 
 	pResource->SetLogCacheMiss(lua_tobooleancpp(L, 1));
@@ -610,9 +610,9 @@ static int SetLogCacheMiss(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int DumpLockedResources(lua_State *L) {
-	BS_Kernel *pKernel = BS_Kernel::GetInstance();
+	Kernel *pKernel = Kernel::GetInstance();
 	BS_ASSERT(pKernel);
-	BS_ResourceManager *pResource = pKernel->GetResourceManager();
+	ResourceManager *pResource = pKernel->GetResourceManager();
 	BS_ASSERT(pResource);
 
 	pResource->DumpLockedResources();
@@ -639,7 +639,7 @@ static const luaL_reg RESOURCE_FUNCTIONS[] = {
 // -----------------------------------------------------------------------------
 
 static int ReloadSlots(lua_State *L) {
-	BS_PersistenceService::GetInstance().ReloadSlots();
+	PersistenceService::GetInstance().ReloadSlots();
 	lua_pushnil(L);
 	return 1;
 }
@@ -647,14 +647,14 @@ static int ReloadSlots(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetSlotCount(lua_State *L) {
-	lua_pushnumber(L, BS_PersistenceService::GetInstance().GetSlotCount());
+	lua_pushnumber(L, PersistenceService::GetInstance().GetSlotCount());
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int IsSlotOccupied(lua_State *L) {
-	lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSlotOccupied(
+	lua_pushbooleancpp(L, PersistenceService::GetInstance().IsSlotOccupied(
 	                       static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1));
 	return 1;
 }
@@ -662,14 +662,14 @@ static int IsSlotOccupied(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetSavegameDirectory(lua_State *L) {
-	lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDirectory().c_str());
+	lua_pushstring(L, PersistenceService::GetInstance().GetSavegameDirectory().c_str());
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int IsSavegameCompatible(lua_State *L) {
-	lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().IsSavegameCompatible(
+	lua_pushbooleancpp(L, PersistenceService::GetInstance().IsSavegameCompatible(
 	                       static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1));
 	return 1;
 }
@@ -677,7 +677,7 @@ static int IsSavegameCompatible(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetSavegameDescription(lua_State *L) {
-	lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameDescription(
+	lua_pushstring(L, PersistenceService::GetInstance().GetSavegameDescription(
 	                   static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1).c_str());
 	return 1;
 }
@@ -685,21 +685,21 @@ static int GetSavegameDescription(lua_State *L) {
 // -----------------------------------------------------------------------------
 
 static int GetSavegameFilename(lua_State *L) {
-	lua_pushstring(L, BS_PersistenceService::GetInstance().GetSavegameFilename(static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1).c_str());
+	lua_pushstring(L, PersistenceService::GetInstance().GetSavegameFilename(static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1).c_str());
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int LoadGame(lua_State *L) {
-	lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().LoadGame(static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1));
+	lua_pushbooleancpp(L, PersistenceService::GetInstance().LoadGame(static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1));
 	return 1;
 }
 
 // -----------------------------------------------------------------------------
 
 static int SaveGame(lua_State *L) {
-	lua_pushbooleancpp(L, BS_PersistenceService::GetInstance().SaveGame(static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1, luaL_checkstring(L, 2)));
+	lua_pushbooleancpp(L, PersistenceService::GetInstance().SaveGame(static_cast<unsigned int>(luaL_checknumber(L, 1)) - 1, luaL_checkstring(L, 2)));
 	return 1;
 }
 
@@ -722,7 +722,7 @@ static const luaL_reg PERSISTENCE_FUNCTIONS[] = {
 
 // -----------------------------------------------------------------------------
 
-bool BS_Kernel::_RegisterScriptBindings() {
+bool Kernel::_RegisterScriptBindings() {
 	ScriptEngine *pScript = static_cast<ScriptEngine *>(GetService("script"));
 	BS_ASSERT(pScript);
 	lua_State *L = static_cast<lua_State *>(pScript->GetScriptObject());