fix first_name/last_name