CORE-351 - API objects should be consistent with naming convention
CORE-350 - Implementation finished with zero testing.
CORE-359 - SDK objects need a bit of a tidy
CORE-350 - Minor issue with the tenancy not being passed up.