[FIX] Header mappings

Signed-off-by: Jon Danao <jondanao@gmail.com>