Fix whitespace and rename HTTP headers