Correct names of headers, as they are used now