Fix up to display simple name