diff --git a/docs/src/main/asciidoc/_configprops.adoc b/docs/src/main/asciidoc/_configprops.adoc
index 5062c749..f9dd180c 100644
--- a/docs/src/main/asciidoc/_configprops.adoc
+++ b/docs/src/main/asciidoc/_configprops.adoc
@@ -26,7 +26,7 @@
 |feign.httpclient.hc5.socket-timeout-unit |  | Default value for socket timeout unit.
 |feign.httpclient.max-connections | `200` | 
 |feign.httpclient.max-connections-per-route | `50` | 
-|feign.httpclient.ok-http-client-properties.read-timeout | `60s` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
+|feign.httpclient.ok-http.read-timeout | `60s` | {@link OkHttpClient} read timeout; defaults to 60 seconds.
 |feign.httpclient.time-to-live | `900` | 
 |feign.httpclient.time-to-live-unit |  | 
 |feign.metrics.enabled | `true` | Enables metrics capability for Feign.
diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
index e88edfbe..24f43099 100644
--- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
+++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/FeignAutoConfiguration.java
@@ -286,7 +286,7 @@ public class FeignAutoConfiguration {
 			boolean followRedirects = httpClientProperties.isFollowRedirects();
 			int connectTimeout = httpClientProperties.getConnectionTimeout();
 			boolean disableSslValidation = httpClientProperties.isDisableSslValidation();
-			Duration readTimeout = httpClientProperties.getOkHttpClientProperties().getReadTimeout();
+			Duration readTimeout = httpClientProperties.getOkHttp().getReadTimeout();
 			this.okHttpClient = httpClientFactory.createBuilder(disableSslValidation)
 					.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
 					.readTimeout(readTimeout).connectionPool(connectionPool).build();
diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java
index 27cebf5e..a40370a6 100644
--- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java
+++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/clientconfig/OkHttpFeignConfiguration.java
@@ -59,7 +59,7 @@ public class OkHttpFeignConfiguration {
 			FeignHttpClientProperties httpClientProperties) {
 		boolean followRedirects = httpClientProperties.isFollowRedirects();
 		int connectTimeout = httpClientProperties.getConnectionTimeout();
-		Duration reaTimeout = httpClientProperties.getOkHttpClientProperties().getReadTimeout();
+		Duration reaTimeout = httpClientProperties.getOkHttp().getReadTimeout();
 		this.okHttpClient = httpClientFactory.createBuilder(httpClientProperties.isDisableSslValidation())
 				.connectTimeout(connectTimeout, TimeUnit.MILLISECONDS).followRedirects(followRedirects)
 				.readTimeout(reaTimeout).connectionPool(connectionPool).build();
diff --git a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/FeignHttpClientProperties.java b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/FeignHttpClientProperties.java
index b6bcf588..2e63e54a 100644
--- a/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/FeignHttpClientProperties.java
+++ b/spring-cloud-openfeign-core/src/main/java/org/springframework/cloud/openfeign/support/FeignHttpClientProperties.java
@@ -95,7 +95,7 @@ public class FeignHttpClientProperties {
 	/**
 	 * Additional {@link OkHttpClient}-specific properties.
 	 */
-	private OkHttpClientProperties okHttpClientProperties = new OkHttpClientProperties();
+	private OkHttp okHttp = new OkHttp();
 
 	public int getConnectionTimerRepeat() {
 		return connectionTimerRepeat;
@@ -169,12 +169,12 @@ public class FeignHttpClientProperties {
 		this.hc5 = hc5;
 	}
 
-	public OkHttpClientProperties getOkHttpClientProperties() {
-		return okHttpClientProperties;
+	public OkHttp getOkHttp() {
+		return okHttp;
 	}
 
-	public void setOkHttpClientProperties(OkHttpClientProperties okHttpClientProperties) {
-		this.okHttpClientProperties = okHttpClientProperties;
+	public void setOkHttp(OkHttp okHttp) {
+		this.okHttp = okHttp;
 	}
 
 	public static class Hc5Properties {
@@ -292,7 +292,7 @@ public class FeignHttpClientProperties {
 	/**
 	 * {@link OkHttpClient}-specific properties.
 	 */
-	public static class OkHttpClientProperties {
+	public static class OkHttp {
 
 		/**
 		 * {@link OkHttpClient} read timeout; defaults to 60 seconds.
diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java
index 8f0ebfad..bbfb58cb 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/FeignOkHttpConfigurationTests.java
@@ -45,7 +45,7 @@ class FeignOkHttpConfigurationTests {
 	void setUp() {
 		this.context = new SpringApplicationBuilder()
 				.properties("debug=true", "feign.httpclient.disableSslValidation=true", "feign.okhttp.enabled=true",
-						"feign.httpclient.enabled=false", "feign.httpclient.okhttp-client-properties.read-timeout=9s")
+						"feign.httpclient.enabled=false", "feign.httpclient.okhttp.read-timeout=9s")
 				.web(WebApplicationType.NONE).sources(HttpClientConfiguration.class, FeignAutoConfiguration.class)
 				.run();
 	}
diff --git a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java
index 6eb9ed02..56b5024a 100644
--- a/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java
+++ b/spring-cloud-openfeign-core/src/test/java/org/springframework/cloud/openfeign/loadbalancer/FeignLoadBalancerAutoConfigurationTests.java
@@ -60,7 +60,7 @@ class FeignLoadBalancerAutoConfigurationTests {
 	void shouldInstantiateOkHttpFeignClientWhenEnabled() {
 		ConfigurableApplicationContext context = initContext("feign.httpclient.enabled=false",
 				"feign.okhttp.enabled=true", "spring.cloud.loadbalancer.retry.enabled=false",
-				"feign.httpclient.okhttp-client-properties.read-timeout=9s");
+				"feign.httpclient.okhttp.read-timeout=9s");
 		assertThatOneBeanPresent(context, BlockingLoadBalancerClient.class);
 		Map<String, FeignBlockingLoadBalancerClient> beans = context
 				.getBeansOfType(FeignBlockingLoadBalancerClient.class);