Rename 'client' option to 'client_settings' for clarity