Updates to regexes in namecleaner