Fixed inconsistent usage of different headers.