Updated jb_fix_names