Merge "Making names of Cinder client classes consistent"