Change headers to follow semantics