Index: trunk/src/game/SkillDiscovery.cpp
===================================================================
--- trunk/src/game/SkillDiscovery.cpp (revision 173)
+++ trunk/src/game/SkillDiscovery.cpp (revision 206)
@@ -43,5 +43,5 @@
 
 typedef std::list<SkillDiscoveryEntry> SkillDiscoveryList;
-typedef HM_NAMESPACE::hash_map<int32, SkillDiscoveryList> SkillDiscoveryMap;
+typedef UNORDERED_MAP<int32, SkillDiscoveryList> SkillDiscoveryMap;
 
 static SkillDiscoveryMap SkillDiscoveryStore;
Index: trunk/src/game/Object.h
===================================================================
--- trunk/src/game/Object.h (revision 174)
+++ trunk/src/game/Object.h (revision 206)
@@ -95,5 +95,5 @@
 class GameObject;
 
-typedef HM_NAMESPACE::hash_map<Player*, UpdateData> UpdateDataMapType;
+typedef UNORDERED_MAP<Player*, UpdateData> UpdateDataMapType;
 
 struct WorldLocation
Index: trunk/src/game/MapManager.h
===================================================================
--- trunk/src/game/MapManager.h (revision 102)
+++ trunk/src/game/MapManager.h (revision 206)
@@ -34,6 +34,6 @@
 
     friend class Trinity::OperatorNew<MapManager>;
-    typedef HM_NAMESPACE::hash_map<uint32, Map*> MapMapType;
-    typedef std::pair<HM_NAMESPACE::hash_map<uint32, Map*>::iterator, bool>  MapMapPair;
+    typedef UNORDERED_MAP<uint32, Map*> MapMapType;
+    typedef std::pair<UNORDERED_MAP<uint32, Map*>::iterator, bool>  MapMapPair;
 
     public:
Index: trunk/src/game/ItemEnchantmentMgr.cpp
===================================================================
--- trunk/src/game/ItemEnchantmentMgr.cpp (revision 102)
+++ trunk/src/game/ItemEnchantmentMgr.cpp (revision 206)
@@ -43,5 +43,5 @@
 
 typedef std::vector<EnchStoreItem> EnchStoreList;
-typedef HM_NAMESPACE::hash_map<uint32, EnchStoreList> EnchantmentStore;
+typedef UNORDERED_MAP<uint32, EnchStoreList> EnchantmentStore;
 
 static EnchantmentStore RandomItemEnch;
Index: trunk/src/game/Group.h
===================================================================
--- trunk/src/game/Group.h (revision 132)
+++ trunk/src/game/Group.h (revision 206)
@@ -143,5 +143,5 @@
         typedef MemberSlotList::const_iterator member_citerator;
 
-        typedef HM_NAMESPACE::hash_map< uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap;
+        typedef UNORDERED_MAP< uint32 /*mapId*/, InstanceGroupBind> BoundInstancesMap;
     protected:
         typedef MemberSlotList::iterator member_witerator;
Index: trunk/src/game/Map.h
===================================================================
--- trunk/src/game/Map.h (revision 174)
+++ trunk/src/game/Map.h (revision 206)
@@ -119,5 +119,5 @@
 #endif
 
-typedef HM_NAMESPACE::hash_map<Creature*, CreatureMover> CreatureMoveList;
+typedef UNORDERED_MAP<Creature*, CreatureMover> CreatureMoveList;
 
 #define MAX_HEIGHT            100000.0f                     // can be use for find ground height at surface
Index: trunk/src/game/Pet.h
===================================================================
--- trunk/src/game/Pet.h (revision 152)
+++ trunk/src/game/Pet.h (revision 206)
@@ -116,5 +116,5 @@
 };
 
-typedef HM_NAMESPACE::hash_map<uint16, PetSpell*> PetSpellMap;
+typedef UNORDERED_MAP<uint16, PetSpell*> PetSpellMap;
 typedef std::map<uint32,uint32> TeachSpellMap;
 typedef std::vector<uint32> AutoSpellList;
