Cosmetic changes to display of prefixed names