diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApiClient.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApiClient.java
index ac33f943323..f80fe4ddc67 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApiClient.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/PetApiClient.java
@@ -3,6 +3,6 @@ package org.openapitools.api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.openapitools.configuration.ClientConfiguration;
 
-@FeignClient(name="${openAPIPetstore.name:openAPIPetstore}", url="${openAPIPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
+@FeignClient(name="${pet.name:pet}", url="${pet.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface PetApiClient extends PetApi {
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApiClient.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApiClient.java
index 0943d581356..71d613a871d 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApiClient.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/StoreApiClient.java
@@ -3,6 +3,6 @@ package org.openapitools.api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.openapitools.configuration.ClientConfiguration;
 
-@FeignClient(name="${openAPIPetstore.name:openAPIPetstore}", url="${openAPIPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
+@FeignClient(name="${store.name:store}", url="${store.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface StoreApiClient extends StoreApi {
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApiClient.java b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApiClient.java
index 1933bd82d3a..1db4598108d 100644
--- a/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApiClient.java
+++ b/samples/client/petstore/spring-cloud-async/src/main/java/org/openapitools/api/UserApiClient.java
@@ -3,6 +3,6 @@ package org.openapitools.api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.openapitools.configuration.ClientConfiguration;
 
-@FeignClient(name="${openAPIPetstore.name:openAPIPetstore}", url="${openAPIPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
+@FeignClient(name="${user.name:user}", url="${user.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface UserApiClient extends UserApi {
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApiClient.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApiClient.java
index ac33f943323..f80fe4ddc67 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApiClient.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/PetApiClient.java
@@ -3,6 +3,6 @@ package org.openapitools.api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.openapitools.configuration.ClientConfiguration;
 
-@FeignClient(name="${openAPIPetstore.name:openAPIPetstore}", url="${openAPIPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
+@FeignClient(name="${pet.name:pet}", url="${pet.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface PetApiClient extends PetApi {
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApiClient.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApiClient.java
index 0943d581356..71d613a871d 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApiClient.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/StoreApiClient.java
@@ -3,6 +3,6 @@ package org.openapitools.api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.openapitools.configuration.ClientConfiguration;
 
-@FeignClient(name="${openAPIPetstore.name:openAPIPetstore}", url="${openAPIPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
+@FeignClient(name="${store.name:store}", url="${store.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface StoreApiClient extends StoreApi {
-}
\ No newline at end of file
+}
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApiClient.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApiClient.java
index 1933bd82d3a..1db4598108d 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApiClient.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/api/UserApiClient.java
@@ -3,6 +3,6 @@ package org.openapitools.api;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.openapitools.configuration.ClientConfiguration;
 
-@FeignClient(name="${openAPIPetstore.name:openAPIPetstore}", url="${openAPIPetstore.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
+@FeignClient(name="${user.name:user}", url="${user.url:http://petstore.swagger.io/v2}", configuration = ClientConfiguration.class)
 public interface UserApiClient extends UserApi {
-}
\ No newline at end of file
+}