diff --git a/contrib/vmap_extractor/vmapextract/adtfile.cpp b/contrib/vmap_extractor/vmapextract/adtfile.cpp
index 4456162dec4..9cc0330ecb4 100644
--- a/contrib/vmap_extractor/vmapextract/adtfile.cpp
+++ b/contrib/vmap_extractor/vmapextract/adtfile.cpp
@@ -148,8 +148,6 @@ bool ADTFile::init(uint32 map_num, uint32 tileX, uint32 tileY, StringSet& failed
                 while (p < buf + size)
                 {
                     fixnamen(p, strlen(p));
-                    char* s = GetPlainName(p);
-                    fixname2(s, strlen(s));
                     string path(p);                         // Store copy after name fixed
 
                     std::string fixedName;
diff --git a/contrib/vmap_extractor/vmapextract/gameobject_extract.cpp b/contrib/vmap_extractor/vmapextract/gameobject_extract.cpp
index 908bdaf61da..2a7b961d2f6 100644
--- a/contrib/vmap_extractor/vmapextract/gameobject_extract.cpp
+++ b/contrib/vmap_extractor/vmapextract/gameobject_extract.cpp
@@ -29,6 +29,7 @@ bool ExtractSingleModel(std::string& origPath, std::string& fixedName, StringSet
         return ch == ' ' ? '_' : ch;
         });
 
+    fixnamen((char*)s.c_str(), s.size());
     fixedName = s;
 
     std::string output(szWorkDirWmo);                       // Stores output filename (possible changed)
diff --git a/contrib/vmap_extractor/vmapextract/wmo.h b/contrib/vmap_extractor/vmapextract/wmo.h
index b9573759562..b88952cf300 100644
--- a/contrib/vmap_extractor/vmapextract/wmo.h
+++ b/contrib/vmap_extractor/vmapextract/wmo.h
@@ -73,7 +73,7 @@ struct WMODoodadData
     std::vector<WMO::MODS> Sets;
     std::unique_ptr<char[]> Paths;
     std::vector<WMO::MODD> Spawns;
-    std::unordered_set<uint16> References;
+    std::set<uint16> References;
 };
 
 class WMORoot