Added correct display of names