Updates to namecleaner and namefixer