name logic fixed