Updates to namecleaning