Use 'client' over 'cli' in providers