2 files changed, 22 insertions, 22 deletions

diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index 9917cfbe8a0..32fd1c0f24b 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -479,8 +479,8 @@ void ScriptMgr::OnCreateMap(Map* map)
         itr->second->OnCreate((InstanceMap*)map);
     SCR_MAP_END;
 
-    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleGround);
-        itr->second->OnCreate((BattleGroundMap*)map);
+    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleground);
+        itr->second->OnCreate((BattlegroundMap*)map);
     SCR_MAP_END;
 }
 
@@ -496,8 +496,8 @@ void ScriptMgr::OnDestroyMap(Map* map)
         itr->second->OnDestroy((InstanceMap*)map);
     SCR_MAP_END;
 
-    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleGround);
-        itr->second->OnDestroy((BattleGroundMap*)map);
+    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleground);
+        itr->second->OnDestroy((BattlegroundMap*)map);
     SCR_MAP_END;
 }
 
@@ -514,8 +514,8 @@ void ScriptMgr::OnLoadGridMap(Map* map, GridMap* gmap, uint32 gx, uint32 gy)
         itr->second->OnLoadGridMap((InstanceMap*)map, gmap, gx, gy);
     SCR_MAP_END;
 
-    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleGround);
-        itr->second->OnLoadGridMap((BattleGroundMap*)map, gmap, gx, gy);
+    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleground);
+        itr->second->OnLoadGridMap((BattlegroundMap*)map, gmap, gx, gy);
     SCR_MAP_END;
 }
 
@@ -532,8 +532,8 @@ void ScriptMgr::OnUnloadGridMap(Map* map, GridMap* gmap, uint32 gx, uint32 gy)
         itr->second->OnUnloadGridMap((InstanceMap*)map, gmap, gx, gy);
     SCR_MAP_END;
 
-    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleGround);
-        itr->second->OnUnloadGridMap((BattleGroundMap*)map, gmap, gx, gy);
+    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleground);
+        itr->second->OnUnloadGridMap((BattlegroundMap*)map, gmap, gx, gy);
     SCR_MAP_END;
 }
 
@@ -550,8 +550,8 @@ void ScriptMgr::OnPlayerEnterMap(Map* map, Player* player)
         itr->second->OnPlayerEnter((InstanceMap*)map, player);
     SCR_MAP_END;
 
-    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleGround);
-        itr->second->OnPlayerEnter((BattleGroundMap*)map, player);
+    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleground);
+        itr->second->OnPlayerEnter((BattlegroundMap*)map, player);
     SCR_MAP_END;
 }
 
@@ -568,8 +568,8 @@ void ScriptMgr::OnPlayerLeaveMap(Map* map, Player* player)
         itr->second->OnPlayerLeave((InstanceMap*)map, player);
     SCR_MAP_END;
 
-    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleGround);
-        itr->second->OnPlayerLeave((BattleGroundMap*)map, player);
+    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleground);
+        itr->second->OnPlayerLeave((BattlegroundMap*)map, player);
     SCR_MAP_END;
 }
 
@@ -585,8 +585,8 @@ void ScriptMgr::OnMapUpdate(Map* map, uint32 diff)
         itr->second->OnUpdate((InstanceMap*)map, diff);
     SCR_MAP_END;
 
-    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleGround);
-        itr->second->OnUpdate((BattleGroundMap*)map, diff);
+    SCR_MAP_BGN(BattlegroundMapScript, map, itr, end, entry, IsBattleground);
+        itr->second->OnUpdate((BattlegroundMap*)map, diff);
     SCR_MAP_END;
 }
 
@@ -849,7 +849,7 @@ bool ScriptMgr::OnAreaTrigger(Player* player, AreaTriggerEntry const* trigger)
     return tmpscript->OnTrigger(player, trigger);
 }
 
-BattleGround* ScriptMgr::CreateBattleground(BattleGroundTypeId typeId)
+Battleground* ScriptMgr::CreateBattleground(BattlegroundTypeId typeId)
 {
     // TODO: Implement script-side battlegrounds.
     ASSERT(false);
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 4ea345d142a..28936e93f46 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -26,7 +26,7 @@
 #include "DBCStructure.h"
 #include "Config.h"
 #include "ObjectMgr.h"
-#include "BattleGround.h"
+#include "Battleground.h"
 #include "OutdoorPvPMgr.h"
 #include "SharedDefines.h"
 #include "Chat.h"
@@ -425,14 +425,14 @@ class InstanceMapScript : public ScriptObject, public MapScript<InstanceMap>
         virtual InstanceData* GetInstanceData(InstanceMap* map) const { return NULL; }
 };
 
-class BattlegroundMapScript : public ScriptObject, public MapScript<BattleGroundMap>
+class BattlegroundMapScript : public ScriptObject, public MapScript<BattlegroundMap>
 {
     protected:
 
         BattlegroundMapScript(const char* name, uint32 mapId)
-            : ScriptObject(name), MapScript<BattleGroundMap>(mapId)
+            : ScriptObject(name), MapScript<BattlegroundMap>(mapId)
         {
-            if (GetEntry() && !GetEntry()->IsBattleGround())
+            if (GetEntry() && !GetEntry()->IsBattleground())
                 sLog.outError("BattlegroundMapScript for map %u is invalid.", mapId);
         }
 
@@ -582,8 +582,8 @@ class BattlegroundScript : public ScriptObject
 
         bool IsDatabaseBound() const { return true; }
 
-        // Should return a fully valid BattleGround object for the type ID.
-        virtual BattleGround* GetBattleground() const = 0;
+        // Should return a fully valid Battleground object for the type ID.
+        virtual Battleground* GetBattleground() const = 0;
 };
 
 class OutdoorPvPScript : public ScriptObject
@@ -893,7 +893,7 @@ class ScriptMgr
 
     public: /* BattlegroundScript */
 
-        BattleGround* CreateBattleground(BattleGroundTypeId typeId);
+        Battleground* CreateBattleground(BattlegroundTypeId typeId);
 
     public: /* OutdoorPvPScript */