Updates to namefixer