Fix name-duplication for http.
Merge pull request #140 from JonathanWarrick/cleanup2

Fix name-duplication for http.