fixing names issue