Change headers to be generic vs specific name