Updates to namecleaner