Naming methods consistently in the MarconiApi.
Finishes autoscale mock webserver test refactoring.