Naming methods consistently in the MarconiApi.

https://issues.apache.org/jira/browse/JCLOUDS-340