I think I have a fix for the name hashing issue