Remove use of get_display_name

Change-Id: Id079782f1c5e335f6d7058353ac33cb148fbdc6b