Fixed names bug