Rework how display_name is updated.