Update to namecleaner and jb_fix_names