Added naming and better HTTP serving