[FIX] Header mappings

Signed-off-by: Jon Danao <jondanao@gmail.com>
Merge pull request #7072 from jondanao/master

[FIX] Header mappings