Minor tweaks to displayed names