Fixed name display issue