Fix names headers