Index: trunk/src/game/ObjectAccessor.h
===================================================================
--- trunk/src/game/ObjectAccessor.h (revision 174)
+++ trunk/src/game/ObjectAccessor.h (revision 206)
@@ -25,5 +25,5 @@
 #include "Policies/Singleton.h"
 #include "zthread/FastMutex.h"
-#include "Utilities/HashMap.h"
+#include "Utilities/UnorderedMap.h"
 #include "Policies/ThreadingModel.h"
 
@@ -50,5 +50,5 @@
     public:
 
-        typedef HM_NAMESPACE::hash_map< uint64, T* >   MapType;
+        typedef UNORDERED_MAP< uint64, T* >   MapType;
         typedef ZThread::FastMutex LockType;
         typedef Trinity::GeneralLock<LockType > Guard;
@@ -92,6 +92,6 @@
 
     public:
-        typedef HM_NAMESPACE::hash_map<uint64, Corpse* >      Player2CorpsesMapType;
-        typedef HM_NAMESPACE::hash_map<Player*, UpdateData>::value_type UpdateDataValueType;
+        typedef UNORDERED_MAP<uint64, Corpse* >      Player2CorpsesMapType;
+        typedef UNORDERED_MAP<Player*, UpdateData>::value_type UpdateDataValueType;
 
         template<class T> static T* GetObjectInWorld(uint64 guid, T* /*fake*/)
Index: trunk/src/game/HateMatrix.h
===================================================================
--- trunk/src/game/HateMatrix.h (revision 102)
+++ trunk/src/game/HateMatrix.h (revision 206)
@@ -22,5 +22,5 @@
 #define TRINITY_HATEMATRIX_H
 
-#include "Utilities/HashMap.h"
+#include "Utilities/UnorderedMap.h"
 #include <cassert>
 
Index: trunk/src/game/MapInstanced.h
===================================================================
--- trunk/src/game/MapInstanced.h (revision 102)
+++ trunk/src/game/MapInstanced.h (revision 206)
@@ -29,5 +29,5 @@
     friend class MapManager;
     public:
-        typedef HM_NAMESPACE::hash_map< uint32, Map* > InstancedMaps;
+        typedef UNORDERED_MAP< uint32, Map* > InstancedMaps;
 
         MapInstanced(uint32 id, time_t, uint32 aInstanceId);
Index: trunk/src/game/Player.h
===================================================================
--- trunk/src/game/Player.h (revision 178)
+++ trunk/src/game/Player.h (revision 206)
@@ -92,5 +92,5 @@
 };
 
-typedef HM_NAMESPACE::hash_map<uint16, PlayerSpell*> PlayerSpellMap;
+typedef UNORDERED_MAP<uint16, PlayerSpell*> PlayerSpellMap;
 typedef std::list<SpellModifier*> SpellModList;
 
@@ -1367,5 +1367,5 @@
         time_t m_nextMailDelivereTime;
 
-        typedef HM_NAMESPACE::hash_map<uint32, Item*> ItemMap;
+        typedef UNORDERED_MAP<uint32, Item*> ItemMap;
 
         ItemMap mMitems;                                    //template defined in objectmgr.cpp
@@ -2025,5 +2025,5 @@
         /*********************************************************/
 
-        typedef HM_NAMESPACE::hash_map< uint32 /*mapId*/, InstancePlayerBind > BoundInstancesMap;
+        typedef UNORDERED_MAP< uint32 /*mapId*/, InstancePlayerBind > BoundInstancesMap;
 
         void UpdateHomebindTime(uint32 time);
Index: trunk/src/game/SpellMgr.h
===================================================================
--- trunk/src/game/SpellMgr.h (revision 196)
+++ trunk/src/game/SpellMgr.h (revision 206)
@@ -29,5 +29,5 @@
 #include "Database/SQLStorage.h"
 
-#include "Utilities/HashMap.h"
+#include "Utilities/UnorderedMap.h"
 #include <map>
 
