Update to namefixer