Updates to namefixer and prehash