updated namecleaner