@@ -493,5 +493,5 @@
 };
 
-typedef HM_NAMESPACE::hash_map<uint32, SpellProcEventEntry> SpellProcEventMap;
+typedef UNORDERED_MAP<uint32, SpellProcEventEntry> SpellProcEventMap;
 
 #define ELIXIR_BATTLE_MASK    0x1
@@ -532,5 +532,5 @@
 };
 
-typedef HM_NAMESPACE::hash_map<uint32, SpellTargetPosition> SpellTargetPositionMap;
+typedef UNORDERED_MAP<uint32, SpellTargetPosition> SpellTargetPositionMap;
 
 // Spell pet auras
@@ -595,5 +595,5 @@
 };
 
-typedef HM_NAMESPACE::hash_map<uint32, SpellChainNode> SpellChainMap;
+typedef UNORDERED_MAP<uint32, SpellChainNode> SpellChainMap;
 typedef std::multimap<uint32, uint32> SpellChainMapNext;
 
Index: trunk/src/game/World.h
===================================================================
--- trunk/src/game/World.h (revision 149)
+++ trunk/src/game/World.h (revision 206)
@@ -505,7 +505,7 @@
         uint32 mail_timer_expires;
 
-        typedef HM_NAMESPACE::hash_map<uint32, Weather*> WeatherMap;
+        typedef UNORDERED_MAP<uint32, Weather*> WeatherMap;
         WeatherMap m_weathers;
-        typedef HM_NAMESPACE::hash_map<uint32, WorldSession*> SessionMap;
+        typedef UNORDERED_MAP<uint32, WorldSession*> SessionMap;
         SessionMap m_sessions;
         std::set<WorldSession*> m_kicked_sessions;
Index: trunk/src/game/InstanceSaveMgr.h
===================================================================
--- trunk/src/game/InstanceSaveMgr.h (revision 102)
+++ trunk/src/game/InstanceSaveMgr.h (revision 206)
@@ -28,5 +28,5 @@
 #include <list>
 #include <map>
-#include "Utilities/HashMap.h"
+#include "Utilities/UnorderedMap.h"
 #include "Database/DatabaseEnv.h"
 
@@ -122,5 +122,5 @@
 
         typedef std::map<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveMap;
-        typedef HM_NAMESPACE::hash_map<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveHashMap;
+        typedef UNORDERED_MAP<uint32 /*InstanceId*/, InstanceSave*> InstanceSaveHashMap;
         typedef std::map<uint32 /*mapId*/, InstanceSaveMap> InstanceSaveMapMap;
 
Index: trunk/src/game/ObjectMgr.h
===================================================================
--- trunk/src/game/ObjectMgr.h (revision 168)
+++ trunk/src/game/ObjectMgr.h (revision 206)
@@ -75,5 +75,5 @@
 };
 
-typedef HM_NAMESPACE::hash_map<uint32, GameTele > GameTeleMap;
+typedef UNORDERED_MAP<uint32, GameTele > GameTeleMap;
 typedef std::list<GossipOption> CacheNpcOptionList;
 
@@ -124,8 +124,8 @@
     CellCorpseSet corpses;
 };
-typedef HM_NAMESPACE::hash_map<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap;
-typedef HM_NAMESPACE::hash_map<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids;
-
-typedef HM_NAMESPACE::hash_map<uint64/*(instance,guid) pair*/,time_t> RespawnTimes;
+typedef UNORDERED_MAP<uint32/*cell_id*/,CellObjectGuids> CellObjectGuidsMap;
+typedef UNORDERED_MAP<uint32/*(mapid,spawnMode) pair*/,CellObjectGuidsMap> MapObjectGuids;
+
+typedef UNORDERED_MAP<uint64/*(instance,guid) pair*/,time_t> RespawnTimes;
 
 struct TrinityStringLocale
@@ -134,14 +134,14 @@
 };
 
