Fixed names issue