added additional regexes to namecleaning

added additional regexes to namecleaning