Fix sort_name and display_name inversion.