Improve naming in client.