Additions and fixes to cat/namefixer.