diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h
index eafff1d8e..bce67daa7 100644
--- a/src/framework/Dynamic/ObjectRegistry.h
+++ b/src/framework/Dynamic/ObjectRegistry.h
@@ -20,7 +20,7 @@
 #define MANGOS_OBJECTREGISTRY_H
 
 #include "Platform/Define.h"
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include "Policies/Singleton.h"
 
 #include <string>
diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h
index a05ea7165..6e165fbf4 100644
--- a/src/framework/GameSystem/TypeContainer.h
+++ b/src/framework/GameSystem/TypeContainer.h
@@ -28,7 +28,7 @@
 #include <vector>
 #include "Platform/Define.h"
 #include "Utilities/TypeList.h"
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include "GameSystem/GridRefManager.h"
 
 template<class OBJECT, class KEY_TYPE>
diff --git a/src/framework/Makefile.am b/src/framework/Makefile.am
index c80ad71a2..050843e88 100644
--- a/src/framework/Makefile.am
+++ b/src/framework/Makefile.am
@@ -55,6 +55,6 @@ EXTRA_DIST = \
 	Utilities/ByteConverter.h \
 	Utilities/Callback.h \
 	Utilities/EventProcessor.h \
-	Utilities/UnorderedMap.h \
+	Utilities/UnorderedMapSet.h \
 	Utilities/LinkedList.h \
 	Utilities/TypeList.h
diff --git a/src/framework/Utilities/UnorderedMap.h b/src/framework/Utilities/UnorderedMapSet.h
similarity index 100%
rename from src/framework/Utilities/UnorderedMap.h
rename to src/framework/Utilities/UnorderedMapSet.h
diff --git a/src/game/InstanceSaveMgr.h b/src/game/InstanceSaveMgr.h
index e90841d96..6b664bbf0 100644
--- a/src/game/InstanceSaveMgr.h
+++ b/src/game/InstanceSaveMgr.h
@@ -24,7 +24,7 @@
 #include "ace/Thread_Mutex.h"
 #include <list>
 #include <map>
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "ObjectGuid.h"
diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h
index 359a44fca..391c202d0 100644
--- a/src/game/ObjectAccessor.h
+++ b/src/game/ObjectAccessor.h
@@ -23,7 +23,7 @@
 #include "Policies/Singleton.h"
 #include <ace/Thread_Mutex.h>
 #include <ace/RW_Thread_Mutex.h>
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include "Policies/ThreadingModel.h"
 
 #include "UpdateData.h"
diff --git a/src/game/SpellMgr.h b/src/game/SpellMgr.h
index 6ad666f23..19a2bd732 100644
--- a/src/game/SpellMgr.h
+++ b/src/game/SpellMgr.h
@@ -28,7 +28,7 @@
 #include "DBCStores.h"
 #include "Database/SQLStorage.h"
 
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 
 #include <map>
 
diff --git a/src/game/WaypointManager.h b/src/game/WaypointManager.h
index f2b189fca..fc099c79a 100644
--- a/src/game/WaypointManager.h
+++ b/src/game/WaypointManager.h
@@ -21,7 +21,7 @@
 
 #include <vector>
 #include <string>
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include "Policies/Singleton.h"
 
 #define MAX_WAYPOINT_TEXT 5
diff --git a/src/shared/Common.h b/src/shared/Common.h
index eb1044747..a11536c6c 100644
--- a/src/shared/Common.h
+++ b/src/shared/Common.h
@@ -65,7 +65,7 @@
 // must be the first thing to include for it to work
 #include "MemoryLeaks.h"
 
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index b7710596a..6b18275bd 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -20,7 +20,7 @@
 #define DATABASE_H
 
 #include "Threading.h"
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include "Database/SqlDelayThread.h"
 
 class SqlTransaction;
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 57f56de30..14a8bd4c7 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "10369"
+ #define REVISION_NR "10370"
 #endif // __REVISION_NR_H__
diff --git a/src/shared/vmap/MapTree.h b/src/shared/vmap/MapTree.h
index 5e017c4ce..48b1f9c39 100644
--- a/src/shared/vmap/MapTree.h
+++ b/src/shared/vmap/MapTree.h
@@ -20,7 +20,7 @@
 #define _MAPTREE_H
 
 #include "Platform/Define.h"
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include "BIH.h"
 
 namespace VMAP
diff --git a/src/shared/vmap/VMapManager2.h b/src/shared/vmap/VMapManager2.h
index 92b3fd424..a6f92431e 100644
--- a/src/shared/vmap/VMapManager2.h
+++ b/src/shared/vmap/VMapManager2.h
@@ -20,7 +20,7 @@
 #define _VMAPMANAGER2_H
 
 #include "IVMapManager.h"
-#include "Utilities/UnorderedMap.h"
+#include "Utilities/UnorderedMapSet.h"
 #include "Platform/Define.h"
 #include <G3D/Vector3.h>
 
diff --git a/win/VC100/framework.vcxproj b/win/VC100/framework.vcxproj
index 48cd0b765..79b152482 100644
--- a/win/VC100/framework.vcxproj
+++ b/win/VC100/framework.vcxproj
@@ -316,7 +316,7 @@
     <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\Reference.h" />
     <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\RefManager.h" />
     <ClInclude Include="..\..\src\framework\Utilities\TypeList.h" />
-    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMap.h" />
+    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMapSet.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\..\src\framework\Policies\MemoryManagement.cpp" />
diff --git a/win/VC100/framework.vcxproj.filters b/win/VC100/framework.vcxproj.filters
index 6be985106..e602d28a1 100644
--- a/win/VC100/framework.vcxproj.filters
+++ b/win/VC100/framework.vcxproj.filters
@@ -81,7 +81,7 @@
     <ClInclude Include="..\..\src\framework\Utilities\TypeList.h">
       <Filter>Utilities</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMap.h">
+    <ClInclude Include="..\..\src\framework\Utilities\UnorderedMapSet.h">
       <Filter>Utilities</Filter>
     </ClInclude>
     <ClInclude Include="..\..\src\framework\Utilities\LinkedReference\Reference.h">
diff --git a/win/VC80/framework.vcproj b/win/VC80/framework.vcproj
index 45ea88760..f7d010e13 100644
--- a/win/VC80/framework.vcproj
+++ b/win/VC80/framework.vcproj
@@ -579,7 +579,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\framework\Utilities\UnorderedMap.h"
+				RelativePath="..\..\src\framework\Utilities\UnorderedMapSet.h"
 				>
 			</File>
 			<Filter
diff --git a/win/VC90/framework.vcproj b/win/VC90/framework.vcproj
index 27fbbaa85..167f9cbb2 100644
--- a/win/VC90/framework.vcproj
+++ b/win/VC90/framework.vcproj
@@ -584,7 +584,7 @@
 				>
 			</File>
 			<File
-				RelativePath="..\..\src\framework\Utilities\UnorderedMap.h"
+				RelativePath="..\..\src\framework\Utilities\UnorderedMapSet.h"
 				>
 			</File>
 			<Filter