Changing some header names around