Make syntax consistent with other clients.
Make syntax consistent with other clients.