Added more cases for fix_name_case()