diff --git a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java
index a33a6b652..fa459b10b 100644
--- a/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java
+++ b/spring-cloud-netflix-eureka-client/src/main/java/org/springframework/cloud/netflix/eureka/config/DiscoveryClientOptionalArgsConfiguration.java
@@ -43,9 +43,8 @@ public class DiscoveryClientOptionalArgsConfiguration {
 	@ConditionalOnMissingClass("com.sun.jersey.api.client.filter.ClientFilter")
 	@ConditionalOnMissingBean(value = { AbstractDiscoveryClientOptionalArgs.class },
 			search = SearchStrategy.CURRENT)
-	@ConditionalOnProperty(prefix = "eureka.client",
-			name = { "webclientSupport", "webclient-support" }, matchIfMissing = true,
-			havingValue = "false")
+	@ConditionalOnProperty(prefix = "eureka.client", name = { "webclient-support" },
+			matchIfMissing = true, havingValue = "false")
 	public RestTemplateDiscoveryClientOptionalArgs restTemplateDiscoveryClientOptionalArgs() {
 		logger.info("Eureka HTTP Client uses RestTemplate.");
 		return new RestTemplateDiscoveryClientOptionalArgs();
@@ -57,8 +56,8 @@ public class DiscoveryClientOptionalArgsConfiguration {
 			value = { AbstractDiscoveryClientOptionalArgs.class,
 					RestTemplateDiscoveryClientOptionalArgs.class },
 			search = SearchStrategy.CURRENT)
-	@ConditionalOnProperty(prefix = "eureka.client",
-			name = { "webclientSupport", "webclient-support" }, havingValue = "true")
+	@ConditionalOnProperty(prefix = "eureka.client", name = { "webclient-support" },
+			havingValue = "true")
 	public WebClientDiscoveryClientOptionalArgs webClientDiscoveryClientOptionalArgs() {
 		logger.info("Eureka HTTP Client uses WebClient.");
 		return new WebClientDiscoveryClientOptionalArgs();
diff --git a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java
index 48f1727fa..cbd668411 100644
--- a/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java
+++ b/spring-cloud-netflix-eureka-client/src/test/java/org/springframework/cloud/netflix/eureka/config/EurekaHttpClientsOptionalArgsConfigurationTest.java
@@ -45,7 +45,7 @@ public class EurekaHttpClientsOptionalArgsConfigurationTest {
 	public void contextLoadsWithRestTemplate() {
 		try (ConfigurableApplicationContext context = new SpringApplicationBuilder()
 				.web(WebApplicationType.NONE).sources(EurekaSampleApplication.class)
-				.properties(new String[] { "eureka.client.webclientSupport=false" })
+				.properties(new String[] { "eureka.client.webclient-support=false" })
 				.run()) {
 			assertThat(context.getBean(RestTemplateDiscoveryClientOptionalArgs.class))
 					.isNotNull();
@@ -62,7 +62,7 @@ public class EurekaHttpClientsOptionalArgsConfigurationTest {
 	public void contextLoadsWithWebClient() {
 		try (ConfigurableApplicationContext context = new SpringApplicationBuilder()
 				.web(WebApplicationType.NONE).sources(EurekaSampleApplication.class)
-				.properties(new String[] { "eureka.client.webclientSupport=true" })
+				.properties(new String[] { "eureka.client.webclient-support=true" })
 				.run()) {
 			assertThat(context.getBean(WebClientDiscoveryClientOptionalArgs.class))
 					.isNotNull();