Rename internal class name to Client
Make API Client name more verbose