Merge "Remove cinder from service names"