-typedef HM_NAMESPACE::hash_map<uint32,CreatureData> CreatureDataMap;
-typedef HM_NAMESPACE::hash_map<uint32,GameObjectData> GameObjectDataMap;
-typedef HM_NAMESPACE::hash_map<uint32,CreatureLocale> CreatureLocaleMap;
-typedef HM_NAMESPACE::hash_map<uint32,GameObjectLocale> GameObjectLocaleMap;
-typedef HM_NAMESPACE::hash_map<uint32,ItemLocale> ItemLocaleMap;
-typedef HM_NAMESPACE::hash_map<uint32,QuestLocale> QuestLocaleMap;
-typedef HM_NAMESPACE::hash_map<uint32,NpcTextLocale> NpcTextLocaleMap;
-typedef HM_NAMESPACE::hash_map<uint32,PageTextLocale> PageTextLocaleMap;
-typedef HM_NAMESPACE::hash_map<uint32,TrinityStringLocale> TrinityStringLocaleMap;
-typedef HM_NAMESPACE::hash_map<uint32,NpcOptionLocale> NpcOptionLocaleMap;
+typedef UNORDERED_MAP<uint32,CreatureData> CreatureDataMap;
+typedef UNORDERED_MAP<uint32,GameObjectData> GameObjectDataMap;
+typedef UNORDERED_MAP<uint32,CreatureLocale> CreatureLocaleMap;
+typedef UNORDERED_MAP<uint32,GameObjectLocale> GameObjectLocaleMap;
+typedef UNORDERED_MAP<uint32,ItemLocale> ItemLocaleMap;
+typedef UNORDERED_MAP<uint32,QuestLocale> QuestLocaleMap;
+typedef UNORDERED_MAP<uint32,NpcTextLocale> NpcTextLocaleMap;
+typedef UNORDERED_MAP<uint32,PageTextLocale> PageTextLocaleMap;
+typedef UNORDERED_MAP<uint32,TrinityStringLocale> TrinityStringLocaleMap;
+typedef UNORDERED_MAP<uint32,NpcOptionLocale> NpcOptionLocaleMap;
 
 typedef std::multimap<uint32,uint32> QuestRelations;
@@ -229,5 +229,5 @@
     uint32 unArenaInfoSlot2;
 }CachePlayerInfo, *PCachePlayerInfo;
-typedef HM_NAMESPACE::hash_map<uint32, PCachePlayerInfo> CachePlayerInfoMap;
+typedef UNORDERED_MAP<uint32, PCachePlayerInfo> CachePlayerInfoMap;
 
 struct PlayerCondition
@@ -250,9 +250,9 @@
 
 // NPC gossip text id
-typedef HM_NAMESPACE::hash_map<uint32, uint32> CacheNpcTextIdMap;
-
-
-typedef HM_NAMESPACE::hash_map<uint32, VendorItemData> CacheVendorItemMap;
-typedef HM_NAMESPACE::hash_map<uint32, TrainerSpellData> CacheTrainerSpellMap;
+typedef UNORDERED_MAP<uint32, uint32> CacheNpcTextIdMap;
+
+
+typedef UNORDERED_MAP<uint32, VendorItemData> CacheVendorItemMap;
+typedef UNORDERED_MAP<uint32, TrainerSpellData> CacheTrainerSpellMap;
 
 enum SkillRangeType
@@ -292,5 +292,5 @@
         ~ObjectMgr();
 
-        typedef HM_NAMESPACE::hash_map<uint32, Item*> ItemMap;
+        typedef UNORDERED_MAP<uint32, Item*> ItemMap;
 
         typedef std::set< Group * > GroupSet;
@@ -298,15 +298,15 @@
         typedef std::set< ArenaTeam * > ArenaTeamSet;
 
