Updated namefixer