Fix returned names