Allow spaces in headers
Refactored the Header to parameter name logic as per discussion with Jake