Merge "Remove "JSON" from sevice clients' names"