Update namecleaning.php

Add the other groups, remove the main regexes from the groups.