Merge "Make identity service client class name consistent"