refactoring some names and visibility in the http server