Updates to namecleaning, namefixer and prehash behaviour