set names correctly