Update to namecleaner