Index: trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp
===================================================================
--- trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp (revision 202)
+++ trunk/src/bindings/scripts/scripts/creature/mob_event_ai.cpp (revision 206)
@@ -865,5 +865,5 @@
                 Creature* pCreature = NULL;
 
-                HM_NAMESPACE::hash_map<uint32, EventAI_Summon>::iterator i = EventAI_Summon_Map.find(param3);
+                UNORDERED_MAP<uint32, EventAI_Summon>::iterator i = EventAI_Summon_Map.find(param3);
 
                 if (i == EventAI_Summon_Map.end())
Index: trunk/src/bindings/scripts/scripts/creature/mob_event_ai.h
===================================================================
--- trunk/src/bindings/scripts/scripts/creature/mob_event_ai.h (revision 109)
+++ trunk/src/bindings/scripts/scripts/creature/mob_event_ai.h (revision 206)
@@ -196,5 +196,5 @@
 
 //EventSummon_Map
-extern HM_NAMESPACE::hash_map<uint32, EventAI_Summon> EventAI_Summon_Map;
+extern UNORDERED_MAP<uint32, EventAI_Summon> EventAI_Summon_Map;
 
 //EventAI Error handling
@@ -209,5 +209,5 @@
 
 //Error prevention list
-extern HM_NAMESPACE::hash_map<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList;
+extern UNORDERED_MAP<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList;
 
 //Defines
Index: trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp
===================================================================
--- trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (revision 90)
+++ trunk/src/bindings/scripts/scripts/zone/temple_of_ahnqiraj/boss_cthun.cpp (revision 206)
@@ -476,5 +476,5 @@
 
     //Stomach map, bool = true then in stomach
-    HM_NAMESPACE::hash_map<uint64, bool> Stomach_Map;
+    UNORDERED_MAP<uint64, bool> Stomach_Map;
 
     void Reset()
@@ -535,5 +535,5 @@
             return NULL;
 
-        HM_NAMESPACE::hash_map<uint64, bool>::iterator i = Stomach_Map.begin();
+        UNORDERED_MAP<uint64, bool>::iterator i = Stomach_Map.begin();
 
         std::list<Unit*> temp;
@@ -682,5 +682,5 @@
                     DoCast(m_creature, SPELL_RED_COLORATION, true);
 
-                    HM_NAMESPACE::hash_map<uint64, bool>::iterator i = Stomach_Map.begin();
+                    UNORDERED_MAP<uint64, bool>::iterator i = Stomach_Map.begin();
 
                     //Kick all players out of stomach
@@ -714,5 +714,5 @@
                 {
                     //Apply aura to all players in stomach
-                    HM_NAMESPACE::hash_map<uint64, bool>::iterator i = Stomach_Map.begin();
+                    UNORDERED_MAP<uint64, bool>::iterator i = Stomach_Map.begin();
 
                     while (i != Stomach_Map.end())
Index: trunk/src/bindings/scripts/ScriptMgr.cpp
===================================================================
--- trunk/src/bindings/scripts/ScriptMgr.cpp (revision 187)
+++ trunk/src/bindings/scripts/ScriptMgr.cpp (revision 206)
@@ -46,5 +46,5 @@
 
 // Text Maps
-HM_NAMESPACE::hash_map<int32, StringTextData> TextMap;
+UNORDERED_MAP<int32, StringTextData> TextMap;
 
 
@@ -56,8 +56,8 @@
 
 //Event AI summon structure. Used exclusivly by mob_event_ai.cpp.
-HM_NAMESPACE::hash_map<uint32, EventAI_Summon> EventAI_Summon_Map;
+UNORDERED_MAP<uint32, EventAI_Summon> EventAI_Summon_Map;
 
 //Event AI error prevention structure. Used at runtime to prevent error log spam of same creature id.
-//HM_NAMESPACE::hash_map<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList;
+//UNORDERED_MAP<uint32, EventAI_CreatureError> EventAI_CreatureErrorPreventionList;
 
 uint32 EAI_ErrorLevel;
@@ -1793,5 +1793,5 @@
     }
 
-    HM_NAMESPACE::hash_map<int32, StringTextData>::iterator i = TextMap.find(textEntry);
+    UNORDERED_MAP<int32, StringTextData>::iterator i = TextMap.find(textEntry);
 
     if (i == TextMap.end())