For consistency, replace webClient and WebClient with restClient and RestClient. This also address a bean name clash between RestClientAutoConfiguration's RestClient.Builder bean and WebClientAutoConfiguration's WebClient.Builder bean that were both previously named webClientBuilder.