-        typedef HM_NAMESPACE::hash_map<uint32, Quest*> QuestMap;
-
-        typedef HM_NAMESPACE::hash_map<uint32, AreaTrigger> AreaTriggerMap;
-
-        typedef HM_NAMESPACE::hash_map<uint32, std::string> AreaTriggerScriptMap;
-
-        typedef HM_NAMESPACE::hash_map<uint32, ReputationOnKillEntry> RepOnKillMap;
-
-        typedef HM_NAMESPACE::hash_map<uint32, WeatherZoneChances> WeatherZoneMap;
-
-        typedef HM_NAMESPACE::hash_map<uint32, PetCreateSpellEntry> PetCreateSpellMap;
+        typedef UNORDERED_MAP<uint32, Quest*> QuestMap;
+
+        typedef UNORDERED_MAP<uint32, AreaTrigger> AreaTriggerMap;
+
+        typedef UNORDERED_MAP<uint32, std::string> AreaTriggerScriptMap;
+
+        typedef UNORDERED_MAP<uint32, ReputationOnKillEntry> RepOnKillMap;
+
+        typedef UNORDERED_MAP<uint32, WeatherZoneChances> WeatherZoneMap;
+
+        typedef UNORDERED_MAP<uint32, PetCreateSpellEntry> PetCreateSpellMap;
 
         Player* GetPlayer(const char* name) const { return ObjectAccessor::Instance().FindPlayerByName(name);}
@@ -804,8 +804,8 @@
         QuestMap mQuestTemplates;
 
-        typedef HM_NAMESPACE::hash_map<uint32, GossipText*> GossipTextMap;
-        typedef HM_NAMESPACE::hash_map<uint32, uint32> QuestAreaTriggerMap;
-        typedef HM_NAMESPACE::hash_map<uint32, uint32> BattleMastersMap;
-        typedef HM_NAMESPACE::hash_map<uint32, std::string> ItemTextMap;
+        typedef UNORDERED_MAP<uint32, GossipText*> GossipTextMap;
+        typedef UNORDERED_MAP<uint32, uint32> QuestAreaTriggerMap;
+        typedef UNORDERED_MAP<uint32, uint32> BattleMastersMap;
+        typedef UNORDERED_MAP<uint32, std::string> ItemTextMap;
         typedef std::set<uint32> TavernAreaTriggerSet;
         typedef std::set<uint32> GameObjectForQuestSet;
Index: trunk/src/game/LootMgr.h
===================================================================
--- trunk/src/game/LootMgr.h (revision 102)
+++ trunk/src/game/LootMgr.h (revision 206)
@@ -123,5 +123,5 @@
 typedef std::map<uint32, QuestItemList *> QuestItemMap;
 typedef std::vector<LootStoreItem> LootStoreItemList;
-typedef HM_NAMESPACE::hash_map<uint32, LootTemplate*> LootTemplateMap;
+typedef UNORDERED_MAP<uint32, LootTemplate*> LootTemplateMap;
 
 typedef std::set<uint32> LootIdSet;
Index: trunk/src/game/WaypointManager.h
===================================================================
--- trunk/src/game/WaypointManager.h (revision 102)
+++ trunk/src/game/WaypointManager.h (revision 206)
@@ -24,5 +24,5 @@
 #include <vector>
 #include <string>
-#include "Utilities/HashMap.h"
+#include "Utilities/UnorderedMap.h"
 
 struct WaypointBehavior
@@ -83,5 +83,5 @@
         void _clearPath(WaypointPath &path);
 
-        typedef HM_NAMESPACE::hash_map<uint32, WaypointPath> WaypointPathMap;
+        typedef UNORDERED_MAP<uint32, WaypointPath> WaypointPathMap;
         WaypointPathMap m_pathMap;
 };
Index: trunk/src/game/ObjectAccessor.cpp
===================================================================
--- trunk/src/game/ObjectAccessor.cpp (revision 174)
+++ trunk/src/game/ObjectAccessor.cpp (revision 206)
@@ -670,5 +670,5 @@
 /// Define the static member of HashMapHolder
 
-template <class T> HM_NAMESPACE::hash_map< uint64, T* > HashMapHolder<T>::m_objectMap;
+template <class T> UNORDERED_MAP< uint64, T* > HashMapHolder<T>::m_objectMap;
 template <class T> ZThread::FastMutex HashMapHolder<T>::i_lock;