additional regexes added to namecleaning