Rename headers and remove chaff