Renaming headers to remember intent