Fix HTTP client headers: they should not contain underscores