Updated namecleaner.