HttpServer: Add in needed fixin's rename classes to be more BeAPIish