Rename headers to be more consistent