Rename grantTypes field
Honor default client config