Name hash fixes & improvements.