Use the new format_to_name dict