Use a few more accurate variable names, remove some redundant or old
logic, and better choice of displayed best name or id (also depends on
client-side change).

Change-Id: Iddd5d03649537813143a91702da521e631e1b2f2