diff --git a/CodeWalker.Core/GameFiles/FileTypes/YddFile.cs b/CodeWalker.Core/GameFiles/FileTypes/YddFile.cs
index f9e7e2f..39ba0c5 100644
--- a/CodeWalker.Core/GameFiles/FileTypes/YddFile.cs
+++ b/CodeWalker.Core/GameFiles/FileTypes/YddFile.cs
@@ -76,13 +76,7 @@ namespace CodeWalker.GameFiles
                     var hash = hashes[i];
                     if ((drawable.Name == null) || (drawable.Name.EndsWith("#dd")))
                     {
-                        string hstr = JenkIndex.TryGetString(hash);
-                        if (!string.IsNullOrEmpty(hstr))
-                        {
-                            drawable.Name = hstr;
-                        }
-                        else
-                        { }
+                        drawable.Name = YddXml.HashString((MetaHash)hash);
                     }
                 }
 
diff --git a/CodeWalker.Core/GameFiles/Resources/Drawable.cs b/CodeWalker.Core/GameFiles/Resources/Drawable.cs
index 66524a5..10b26b2 100644
--- a/CodeWalker.Core/GameFiles/Resources/Drawable.cs
+++ b/CodeWalker.Core/GameFiles/Resources/Drawable.cs
@@ -5847,7 +5847,7 @@ namespace CodeWalker.GameFiles
                     var d = new Drawable();
                     d.ReadXml(inode, ddsfolder);
                     drawables.Add(d);
-                    drawablehashes.Add(JenkHash.GenHash(d.Name));//TODO: check this!
+                    drawablehashes.Add(XmlMeta.GetHash(d.Name));
                 }
             }