diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
index 796178329b6c..e7f8b62369e9 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache
@@ -45,7 +45,6 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
     {{/isContainer}}
     {{/isEnum}}
   {{#jackson}}
-  @JsonProperty("{{baseName}}")
   {{#withXml}}
   @JacksonXmlProperty({{#isXmlAttribute}}isAttribute = true, {{/isXmlAttribute}}{{#xmlNamespace}}namespace="{{.}}", {{/xmlNamespace}}localName = "{{xmlName}}{{^xmlName}}{{baseName}}{{/xmlName}}")
   {{/withXml}}
@@ -185,6 +184,9 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}}
   {{#swagger1AnnotationLibrary}}
   @ApiModelProperty({{#example}}example = "{{{.}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}{{#isReadOnly}}readOnly = {{{isReadOnly}}}, {{/isReadOnly}}value = "{{{description}}}")
   {{/swagger1AnnotationLibrary}}
+  {{#jackson}}
+  @JsonProperty("{{baseName}}")
+  {{/jackson}}
   public {{>nullableDataType}} {{getter}}() {
     return {{name}};
   }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java
index 05b53d5fa09e..5a9e64126182 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/assertions/AbstractAnnotationAssert.java
@@ -35,6 +35,13 @@ public ACTUAL containsWithName(final String name) {
         return myself();
     }
 
+    public ACTUAL doesNotContainsWithName(final String name) {
+        super
+            .withFailMessage("Should have annotation with name: " + name)
+            .noneMatch(annotation -> annotation.getNameAsString().equals(name));
+        return myself();
+    }
+
     public ACTUAL containsWithNameAndAttributes(final String name, final Map<String, String> attributes) {
         super
             .withFailMessage("Should have annotation with name: " + name + " and attributes: " + attributes + ", but was: " + actual)
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
index c5ffa3965816..46cec50b1b3b 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java
@@ -2144,4 +2144,57 @@ private Map<String, File> generateFromContract(String url, String library, Map<S
         return generator.opts(input).generate().stream()
                 .collect(Collectors.toMap(File::getName, Function.identity()));
     }
+
+    @Test
+    public void shouldGenerateJsonPropertyAnnotationLocatedInGetters_issue5705() throws IOException {
+        File output = Files.createTempDirectory("test").toFile().getCanonicalFile();
+        output.deleteOnExit();
+
+        OpenAPI openAPI = new OpenAPIParser()
+            .readLocation("src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml", null, new ParseOptions()).getOpenAPI();
+        SpringCodegen codegen = new SpringCodegen();
+        codegen.setLibrary(SPRING_BOOT);
+        codegen.setOutputDir(output.getAbsolutePath());
+
+        ClientOptInput input = new ClientOptInput()
+            .openAPI(openAPI)
+            .config(codegen);
+
+        DefaultGenerator generator = new DefaultGenerator();
+        Map<String, File> files = generator.opts(input).generate().stream()
+            .collect(Collectors.toMap(File::getName, Function.identity()));
+
+        JavaFileAssert.assertThat(files.get("ResponseObjectWithDifferentFieldNames.java"))
+            .hasProperty("normalPropertyName")
+                .assertPropertyAnnotations()
+                .doesNotContainsWithName("JsonProperty")
+                .toProperty().toType()
+            .hasProperty("UPPER_CASE_PROPERTY_SNAKE")
+                .assertPropertyAnnotations()
+                .doesNotContainsWithName("JsonProperty")
+                .toProperty().toType()
+            .hasProperty("lowerCasePropertyDashes")
+                .assertPropertyAnnotations()
+                .doesNotContainsWithName("JsonProperty")
+                .toProperty().toType()
+            .hasProperty("propertyNameWithSpaces")
+                .assertPropertyAnnotations()
+                .doesNotContainsWithName("JsonProperty")
+                .toProperty().toType()
+            .assertMethod("getNormalPropertyName")
+                .assertMethodAnnotations()
+                .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"normalPropertyName\""))
+                .toMethod().toFileAssert()
+            .assertMethod("getUPPERCASEPROPERTYSNAKE")
+                .assertMethodAnnotations()
+                .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"UPPER_CASE_PROPERTY_SNAKE\""))
+                .toMethod().toFileAssert()
+            .assertMethod("getLowerCasePropertyDashes")
+                .assertMethodAnnotations()
+                .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"lower-case-property-dashes\""))
+                .toMethod().toFileAssert()
+            .assertMethod("getPropertyNameWithSpaces")
+                .assertMethodAnnotations()
+                .containsWithNameAndAttributes("JsonProperty", ImmutableMap.of("value", "\"property name with spaces\""));
+    }
 }
diff --git a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml
index 7f51877150e3..27c97636a188 100644
--- a/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1091,6 +1091,26 @@ paths:
         - petstore_auth:
             - write:pets
             - read:pets
+  /fake/{petId}/response-object-different-names:
+    get:
+      tags:
+        - pet
+      operationId: responseObjectDifferentNames
+      parameters:
+        - name: petId
+          in: path
+          description: ID of pet to update
+          required: true
+          schema:
+            type: integer
+            format: int64
+      responses:
+        200:
+          description: successful operation
+          content:
+            application/json:
+              schema:
+                $ref: "#/components/schemas/ResponseObjectWithDifferentFieldNames"
 servers:
   - url: http://petstore.swagger.io:80/v2
 components:
@@ -2006,3 +2026,14 @@ components:
           items:
             type: string
           default: ["foo", "bar"]
+    ResponseObjectWithDifferentFieldNames:
+      type: object
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
index b8d21304b6c4..a8eed0033a80 100644
--- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
@@ -26,23 +26,17 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("@type")
   private String atType = "Pet";
 
-  @JsonProperty("age")
   private Integer age = 4;
 
-  @JsonProperty("happy")
   private Boolean happy = true;
 
-  @JsonProperty("price")
   private BigDecimal price = new BigDecimal("32000000000");
 
-  @JsonProperty("lastFeed")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault()));
 
-  @JsonProperty("dateOfBirth")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate dateOfBirth = LocalDate.parse("2021-01-01");
 
@@ -73,6 +67,7 @@ public Pet atType(String atType) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("@type")
   public String getAtType() {
     return atType;
   }
@@ -92,6 +87,7 @@ public Pet age(Integer age) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("age")
   public Integer getAge() {
     return age;
   }
@@ -111,6 +107,7 @@ public Pet happy(Boolean happy) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("happy")
   public Boolean getHappy() {
     return happy;
   }
@@ -130,6 +127,7 @@ public Pet price(BigDecimal price) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("price")
   public BigDecimal getPrice() {
     return price;
   }
@@ -149,6 +147,7 @@ public Pet lastFeed(OffsetDateTime lastFeed) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("lastFeed")
   public OffsetDateTime getLastFeed() {
     return lastFeed;
   }
@@ -168,6 +167,7 @@ public Pet dateOfBirth(LocalDate dateOfBirth) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateOfBirth")
   public LocalDate getDateOfBirth() {
     return dateOfBirth;
   }
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java
index 909b0aba4e34..4a167e1c112e 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Category.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -40,6 +38,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java
index 52fb11fd3cf7..a6a565214984 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -25,13 +25,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -45,6 +42,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -64,6 +62,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -83,6 +82,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java
index 66d9df6dfd95..45802212a9da 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Order.java
@@ -26,16 +26,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -76,10 +72,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -93,6 +87,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -112,6 +107,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -131,6 +127,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -150,6 +147,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -169,6 +167,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -188,6 +187,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
index ce02f3c7d4e4..086df08a3ed0 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Pet.java
@@ -28,20 +28,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -113,6 +107,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -132,6 +127,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -151,6 +147,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -178,6 +175,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -205,6 +203,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -224,6 +223,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java
index b30aa3fd9a2c..b6d3df295734 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/Tag.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -40,6 +38,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java
index 8d71f0fcc040..a5233b08ae5c 100644
--- a/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud-feign-without-url/src/main/java/org/openapitools/model/User.java
@@ -23,28 +23,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -58,6 +50,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -77,6 +70,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -96,6 +90,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -115,6 +110,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -134,6 +130,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -153,6 +150,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -172,6 +170,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -191,6 +190,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
index 909b0aba4e34..4a167e1c112e 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -40,6 +38,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
index 52fb11fd3cf7..a6a565214984 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -25,13 +25,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -45,6 +42,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -64,6 +62,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -83,6 +82,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
index 66d9df6dfd95..45802212a9da 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
@@ -26,16 +26,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -76,10 +72,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -93,6 +87,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -112,6 +107,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -131,6 +127,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -150,6 +147,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -169,6 +167,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -188,6 +187,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index ce02f3c7d4e4..086df08a3ed0 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -28,20 +28,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -113,6 +107,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -132,6 +127,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -151,6 +147,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -178,6 +175,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -205,6 +203,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -224,6 +223,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
index b30aa3fd9a2c..b6d3df295734 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -40,6 +38,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
index 8d71f0fcc040..a5233b08ae5c 100644
--- a/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
@@ -23,28 +23,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -58,6 +50,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -77,6 +70,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -96,6 +90,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -115,6 +110,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -134,6 +130,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -153,6 +150,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -172,6 +170,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -191,6 +190,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES
index 8f0d232df2eb..4507343d0db6 100644
--- a/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES
+++ b/samples/client/petstore/spring-http-interface-reactive/.openapi-generator/FILES
@@ -50,6 +50,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java
index 9e4acf4039d4..86811e2f6b06 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/PetApi.java
@@ -7,6 +7,7 @@
 
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import java.util.Set;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -122,6 +123,22 @@ Mono<ResponseEntity<Pet>> getPetById(
     );
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @HttpExchange(
+        method = "GET",
+        value = "/fake/{petId}/response-object-different-names",
+        accept = "application/json"
+    )
+    Mono<ResponseEntity<ResponseObjectWithDifferentFieldNames>> responseObjectDifferentNames(
+         @PathVariable("petId") Long petId
+    );
+
+
     /**
      * PUT /pet : Update an existing pet
      * 
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 83b1c4518de5..f9f724ee2d53 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -34,6 +33,7 @@ public AdditionalPropertiesAnyType name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index e26bc0925506..a33e9dba8121 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -35,6 +34,7 @@ public AdditionalPropertiesArray name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index 5f3960d561d5..c48df238f915 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -34,6 +33,7 @@ public AdditionalPropertiesBoolean name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 446381cac9d1..a70c6615754f 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -26,45 +26,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -85,6 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
    * @return mapString
   */
   
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -111,6 +101,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
    * @return mapNumber
   */
   
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -137,6 +128,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
    * @return mapInteger
   */
   
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -163,6 +155,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
    * @return mapBoolean
   */
   
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -189,6 +182,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
    * @return mapArrayInteger
   */
   
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -215,6 +209,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
    * @return mapArrayAnytype
   */
   
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -241,6 +236,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
    * @return mapMapString
   */
   
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -267,6 +263,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
    * @return mapMapAnytype
   */
   
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -285,6 +282,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
    * @return anytype1
   */
   
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -303,6 +301,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
    * @return anytype2
   */
   
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -321,6 +320,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
    * @return anytype3
   */
   
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 6c0650b76c58..8e2100e5ab1c 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -34,6 +33,7 @@ public AdditionalPropertiesInteger name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 2ad29c75e7d0..fb86e5c04d4f 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -35,6 +34,7 @@ public AdditionalPropertiesNumber name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index af2d1826f1c1..b060bec7340c 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -34,6 +33,7 @@ public AdditionalPropertiesObject name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 1cb12bed9160..a25c047d6212 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -34,6 +33,7 @@ public AdditionalPropertiesString name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java
index babc11283a29..9b842e16448e 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Animal.java
@@ -36,10 +36,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -68,6 +66,7 @@ public Animal className(String className) {
    * @return className
   */
   @NotNull
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -86,6 +85,7 @@ public Animal color(String color) {
    * @return color
   */
   
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 3c67eaef5c51..fce10900269e 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -44,6 +43,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
    * @return arrayArrayNumber
   */
   
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index faa58324e8c2..543e76c186ea 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   
   private List<BigDecimal> arrayNumber;
 
@@ -44,6 +43,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
    * @return arrayNumber
   */
   
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java
index 976ff46bf458..c13565386f52 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ArrayTest.java
@@ -22,15 +22,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -52,6 +49,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
    * @return arrayOfString
   */
   
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -78,6 +76,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
    * @return arrayArrayOfInteger
   */
   
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -104,6 +103,7 @@ public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelI
    * @return arrayArrayOfModel
   */
   
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java
index d965e16521bb..b13e3d40559f 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java
@@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -93,6 +92,7 @@ public BigCat kind(KindEnum kind) {
    * @return kind
   */
   
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
index 37e401dfd52c..017c44034aeb 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -61,7 +61,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -74,6 +73,7 @@ public BigCatAllOf kind(KindEnum kind) {
    * @return kind
   */
   
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java
index 2e4f6745fa5e..7e51263a3e0a 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Capitalization.java
@@ -19,22 +19,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -47,6 +41,7 @@ public Capitalization smallCamel(String smallCamel) {
    * @return smallCamel
   */
   
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -65,6 +60,7 @@ public Capitalization capitalCamel(String capitalCamel) {
    * @return capitalCamel
   */
   
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -83,6 +79,7 @@ public Capitalization smallSnake(String smallSnake) {
    * @return smallSnake
   */
   
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -101,6 +98,7 @@ public Capitalization capitalSnake(String capitalSnake) {
    * @return capitalSnake
   */
   
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -119,6 +117,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
    * @return scAETHFlowPoints
   */
   
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -137,6 +136,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
    * @return ATT_NAME
   */
   
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java
index 3e54e9eb2588..53a04191db47 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Cat.java
@@ -33,7 +33,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -62,6 +61,7 @@ public Cat declawed(Boolean declawed) {
    * @return declawed
   */
   
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java
index c95d2391d819..2ea1a62e7286 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/CatAllOf.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -34,6 +33,7 @@ public CatAllOf declawed(Boolean declawed) {
    * @return declawed
   */
   
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java
index dcbbaf3e1e35..ad92aa2ac55d 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Category.java
@@ -19,10 +19,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -51,6 +49,7 @@ public Category id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -69,6 +68,7 @@ public Category name(String name) {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java
index b943a1fb7066..6f77dbccad10 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ClassModel.java
@@ -19,7 +19,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -32,6 +31,7 @@ public ClassModel propertyClass(String propertyClass) {
    * @return propertyClass
   */
   
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java
index b4d2844d1a7c..795dd87d1790 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Client.java
@@ -19,7 +19,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -32,6 +31,7 @@ public Client client(String client) {
    * @return client
   */
   
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 22b58754add7..00d8190f7d4e 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -24,19 +24,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -75,6 +71,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
    * @return nullableArray
   */
   
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -101,6 +98,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
    * @return nullableRequiredArray
   */
   @NotNull
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -127,6 +125,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
    * @return requiredArray
   */
   @NotNull
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -153,6 +152,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
    * @return nullableArrayWithDefault
   */
   
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java
index c23c2b8c3d6b..35620441ea90 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Dog.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -53,6 +52,7 @@ public Dog breed(String breed) {
    * @return breed
   */
   
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java
index 99edfab4008f..e95125f59887 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/DogAllOf.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -34,6 +33,7 @@ public DogAllOf breed(String breed) {
    * @return breed
   */
   
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java
index 373b363378b0..5171f2ef55a0 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumArrays.java
@@ -57,7 +57,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -95,7 +94,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -109,6 +107,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
    * @return justSymbol
   */
   
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -135,6 +134,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
    * @return arrayEnum
   */
   
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java
index c3d6f8740bee..029db62632d3 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/EnumTest.java
@@ -60,7 +60,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -100,7 +99,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -138,7 +136,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -176,10 +173,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -208,6 +203,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
    * @return enumString
   */
   
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -226,6 +222,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
    * @return enumStringRequired
   */
   @NotNull
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -244,6 +241,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
    * @return enumInteger
   */
   
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -262,6 +260,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
    * @return enumNumber
   */
   
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -280,6 +279,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
    * @return outerEnum
   */
   
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java
index 379835e79976..e26d5254d175 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/File.java
@@ -19,7 +19,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -32,6 +31,7 @@ public File sourceURI(String sourceURI) {
    * @return sourceURI
   */
   
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 8baddab3db91..9db7d3004666 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   
   private List<File> files;
 
@@ -39,6 +37,7 @@ public FileSchemaTestClass file(File file) {
    * @return file
   */
   
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -65,6 +64,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
    * @return files
   */
   
+  @JsonProperty("files")
   public List<File> getFiles() {
     return files;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java
index ea6488d76b12..33e8057b49e0 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/FormatTest.java
@@ -27,48 +27,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -102,6 +88,7 @@ public FormatTest integer(Integer integer) {
    * @return integer
   */
   
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -122,6 +109,7 @@ public FormatTest int32(Integer int32) {
    * @return int32
   */
   
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -140,6 +128,7 @@ public FormatTest int64(Long int64) {
    * @return int64
   */
   
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -160,6 +149,7 @@ public FormatTest number(BigDecimal number) {
    * @return number
   */
   @NotNull
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -180,6 +170,7 @@ public FormatTest _float(Float _float) {
    * @return _float
   */
   
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -200,6 +191,7 @@ public FormatTest _double(Double _double) {
    * @return _double
   */
   
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -218,6 +210,7 @@ public FormatTest string(String string) {
    * @return string
   */
   
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -236,6 +229,7 @@ public FormatTest _byte(byte[] _byte) {
    * @return _byte
   */
   @NotNull
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -254,6 +248,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
    * @return binary
   */
   
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -272,6 +267,7 @@ public FormatTest date(LocalDate date) {
    * @return date
   */
   @NotNull
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -290,6 +286,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -308,6 +305,7 @@ public FormatTest uuid(UUID uuid) {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -326,6 +324,7 @@ public FormatTest password(String password) {
    * @return password
   */
   @NotNull
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -344,6 +343,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
    * @return bigDecimal
   */
   
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 9d186aad54e8..7fbc4d282cc2 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -37,6 +35,7 @@ public HasOnlyReadOnly bar(String bar) {
    * @return bar
   */
   
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -55,6 +54,7 @@ public HasOnlyReadOnly foo(String foo) {
    * @return foo
   */
   
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java
index 1b90373038ee..db3d89f780aa 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MapTest.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -61,15 +60,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -91,6 +87,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
    * @return mapMapOfString
   */
   
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -117,6 +114,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
    * @return mapOfEnumString
   */
   
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -143,6 +141,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
    * @return directMap
   */
   
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -169,6 +168,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
    * @return indirectMap
   */
   
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index efa8052677ee..8ff1a06c7eb0 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -25,14 +25,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   
   private Map<String, Animal> map = new HashMap<>();
 
@@ -46,6 +43,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -64,6 +62,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -90,6 +89,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
    * @return map
   */
   
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java
index 5fb76af82848..f88cd1000c98 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Model200Response.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -37,6 +35,7 @@ public Model200Response name(Integer name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -55,6 +54,7 @@ public Model200Response propertyClass(String propertyClass) {
    * @return propertyClass
   */
   
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
index 2d95cc265e9e..0de21a2fc4bf 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -21,13 +21,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -40,6 +37,7 @@ public ModelApiResponse code(Integer code) {
    * @return code
   */
   
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -58,6 +56,7 @@ public ModelApiResponse type(String type) {
    * @return type
   */
   
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -76,6 +75,7 @@ public ModelApiResponse message(String message) {
    * @return message
   */
   
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java
index 959f91cdfd3c..e7dc4ac59a30 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelList.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -34,6 +33,7 @@ public ModelList _123list(String _123list) {
    * @return _123list
   */
   
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java
index 1dc48b70a7f3..4fc7c0bf4645 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ModelReturn.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -34,6 +33,7 @@ public ModelReturn _return(Integer _return) {
    * @return _return
   */
   
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java
index b67fffabe9f6..3934b5a3c543 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Name.java
@@ -19,16 +19,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -57,6 +53,7 @@ public Name name(Integer name) {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -75,6 +72,7 @@ public Name snakeCase(Integer snakeCase) {
    * @return snakeCase
   */
   
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -93,6 +91,7 @@ public Name property(String property) {
    * @return property
   */
   
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -111,6 +110,7 @@ public Name _123number(Integer _123number) {
    * @return _123number
   */
   
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java
index a634326a1f80..15ead14ac727 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NumberOnly.java
@@ -20,7 +20,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -33,6 +32,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
    * @return justNumber
   */
   
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java
index 3eb6bc62e11d..ef4490343994 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Order.java
@@ -22,16 +22,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -72,10 +68,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -88,6 +82,7 @@ public Order id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -106,6 +101,7 @@ public Order petId(Long petId) {
    * @return petId
   */
   
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -124,6 +120,7 @@ public Order quantity(Integer quantity) {
    * @return quantity
   */
   
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -142,6 +139,7 @@ public Order shipDate(OffsetDateTime shipDate) {
    * @return shipDate
   */
   
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -160,6 +158,7 @@ public Order status(StatusEnum status) {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -178,6 +177,7 @@ public Order complete(Boolean complete) {
    * @return complete
   */
   
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java
index ddc31ebfb442..342a177ec6ee 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/OuterComposite.java
@@ -20,13 +20,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -39,6 +36,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
    * @return myNumber
   */
   
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -57,6 +55,7 @@ public OuterComposite myString(String myString) {
    * @return myString
   */
   
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -75,6 +74,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
    * @return myBoolean
   */
   
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
index a9cbcde9787b..91d62344c07b 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   
   private List<Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -111,6 +105,7 @@ public Pet id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -129,6 +124,7 @@ public Pet category(Category category) {
    * @return category
   */
   
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -147,6 +143,7 @@ public Pet name(String name) {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -173,6 +170,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
    * @return photoUrls
   */
   @NotNull
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -200,6 +198,7 @@ public Pet addTagsItem(Tag tagsItem) {
    * @return tags
   */
   
+  @JsonProperty("tags")
   public List<Tag> getTags() {
     return tags;
   }
@@ -218,6 +217,7 @@ public Pet status(StatusEnum status) {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 9c1b537ab92d..ab06c3aaa78a 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -19,10 +19,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -35,6 +33,7 @@ public ReadOnlyFirst bar(String bar) {
    * @return bar
   */
   
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -53,6 +52,7 @@ public ReadOnlyFirst baz(String baz) {
    * @return baz
   */
   
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..5d6f48d1f5fe
--- /dev/null
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,149 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.constraints.NotNull;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
index d99aa571dccf..28d60b6af6b3 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -34,6 +33,7 @@ public class SpecialModelName {
    * @return $specialPropertyName
   */
   
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java
index f2fb6ae6006d..d9e148819108 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/Tag.java
@@ -19,10 +19,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -35,6 +33,7 @@ public Tag id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -53,6 +52,7 @@ public Tag name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 799aa25fccd2..41daada064f2 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -22,19 +22,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -68,6 +63,7 @@ public TypeHolderDefault stringItem(String stringItem) {
    * @return stringItem
   */
   @NotNull
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -86,6 +82,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
    * @return numberItem
   */
   @NotNull
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -104,6 +101,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
    * @return integerItem
   */
   @NotNull
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -122,6 +120,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
    * @return boolItem
   */
   @NotNull
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -148,6 +147,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
    * @return arrayItem
   */
   @NotNull
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
index ef2f61f81be3..1df30cf80c39 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -72,6 +66,7 @@ public TypeHolderExample stringItem(String stringItem) {
    * @return stringItem
   */
   @NotNull
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -90,6 +85,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
    * @return numberItem
   */
   @NotNull
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -108,6 +104,7 @@ public TypeHolderExample floatItem(Float floatItem) {
    * @return floatItem
   */
   @NotNull
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -126,6 +123,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
    * @return integerItem
   */
   @NotNull
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -144,6 +142,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
    * @return boolItem
   */
   @NotNull
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -170,6 +169,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
    * @return arrayItem
   */
   @NotNull
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java
index 95d28312456f..a1975bef3e67 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/User.java
@@ -19,28 +19,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -53,6 +45,7 @@ public User id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -71,6 +64,7 @@ public User username(String username) {
    * @return username
   */
   
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -89,6 +83,7 @@ public User firstName(String firstName) {
    * @return firstName
   */
   
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -107,6 +102,7 @@ public User lastName(String lastName) {
    * @return lastName
   */
   
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -125,6 +121,7 @@ public User email(String email) {
    * @return email
   */
   
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -143,6 +140,7 @@ public User password(String password) {
    * @return password
   */
   
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -161,6 +159,7 @@ public User phone(String phone) {
    * @return phone
   */
   
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -179,6 +178,7 @@ public User userStatus(Integer userStatus) {
    * @return userStatus
   */
   
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java
index 89ecd47ea2c8..cb4fc73bcb63 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/XmlItem.java
@@ -22,99 +22,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   
   private List<Integer> prefixNsWrappedArray;
 
@@ -128,6 +99,7 @@ public XmlItem attributeString(String attributeString) {
    * @return attributeString
   */
   
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -146,6 +118,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
    * @return attributeNumber
   */
   
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -164,6 +137,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
    * @return attributeInteger
   */
   
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -182,6 +156,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
    * @return attributeBoolean
   */
   
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -208,6 +183,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
    * @return wrappedArray
   */
   
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -226,6 +202,7 @@ public XmlItem nameString(String nameString) {
    * @return nameString
   */
   
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -244,6 +221,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
    * @return nameNumber
   */
   
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -262,6 +240,7 @@ public XmlItem nameInteger(Integer nameInteger) {
    * @return nameInteger
   */
   
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -280,6 +259,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
    * @return nameBoolean
   */
   
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -306,6 +286,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
    * @return nameArray
   */
   
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -332,6 +313,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
    * @return nameWrappedArray
   */
   
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -350,6 +332,7 @@ public XmlItem prefixString(String prefixString) {
    * @return prefixString
   */
   
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -368,6 +351,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
    * @return prefixNumber
   */
   
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -386,6 +370,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
    * @return prefixInteger
   */
   
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -404,6 +389,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
    * @return prefixBoolean
   */
   
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -430,6 +416,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
    * @return prefixArray
   */
   
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -456,6 +443,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
    * @return prefixWrappedArray
   */
   
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -474,6 +462,7 @@ public XmlItem namespaceString(String namespaceString) {
    * @return namespaceString
   */
   
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -492,6 +481,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
    * @return namespaceNumber
   */
   
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -510,6 +500,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
    * @return namespaceInteger
   */
   
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -528,6 +519,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
    * @return namespaceBoolean
   */
   
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -554,6 +546,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
    * @return namespaceArray
   */
   
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -580,6 +573,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
    * @return namespaceWrappedArray
   */
   
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -598,6 +592,7 @@ public XmlItem prefixNsString(String prefixNsString) {
    * @return prefixNsString
   */
   
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -616,6 +611,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
    * @return prefixNsNumber
   */
   
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -634,6 +630,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
    * @return prefixNsInteger
   */
   
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -652,6 +649,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
    * @return prefixNsBoolean
   */
   
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -678,6 +676,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
    * @return prefixNsArray
   */
   
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -704,6 +703,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
    * @return prefixNsWrappedArray
   */
   
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/client/petstore/spring-http-interface/.openapi-generator/FILES b/samples/client/petstore/spring-http-interface/.openapi-generator/FILES
index 057a6b03c611..12b7506e6734 100644
--- a/samples/client/petstore/spring-http-interface/.openapi-generator/FILES
+++ b/samples/client/petstore/spring-http-interface/.openapi-generator/FILES
@@ -49,6 +49,7 @@ src/main/java/org/openapitools/model/OuterCompositeDto.java
 src/main/java/org/openapitools/model/OuterEnumDto.java
 src/main/java/org/openapitools/model/PetDto.java
 src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
 src/main/java/org/openapitools/model/ReturnDto.java
 src/main/java/org/openapitools/model/SpecialModelNameDto.java
 src/main/java/org/openapitools/model/TagDto.java
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java
index 4cdaa75682a2..a685526d90a3 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/PetApi.java
@@ -7,6 +7,7 @@
 
 import org.openapitools.model.ApiResponseDto;
 import org.openapitools.model.PetDto;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto;
 import java.util.Set;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -118,6 +119,22 @@ ResponseEntity<PetDto> getPetById(
     );
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @HttpExchange(
+        method = "GET",
+        value = "/fake/{petId}/response-object-different-names",
+        accept = "application/json"
+    )
+    ResponseEntity<ResponseObjectWithDifferentFieldNamesDto> responseObjectDifferentNames(
+         @PathVariable("petId") Long petId
+    );
+
+
     /**
      * PUT /pet : Update an existing pet
      * 
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
index 866c0c9d89bb..966547c80da2 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyTypeDto extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyTypeDto name(String name) {
@@ -36,6 +35,7 @@ public AdditionalPropertiesAnyTypeDto name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
index 67d06814cb3d..41bf9effe534 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArrayDto extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArrayDto name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesArrayDto name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
index 53d996e4e840..8335c2ba832f 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBooleanDto extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBooleanDto name(String name) {
@@ -36,6 +35,7 @@ public AdditionalPropertiesBooleanDto name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
index e2aa343d20f5..7267a4621a52 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
@@ -28,45 +28,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClassDto {
 
-  @JsonProperty("map_string")
   
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClassDto mapString(Map<String, String> mapString) {
@@ -87,6 +76,7 @@ public AdditionalPropertiesClassDto putMapStringItem(String key, String mapStrin
    * @return mapString
   */
   
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -113,6 +103,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN
    * @return mapNumber
   */
   
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -139,6 +130,7 @@ public AdditionalPropertiesClassDto putMapIntegerItem(String key, Integer mapInt
    * @return mapInteger
   */
   
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -165,6 +157,7 @@ public AdditionalPropertiesClassDto putMapBooleanItem(String key, Boolean mapBoo
    * @return mapBoolean
   */
   
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -191,6 +184,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List<Inte
    * @return mapArrayInteger
   */
   
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -217,6 +211,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List<Obje
    * @return mapArrayAnytype
   */
   
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -243,6 +238,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map<String,
    * @return mapMapString
   */
   
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -269,6 +265,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map<String,
    * @return mapMapAnytype
   */
   
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -287,6 +284,7 @@ public AdditionalPropertiesClassDto anytype1(Object anytype1) {
    * @return anytype1
   */
   
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -305,6 +303,7 @@ public AdditionalPropertiesClassDto anytype2(Object anytype2) {
    * @return anytype2
   */
   
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -323,6 +322,7 @@ public AdditionalPropertiesClassDto anytype3(Object anytype3) {
    * @return anytype3
   */
   
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
index a1bdab5d3512..a7b0f41e8645 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesIntegerDto extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesIntegerDto name(String name) {
@@ -36,6 +35,7 @@ public AdditionalPropertiesIntegerDto name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
index 2d449dc7771e..955cd7c3aac7 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumberDto extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumberDto name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesNumberDto name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
index 9ac0fac53cf1..eac3c186356c 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObjectDto extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObjectDto name(String name) {
@@ -36,6 +35,7 @@ public AdditionalPropertiesObjectDto name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
index 3752cc2f31c1..fd8f19f618ee 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesStringDto extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesStringDto name(String name) {
@@ -36,6 +35,7 @@ public AdditionalPropertiesStringDto name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java
index c17b0385407e..8d900cefd092 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AnimalDto.java
@@ -37,10 +37,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AnimalDto {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   public AnimalDto className(String className) {
@@ -53,6 +51,7 @@ public AnimalDto className(String className) {
    * @return className
   */
   @NotNull
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -71,6 +70,7 @@ public AnimalDto color(String color) {
    * @return color
   */
   
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java
index 5bb9b181174f..42c035a52e0a 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ApiResponseDto.java
@@ -21,13 +21,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ApiResponseDto {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ApiResponseDto code(Integer code) {
@@ -40,6 +37,7 @@ public ApiResponseDto code(Integer code) {
    * @return code
   */
   
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -58,6 +56,7 @@ public ApiResponseDto type(String type) {
    * @return type
   */
   
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -76,6 +75,7 @@ public ApiResponseDto message(String message) {
    * @return message
   */
   
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
index 2c2b8329de48..da1319e94488 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnlyDto {
 
-  @JsonProperty("ArrayArrayNumber")
   
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List<BigDecimal> arra
    * @return arrayArrayNumber
   */
   
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
index c971a0fbb1e5..7c60e613a260 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnlyDto {
 
-  @JsonProperty("ArrayNumber")
   
   private List<BigDecimal> arrayNumber;
 
@@ -46,6 +45,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) {
    * @return arrayNumber
   */
   
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java
index d5676cf33021..202e9497ccdd 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ArrayTestDto.java
@@ -24,15 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTestDto {
 
-  @JsonProperty("array_of_string")
   
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   
   private List<List<ReadOnlyFirstDto>> arrayArrayOfModel;
 
@@ -54,6 +51,7 @@ public ArrayTestDto addArrayOfStringItem(String arrayOfStringItem) {
    * @return arrayOfString
   */
   
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -80,6 +78,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerIte
    * @return arrayArrayOfInteger
   */
   
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -106,6 +105,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<ReadOnlyFirstDto> arrayArrayOf
    * @return arrayArrayOfModel
   */
   
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirstDto>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java
index 46a31a13a9c9..34759c89187f 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatAllOfDto.java
@@ -61,7 +61,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOfDto kind(KindEnum kind) {
@@ -74,6 +73,7 @@ public BigCatAllOfDto kind(KindEnum kind) {
    * @return kind
   */
   
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java
index 4277020c8dca..b30873ccfde9 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java
@@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatDto kind(KindEnum kind) {
@@ -79,6 +78,7 @@ public BigCatDto kind(KindEnum kind) {
    * @return kind
   */
   
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java
index 3f041a318d2d..05c0616d28e8 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CapitalizationDto.java
@@ -21,22 +21,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CapitalizationDto {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public CapitalizationDto smallCamel(String smallCamel) {
@@ -49,6 +43,7 @@ public CapitalizationDto smallCamel(String smallCamel) {
    * @return smallCamel
   */
   
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -67,6 +62,7 @@ public CapitalizationDto capitalCamel(String capitalCamel) {
    * @return capitalCamel
   */
   
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -85,6 +81,7 @@ public CapitalizationDto smallSnake(String smallSnake) {
    * @return smallSnake
   */
   
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -103,6 +100,7 @@ public CapitalizationDto capitalSnake(String capitalSnake) {
    * @return capitalSnake
   */
   
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -121,6 +119,7 @@ public CapitalizationDto scAETHFlowPoints(String scAETHFlowPoints) {
    * @return scAETHFlowPoints
   */
   
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -139,6 +138,7 @@ public CapitalizationDto ATT_NAME(String ATT_NAME) {
    * @return ATT_NAME
   */
   
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java
index 9e6af0303ba8..4a89e033886a 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatAllOfDto.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOfDto {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOfDto declawed(Boolean declawed) {
@@ -34,6 +33,7 @@ public CatAllOfDto declawed(Boolean declawed) {
    * @return declawed
   */
   
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java
index 61f8bc958e63..ffa908384884 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CatDto.java
@@ -34,7 +34,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatDto extends AnimalDto {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatDto declawed(Boolean declawed) {
@@ -47,6 +46,7 @@ public CatDto declawed(Boolean declawed) {
    * @return declawed
   */
   
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java
index b3aebedbe87d..86a70d003fe1 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/CategoryDto.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CategoryDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   public CategoryDto id(Long id) {
@@ -37,6 +35,7 @@ public CategoryDto id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -55,6 +54,7 @@ public CategoryDto name(String name) {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java
index 8a4fc71e614a..e32c199f9123 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClassModelDto.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModelDto {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModelDto propertyClass(String propertyClass) {
@@ -34,6 +33,7 @@ public ClassModelDto propertyClass(String propertyClass) {
    * @return propertyClass
   */
   
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java
index 9185bd7de977..807f06847707 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ClientDto.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClientDto {
 
-  @JsonProperty("client")
   private String client;
 
   public ClientDto client(String client) {
@@ -34,6 +33,7 @@ public ClientDto client(String client) {
    * @return client
   */
   
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
index 9d13d762de9f..8e89bf7bcd48 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
@@ -26,19 +26,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValueDto {
 
-  @JsonProperty("nullable_array")
   
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -60,6 +56,7 @@ public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) {
    * @return nullableArray
   */
   
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -86,6 +83,7 @@ public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequ
    * @return nullableRequiredArray
   */
   @NotNull
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -112,6 +110,7 @@ public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) {
    * @return requiredArray
   */
   @NotNull
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -138,6 +137,7 @@ public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableA
    * @return nullableArrayWithDefault
   */
   
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java
index 13ca9db43a5b..59e98fa8c702 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogAllOfDto.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOfDto {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOfDto breed(String breed) {
@@ -34,6 +33,7 @@ public DogAllOfDto breed(String breed) {
    * @return breed
   */
   
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java
index 3cd4ba41e445..878670e18122 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/DogDto.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogDto extends AnimalDto {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogDto breed(String breed) {
@@ -39,6 +38,7 @@ public DogDto breed(String breed) {
    * @return breed
   */
   
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java
index fc87a8026c8d..1c1c01d8f689 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumArraysDto.java
@@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -111,6 +109,7 @@ public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) {
    * @return justSymbol
   */
   
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -137,6 +136,7 @@ public EnumArraysDto addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
    * @return arrayEnum
   */
   
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java
index f799473c14f3..2153d6b4cc96 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/EnumTestDto.java
@@ -60,7 +60,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -100,7 +99,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -138,7 +136,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -176,10 +173,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnumDto outerEnum;
 
   public EnumTestDto enumString(EnumStringEnum enumString) {
@@ -192,6 +187,7 @@ public EnumTestDto enumString(EnumStringEnum enumString) {
    * @return enumString
   */
   
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -210,6 +206,7 @@ public EnumTestDto enumStringRequired(EnumStringRequiredEnum enumStringRequired)
    * @return enumStringRequired
   */
   @NotNull
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -228,6 +225,7 @@ public EnumTestDto enumInteger(EnumIntegerEnum enumInteger) {
    * @return enumInteger
   */
   
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -246,6 +244,7 @@ public EnumTestDto enumNumber(EnumNumberEnum enumNumber) {
    * @return enumNumber
   */
   
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -264,6 +263,7 @@ public EnumTestDto outerEnum(OuterEnumDto outerEnum) {
    * @return outerEnum
   */
   
+  @JsonProperty("outerEnum")
   public OuterEnumDto getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java
index c2a46710955d..de6980c4ae2d 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileDto.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileDto {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public FileDto sourceURI(String sourceURI) {
@@ -34,6 +33,7 @@ public FileDto sourceURI(String sourceURI) {
    * @return sourceURI
   */
   
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
index 1d3e103819a9..dfd2796c5318 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClassDto {
 
-  @JsonProperty("file")
   private FileDto file;
 
-  @JsonProperty("files")
   
   private List<FileDto> files;
 
@@ -41,6 +39,7 @@ public FileSchemaTestClassDto file(FileDto file) {
    * @return file
   */
   
+  @JsonProperty("file")
   public FileDto getFile() {
     return file;
   }
@@ -67,6 +66,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) {
    * @return files
   */
   
+  @JsonProperty("files")
   public List<FileDto> getFiles() {
     return files;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java
index c3f24d344c51..68f17b1f1f21 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/FormatTestDto.java
@@ -27,48 +27,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTestDto {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   public FormatTestDto integer(Integer integer) {
@@ -83,6 +69,7 @@ public FormatTestDto integer(Integer integer) {
    * @return integer
   */
   
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -103,6 +90,7 @@ public FormatTestDto int32(Integer int32) {
    * @return int32
   */
   
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -121,6 +109,7 @@ public FormatTestDto int64(Long int64) {
    * @return int64
   */
   
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -141,6 +130,7 @@ public FormatTestDto number(BigDecimal number) {
    * @return number
   */
   @NotNull
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -161,6 +151,7 @@ public FormatTestDto _float(Float _float) {
    * @return _float
   */
   
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -181,6 +172,7 @@ public FormatTestDto _double(Double _double) {
    * @return _double
   */
   
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -199,6 +191,7 @@ public FormatTestDto string(String string) {
    * @return string
   */
   
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -217,6 +210,7 @@ public FormatTestDto _byte(byte[] _byte) {
    * @return _byte
   */
   @NotNull
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -235,6 +229,7 @@ public FormatTestDto binary(org.springframework.core.io.Resource binary) {
    * @return binary
   */
   
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -253,6 +248,7 @@ public FormatTestDto date(LocalDate date) {
    * @return date
   */
   @NotNull
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -271,6 +267,7 @@ public FormatTestDto dateTime(OffsetDateTime dateTime) {
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -289,6 +286,7 @@ public FormatTestDto uuid(UUID uuid) {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -307,6 +305,7 @@ public FormatTestDto password(String password) {
    * @return password
   */
   @NotNull
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -325,6 +324,7 @@ public FormatTestDto bigDecimal(BigDecimal bigDecimal) {
    * @return bigDecimal
   */
   
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
index 3c361299744f..1c311a43247f 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnlyDto {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnlyDto bar(String bar) {
@@ -37,6 +35,7 @@ public HasOnlyReadOnlyDto bar(String bar) {
    * @return bar
   */
   
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -55,6 +54,7 @@ public HasOnlyReadOnlyDto foo(String foo) {
    * @return foo
   */
   
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java
index 733fa6984539..2c7f5040a16e 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ListDto.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ListDto {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ListDto _123list(String _123list) {
@@ -34,6 +33,7 @@ public ListDto _123list(String _123list) {
    * @return _123list
   */
   
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java
index 82a99c07ad99..e74eafef2e95 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MapTestDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTestDto {
 
-  @JsonProperty("map_map_of_string")
   
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -93,6 +89,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map<String, String> mapMapOf
    * @return mapMapOfString
   */
   
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -119,6 +116,7 @@ public MapTestDto putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringIt
    * @return mapOfEnumString
   */
   
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -145,6 +143,7 @@ public MapTestDto putDirectMapItem(String key, Boolean directMapItem) {
    * @return directMap
   */
   
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -171,6 +170,7 @@ public MapTestDto putIndirectMapItem(String key, Boolean indirectMapItem) {
    * @return indirectMap
   */
   
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
index c5a17c21d44a..499c5540a5fc 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
@@ -27,14 +27,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClassDto {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   
   private Map<String, AnimalDto> map = new HashMap<>();
 
@@ -48,6 +45,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) {
    * @return uuid
   */
   
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -66,6 +64,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime da
    * @return dateTime
   */
   
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -92,6 +91,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani
    * @return map
   */
   
+  @JsonProperty("map")
   public Map<String, AnimalDto> getMap() {
     return map;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java
index f2e1a7ae0605..0c0c986a0f9f 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/Model200ResponseDto.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200ResponseDto {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200ResponseDto name(Integer name) {
@@ -37,6 +35,7 @@ public Model200ResponseDto name(Integer name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -55,6 +54,7 @@ public Model200ResponseDto propertyClass(String propertyClass) {
    * @return propertyClass
   */
   
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java
index d560dd759ec0..e8a5563cabb2 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NameDto.java
@@ -21,16 +21,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NameDto {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   public NameDto name(Integer name) {
@@ -43,6 +39,7 @@ public NameDto name(Integer name) {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +58,7 @@ public NameDto snakeCase(Integer snakeCase) {
    * @return snakeCase
   */
   
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -79,6 +77,7 @@ public NameDto property(String property) {
    * @return property
   */
   
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -97,6 +96,7 @@ public NameDto _123number(Integer _123number) {
    * @return _123number
   */
   
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java
index e449f9cf0362..36659acdd2dd 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NumberOnlyDto.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnlyDto {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnlyDto justNumber(BigDecimal justNumber) {
@@ -35,6 +34,7 @@ public NumberOnlyDto justNumber(BigDecimal justNumber) {
    * @return justNumber
   */
   
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java
index 578968167292..83aaefccc2a3 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OrderDto.java
@@ -24,16 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OrderDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public OrderDto id(Long id) {
@@ -90,6 +84,7 @@ public OrderDto id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -108,6 +103,7 @@ public OrderDto petId(Long petId) {
    * @return petId
   */
   
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -126,6 +122,7 @@ public OrderDto quantity(Integer quantity) {
    * @return quantity
   */
   
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -144,6 +141,7 @@ public OrderDto shipDate(OffsetDateTime shipDate) {
    * @return shipDate
   */
   
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -162,6 +160,7 @@ public OrderDto status(StatusEnum status) {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -180,6 +179,7 @@ public OrderDto complete(Boolean complete) {
    * @return complete
   */
   
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java
index 19cdb62012c6..aa8b26075f8b 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/OuterCompositeDto.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterCompositeDto {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterCompositeDto myNumber(BigDecimal myNumber) {
@@ -41,6 +38,7 @@ public OuterCompositeDto myNumber(BigDecimal myNumber) {
    * @return myNumber
   */
   
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -59,6 +57,7 @@ public OuterCompositeDto myString(String myString) {
    * @return myString
   */
   
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -77,6 +76,7 @@ public OuterCompositeDto myBoolean(Boolean myBoolean) {
    * @return myBoolean
   */
   
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
index 65c15dde1590..a4a33e8e3b92 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/PetDto.java
@@ -29,20 +29,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class PetDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private CategoryDto category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   
   private List<TagDto> tags;
 
@@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   public PetDto id(Long id) {
@@ -96,6 +90,7 @@ public PetDto id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -114,6 +109,7 @@ public PetDto category(CategoryDto category) {
    * @return category
   */
   
+  @JsonProperty("category")
   public CategoryDto getCategory() {
     return category;
   }
@@ -132,6 +128,7 @@ public PetDto name(String name) {
    * @return name
   */
   @NotNull
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -158,6 +155,7 @@ public PetDto addPhotoUrlsItem(String photoUrlsItem) {
    * @return photoUrls
   */
   @NotNull
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -185,6 +183,7 @@ public PetDto addTagsItem(TagDto tagsItem) {
    * @return tags
   */
   
+  @JsonProperty("tags")
   public List<TagDto> getTags() {
     return tags;
   }
@@ -203,6 +202,7 @@ public PetDto status(StatusEnum status) {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
index 7ab8278a6985..a7557dfd7aa0 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirstDto {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirstDto bar(String bar) {
@@ -37,6 +35,7 @@ public ReadOnlyFirstDto bar(String bar) {
    * @return bar
   */
   
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -55,6 +54,7 @@ public ReadOnlyFirstDto baz(String baz) {
    * @return baz
   */
   
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
new file mode 100644
index 000000000000..550a49f8bf11
--- /dev/null
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
@@ -0,0 +1,151 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import jakarta.validation.constraints.NotNull;
+
+
+import java.util.*;
+import jakarta.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNamesDto
+ */
+
+@JsonTypeName("ResponseObjectWithDifferentFieldNames")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNamesDto {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNamesDto responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNamesDto) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNamesDto {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java
index 99bdea143ef0..8fcbd415e287 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ReturnDto.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReturnDto {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ReturnDto _return(Integer _return) {
@@ -34,6 +33,7 @@ public ReturnDto _return(Integer _return) {
    * @return _return
   */
   
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java
index 1818d96452c8..009a9f9e4232 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/SpecialModelNameDto.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelNameDto {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelNameDto $specialPropertyName(Long $specialPropertyName) {
@@ -34,6 +33,7 @@ public class SpecialModelNameDto {
    * @return $specialPropertyName
   */
   
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java
index f3381428ec1a..b9c8195bfa67 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TagDto.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TagDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public TagDto id(Long id) {
@@ -37,6 +35,7 @@ public TagDto id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -55,6 +54,7 @@ public TagDto name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
index 989330c9165b..2b6d79d2e11d 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
@@ -24,19 +24,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefaultDto {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -50,6 +45,7 @@ public TypeHolderDefaultDto stringItem(String stringItem) {
    * @return stringItem
   */
   @NotNull
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -68,6 +64,7 @@ public TypeHolderDefaultDto numberItem(BigDecimal numberItem) {
    * @return numberItem
   */
   @NotNull
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -86,6 +83,7 @@ public TypeHolderDefaultDto integerItem(Integer integerItem) {
    * @return integerItem
   */
   @NotNull
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -104,6 +102,7 @@ public TypeHolderDefaultDto boolItem(Boolean boolItem) {
    * @return boolItem
   */
   @NotNull
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -130,6 +129,7 @@ public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) {
    * @return arrayItem
   */
   @NotNull
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
index dc6721ab2407..85c6a38798fa 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
@@ -24,22 +24,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExampleDto {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -53,6 +47,7 @@ public TypeHolderExampleDto stringItem(String stringItem) {
    * @return stringItem
   */
   @NotNull
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -71,6 +66,7 @@ public TypeHolderExampleDto numberItem(BigDecimal numberItem) {
    * @return numberItem
   */
   @NotNull
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -89,6 +85,7 @@ public TypeHolderExampleDto floatItem(Float floatItem) {
    * @return floatItem
   */
   @NotNull
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -107,6 +104,7 @@ public TypeHolderExampleDto integerItem(Integer integerItem) {
    * @return integerItem
   */
   @NotNull
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -125,6 +123,7 @@ public TypeHolderExampleDto boolItem(Boolean boolItem) {
    * @return boolItem
   */
   @NotNull
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -151,6 +150,7 @@ public TypeHolderExampleDto addArrayItemItem(Integer arrayItemItem) {
    * @return arrayItem
   */
   @NotNull
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java
index 01b2b3abce91..3cec69778ea9 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/UserDto.java
@@ -21,28 +21,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class UserDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public UserDto id(Long id) {
@@ -55,6 +47,7 @@ public UserDto id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -73,6 +66,7 @@ public UserDto username(String username) {
    * @return username
   */
   
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -91,6 +85,7 @@ public UserDto firstName(String firstName) {
    * @return firstName
   */
   
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -109,6 +104,7 @@ public UserDto lastName(String lastName) {
    * @return lastName
   */
   
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -127,6 +123,7 @@ public UserDto email(String email) {
    * @return email
   */
   
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -145,6 +142,7 @@ public UserDto password(String password) {
    * @return password
   */
   
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -163,6 +161,7 @@ public UserDto phone(String phone) {
    * @return phone
   */
   
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -181,6 +180,7 @@ public UserDto userStatus(Integer userStatus) {
    * @return userStatus
   */
   
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java
index c7c50eb4b4ac..fccde5901909 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/XmlItemDto.java
@@ -24,99 +24,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItemDto {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   
   private List<Integer> prefixNsWrappedArray;
 
@@ -130,6 +101,7 @@ public XmlItemDto attributeString(String attributeString) {
    * @return attributeString
   */
   
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -148,6 +120,7 @@ public XmlItemDto attributeNumber(BigDecimal attributeNumber) {
    * @return attributeNumber
   */
   
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -166,6 +139,7 @@ public XmlItemDto attributeInteger(Integer attributeInteger) {
    * @return attributeInteger
   */
   
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -184,6 +158,7 @@ public XmlItemDto attributeBoolean(Boolean attributeBoolean) {
    * @return attributeBoolean
   */
   
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -210,6 +185,7 @@ public XmlItemDto addWrappedArrayItem(Integer wrappedArrayItem) {
    * @return wrappedArray
   */
   
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -228,6 +204,7 @@ public XmlItemDto nameString(String nameString) {
    * @return nameString
   */
   
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -246,6 +223,7 @@ public XmlItemDto nameNumber(BigDecimal nameNumber) {
    * @return nameNumber
   */
   
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -264,6 +242,7 @@ public XmlItemDto nameInteger(Integer nameInteger) {
    * @return nameInteger
   */
   
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -282,6 +261,7 @@ public XmlItemDto nameBoolean(Boolean nameBoolean) {
    * @return nameBoolean
   */
   
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -308,6 +288,7 @@ public XmlItemDto addNameArrayItem(Integer nameArrayItem) {
    * @return nameArray
   */
   
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -334,6 +315,7 @@ public XmlItemDto addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
    * @return nameWrappedArray
   */
   
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -352,6 +334,7 @@ public XmlItemDto prefixString(String prefixString) {
    * @return prefixString
   */
   
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -370,6 +353,7 @@ public XmlItemDto prefixNumber(BigDecimal prefixNumber) {
    * @return prefixNumber
   */
   
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -388,6 +372,7 @@ public XmlItemDto prefixInteger(Integer prefixInteger) {
    * @return prefixInteger
   */
   
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -406,6 +391,7 @@ public XmlItemDto prefixBoolean(Boolean prefixBoolean) {
    * @return prefixBoolean
   */
   
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -432,6 +418,7 @@ public XmlItemDto addPrefixArrayItem(Integer prefixArrayItem) {
    * @return prefixArray
   */
   
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -458,6 +445,7 @@ public XmlItemDto addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
    * @return prefixWrappedArray
   */
   
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -476,6 +464,7 @@ public XmlItemDto namespaceString(String namespaceString) {
    * @return namespaceString
   */
   
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -494,6 +483,7 @@ public XmlItemDto namespaceNumber(BigDecimal namespaceNumber) {
    * @return namespaceNumber
   */
   
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -512,6 +502,7 @@ public XmlItemDto namespaceInteger(Integer namespaceInteger) {
    * @return namespaceInteger
   */
   
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -530,6 +521,7 @@ public XmlItemDto namespaceBoolean(Boolean namespaceBoolean) {
    * @return namespaceBoolean
   */
   
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -556,6 +548,7 @@ public XmlItemDto addNamespaceArrayItem(Integer namespaceArrayItem) {
    * @return namespaceArray
   */
   
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -582,6 +575,7 @@ public XmlItemDto addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem
    * @return namespaceWrappedArray
   */
   
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -600,6 +594,7 @@ public XmlItemDto prefixNsString(String prefixNsString) {
    * @return prefixNsString
   */
   
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -618,6 +613,7 @@ public XmlItemDto prefixNsNumber(BigDecimal prefixNsNumber) {
    * @return prefixNsNumber
   */
   
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -636,6 +632,7 @@ public XmlItemDto prefixNsInteger(Integer prefixNsInteger) {
    * @return prefixNsInteger
   */
   
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -654,6 +651,7 @@ public XmlItemDto prefixNsBoolean(Boolean prefixNsBoolean) {
    * @return prefixNsBoolean
   */
   
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -680,6 +678,7 @@ public XmlItemDto addPrefixNsArrayItem(Integer prefixNsArrayItem) {
    * @return prefixNsArray
   */
   
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -706,6 +705,7 @@ public XmlItemDto addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem)
    * @return prefixNsWrappedArray
   */
   
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java
index e2206012211f..f288a0edde9d 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java
index 6f12dac83ae1..369df105a62e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java
index 8e9325fbea42..906d04ddd72a 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
index f18b714d61ce..52bb7a983b17 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java
index 98c023bf698f..2f0f6cb47607 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java
index 753145eb0b3a..55f1824b9417 100644
--- a/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-3/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
index 18b55b13d162..0c0e8e8e72a4 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
index e18ac769bd2f..00924b168ab8 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
index 317082440c61..4c1bb184a39c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
index fdb5e59cd6bc..7ed29b5a5c00 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
index b748650e3c04..adea27d0193c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
index ac6ddb97bbce..9ec0b712b144 100644
--- a/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-async/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
index d4de6f244098..004fa56cd11c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/model/Pet.java
@@ -25,23 +25,17 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("@type")
   private String atType = "Pet";
 
-  @JsonProperty("age")
   private Integer age = 4;
 
-  @JsonProperty("happy")
   private Boolean happy = true;
 
-  @JsonProperty("price")
   private BigDecimal price = new BigDecimal("32000000000");
 
-  @JsonProperty("lastFeed")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime lastFeed = OffsetDateTime.parse("1973-12-19T11:39:57Z[UTC]", java.time.format.DateTimeFormatter.ISO_ZONED_DATE_TIME.withZone(java.time.ZoneId.systemDefault()));
 
-  @JsonProperty("dateOfBirth")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate dateOfBirth = LocalDate.parse("2021-01-01");
 
@@ -72,6 +66,7 @@ public Pet atType(String atType) {
   */
   @NotNull 
   @Schema(name = "@type", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("@type")
   public String getAtType() {
     return atType;
   }
@@ -91,6 +86,7 @@ public Pet age(Integer age) {
   */
   
   @Schema(name = "age", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("age")
   public Integer getAge() {
     return age;
   }
@@ -110,6 +106,7 @@ public Pet happy(Boolean happy) {
   */
   
   @Schema(name = "happy", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("happy")
   public Boolean getHappy() {
     return happy;
   }
@@ -129,6 +126,7 @@ public Pet price(BigDecimal price) {
   */
   @Valid 
   @Schema(name = "price", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("price")
   public BigDecimal getPrice() {
     return price;
   }
@@ -148,6 +146,7 @@ public Pet lastFeed(OffsetDateTime lastFeed) {
   */
   @Valid 
   @Schema(name = "lastFeed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastFeed")
   public OffsetDateTime getLastFeed() {
     return lastFeed;
   }
@@ -167,6 +166,7 @@ public Pet dateOfBirth(LocalDate dateOfBirth) {
   */
   @Valid 
   @Schema(name = "dateOfBirth", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateOfBirth")
   public LocalDate getDateOfBirth() {
     return dateOfBirth;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES
index bdc0d268f433..5ebc7f2a19f2 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/.openapi-generator/FILES
@@ -49,6 +49,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java
index 52b514af35a7..d093b19bbcb1 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/PetApi.java
@@ -7,6 +7,7 @@
 
 import org.openapitools.model.ModelApiResponse;
 import org.openapitools.model.Pet;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import java.util.Set;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
 import io.swagger.v3.oas.annotations.Operation;
@@ -208,6 +209,31 @@ ResponseEntity<Pet> getPetById(
     );
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @Operation(
+        operationId = "responseObjectDifferentNames",
+        tags = { "pet" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "successful operation", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = "application/json"
+    )
+    ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+    );
+
+
     /**
      * PUT /pet : Update an existing pet
      * 
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 0661c1a9a8d6..690bd609d238 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a3f9c9057892..db5353d2d357 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index db5f8d3ce350..5beed6563d9c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 66e0aed61c6c..eff5bd5fa4b1 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -28,45 +28,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index ff0d6d7241e1..e3d835a51244 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index cc212be855d8..6cde3b272d22 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 7c74b7de08dd..948a430c814c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 6087e70dba76..d59141c231c2 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
index 079192f597a2..01e303621e48 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Animal.java
@@ -38,10 +38,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   public Animal className(String className) {
@@ -55,6 +53,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -74,6 +73,7 @@ public Animal color(String color) {
   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 5b6c415bd667..d7f3b9f37fa1 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4e84838be3b2..6215ba771a08 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
index f7c9710a1eeb..d53a9e07ad87 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ArrayTest.java
@@ -24,15 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -55,6 +52,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -82,6 +80,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -109,6 +108,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java
index 1b367854915c..1185161d530f 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java
@@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCat kind(KindEnum kind) {
@@ -80,6 +79,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java
index 741de9f41a30..bff7b148aa2c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -77,6 +76,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
index 0c56400050ba..31142a864ec9 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Capitalization.java
@@ -21,22 +21,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -50,6 +44,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -69,6 +64,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -88,6 +84,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -107,6 +104,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -126,6 +124,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -145,6 +144,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java
index 41d9863046f1..2a6ad16814cd 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Cat.java
@@ -35,7 +35,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public Cat declawed(Boolean declawed) {
@@ -49,6 +48,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java
index 50a9c2cdce9d..0bd8697513ef 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/CatAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -37,6 +36,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
index 980faf6cbc2e..89a67825e647 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Category.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   public Category id(Long id) {
@@ -38,6 +36,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -57,6 +56,7 @@ public Category name(String name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
index a1942e9c4040..95bad44f6807 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ClassModel.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -36,6 +35,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
index c38b26829beb..c070bc9214b8 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Client.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -35,6 +34,7 @@ public Client client(String client) {
   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index ae4b8d558cad..6c5b41d66d4c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -26,19 +26,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -61,6 +57,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -88,6 +85,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -115,6 +113,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -142,6 +141,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java
index e39fe3fdab2c..9c16eaab5985 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Dog.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   public Dog breed(String breed) {
@@ -40,6 +39,7 @@ public Dog breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java
index 256925a78410..6b11905f99ac 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/DogAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -37,6 +36,7 @@ public DogAllOf breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
index a96e0290b0b7..3d3280a42dcb 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumArrays.java
@@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -112,6 +110,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -139,6 +138,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
index a92050b09f5d..3b9b41f5acfd 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/EnumTest.java
@@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   public EnumTest enumString(EnumStringEnum enumString) {
@@ -195,6 +190,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -214,6 +210,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -233,6 +230,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -252,6 +250,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -271,6 +270,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
index bf750ccdcb74..7b04101a36a5 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/File.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -36,6 +35,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index dae9b27f93aa..be6e37a7aba9 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
index 23130acbb766..81c7dcc4e286 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/FormatTest.java
@@ -29,48 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   public FormatTest integer(Integer integer) {
@@ -86,6 +72,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -107,6 +94,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -126,6 +114,7 @@ public FormatTest int64(Long int64) {
   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -147,6 +136,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -168,6 +158,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -189,6 +180,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -208,6 +200,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -227,6 +220,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -246,6 +240,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -265,6 +260,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -284,6 +280,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -303,6 +300,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -322,6 +320,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -341,6 +340,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c218d0e02b83..196214695a19 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -40,6 +38,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -59,6 +58,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
index 74cab2e2f8c6..7215fd65d7a0 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -94,6 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -121,6 +118,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -148,6 +146,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -175,6 +174,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d6b45daabd78..7dd078dbaa80 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,14 +27,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -49,6 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -68,6 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -95,6 +94,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
index 9ca96d114aae..32198c000f14 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Model200Response.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -41,6 +39,7 @@ public Model200Response name(Integer name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -60,6 +59,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
index 06c806057b50..0a8030385516 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -62,6 +60,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -81,6 +80,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
index f168748f6a20..c2ac56a57a7e 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelList.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -37,6 +36,7 @@ public ModelList _123list(String _123list) {
   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
index 641c56cd81c2..83da161c83f7 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ModelReturn.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -38,6 +37,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
index 708b0b90b016..85808ddbaa42 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Name.java
@@ -22,16 +22,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   public Name name(Integer name) {
@@ -45,6 +41,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -64,6 +61,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -83,6 +81,7 @@ public Name property(String property) {
   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -102,6 +101,7 @@ public Name _123number(Integer _123number) {
   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
index 4a3b6beffa27..1ec233732c33 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NumberOnly.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -36,6 +35,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
index 9a5b61bad434..9566edcbed86 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Order.java
@@ -24,16 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -91,6 +85,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -110,6 +105,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -129,6 +125,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -167,6 +165,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -186,6 +185,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
index b66d6d38afb2..6b6115048668 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/OuterComposite.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -42,6 +39,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -61,6 +59,7 @@ public OuterComposite myString(String myString) {
   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -80,6 +79,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
index fbbb929632cb..b313f7bb7e23 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Pet.java
@@ -29,20 +29,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   public Pet id(Long id) {
@@ -97,6 +91,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -116,6 +111,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -135,6 +131,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -162,6 +159,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -190,6 +188,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -209,6 +208,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 8c43e7e8c307..8891d8dac559 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -38,6 +36,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -57,6 +56,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..c681122f5f86
--- /dev/null
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,155 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
index e0a16a7b89a6..51dfdf9de433 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -37,6 +36,7 @@ public class SpecialModelName {
   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
index 03d5607e29b1..b6dd153652a8 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/Tag.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -38,6 +36,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -57,6 +56,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 76919cfbaaf3..eda3e4f43d34 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -24,19 +24,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -51,6 +46,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -70,6 +66,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -89,6 +86,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -108,6 +106,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -135,6 +134,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
index 6bcf2fdb5efc..fe3412f33587 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -24,22 +24,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -54,6 +48,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -73,6 +68,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -92,6 +88,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -111,6 +108,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -130,6 +128,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -157,6 +156,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
index e09df9be7b7c..cf6f92336800 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/User.java
@@ -21,28 +21,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -56,6 +48,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -75,6 +68,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -94,6 +88,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -113,6 +108,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -132,6 +128,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -151,6 +148,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -170,6 +168,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
index 280941921cd9..cf49606e1814 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/XmlItem.java
@@ -24,99 +24,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -131,6 +102,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -150,6 +122,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -169,6 +142,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -188,6 +162,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -215,6 +190,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -234,6 +210,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -253,6 +230,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -272,6 +250,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -291,6 +270,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -318,6 +298,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -345,6 +326,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -364,6 +346,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -383,6 +366,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -402,6 +386,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -421,6 +406,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -448,6 +434,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -475,6 +462,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -494,6 +482,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -513,6 +502,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -532,6 +522,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -551,6 +542,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -578,6 +570,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -605,6 +598,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -624,6 +618,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -643,6 +638,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -662,6 +658,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -681,6 +678,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -708,6 +706,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -735,6 +734,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
index 2a90a2f0a4f9..43a8c9805851 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
index e18ac769bd2f..00924b168ab8 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
index 317082440c61..4c1bb184a39c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
index fdb5e59cd6bc..7ed29b5a5c00 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
index b748650e3c04..adea27d0193c 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
index ac6ddb97bbce..9ec0b712b144 100644
--- a/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud-spring-pageable/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
index 18b55b13d162..0c0e8e8e72a4 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
index e18ac769bd2f..00924b168ab8 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
index 317082440c61..4c1bb184a39c 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
index fdb5e59cd6bc..7ed29b5a5c00 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
index b748650e3c04..adea27d0193c 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
index ac6ddb97bbce..9ec0b712b144 100644
--- a/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-cloud/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
index 18b55b13d162..0c0e8e8e72a4 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
index e18ac769bd2f..00924b168ab8 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
index 317082440c61..4c1bb184a39c 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
index fdb5e59cd6bc..7ed29b5a5c00 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
index b748650e3c04..adea27d0193c 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
index ac6ddb97bbce..9ec0b712b144 100644
--- a/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-stubs-skip-default-interface/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
index 18b55b13d162..0c0e8e8e72a4 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
index e18ac769bd2f..00924b168ab8 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
index 317082440c61..4c1bb184a39c 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
index fdb5e59cd6bc..7ed29b5a5c00 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
index b748650e3c04..adea27d0193c 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
index ac6ddb97bbce..9ec0b712b144 100644
--- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
index 0feef057e326..fd5cd5a64cef 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Addressable.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Addressable {
 
-  @JsonProperty("href")
   private String href;
 
-  @JsonProperty("id")
   private String id;
 
   public Addressable href(String href) {
@@ -39,6 +37,7 @@ public Addressable href(String href) {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -58,6 +57,7 @@ public Addressable id(String id) {
   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public String getId() {
     return id;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java
index 39979e84ce8e..803778570b29 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java
@@ -27,16 +27,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Bar extends Entity implements BarRefOrValue {
 
-  @JsonProperty("id")
   private String id;
 
-  @JsonProperty("barPropA")
   private String barPropA;
 
-  @JsonProperty("fooPropB")
   private String fooPropB;
 
-  @JsonProperty("foo")
   private FooRefOrValue foo;
 
   /**
@@ -67,6 +63,7 @@ public Bar id(String id) {
   */
   @NotNull 
   @Schema(name = "id", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -86,6 +83,7 @@ public Bar barPropA(String barPropA) {
   */
   
   @Schema(name = "barPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("barPropA")
   public String getBarPropA() {
     return barPropA;
   }
@@ -105,6 +103,7 @@ public Bar fooPropB(String fooPropB) {
   */
   
   @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("fooPropB")
   public String getFooPropB() {
     return fooPropB;
   }
@@ -124,6 +123,7 @@ public Bar foo(FooRefOrValue foo) {
   */
   @Valid 
   @Schema(name = "foo", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("foo")
   public FooRefOrValue getFoo() {
     return foo;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java
index 2e54e090ba2e..7d81d917f19a 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java
@@ -29,13 +29,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class BarCreate extends Entity {
 
-  @JsonProperty("barPropA")
   private String barPropA;
 
-  @JsonProperty("fooPropB")
   private String fooPropB;
 
-  @JsonProperty("foo")
   private FooRefOrValue foo;
 
   /**
@@ -65,6 +62,7 @@ public BarCreate barPropA(String barPropA) {
   */
   
   @Schema(name = "barPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("barPropA")
   public String getBarPropA() {
     return barPropA;
   }
@@ -84,6 +82,7 @@ public BarCreate fooPropB(String fooPropB) {
   */
   
   @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("fooPropB")
   public String getFooPropB() {
     return fooPropB;
   }
@@ -103,6 +102,7 @@ public BarCreate foo(FooRefOrValue foo) {
   */
   @Valid 
   @Schema(name = "foo", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("foo")
   public FooRefOrValue getFoo() {
     return foo;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java
index f562753ad8ae..064c16eafbbe 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Entity.java
@@ -44,19 +44,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Entity {
 
-  @JsonProperty("href")
   private String href;
 
-  @JsonProperty("id")
   private String id;
 
-  @JsonProperty("@schemaLocation")
   private String atSchemaLocation;
 
-  @JsonProperty("@baseType")
   private String atBaseType;
 
-  @JsonProperty("@type")
   private String atType;
 
   /**
@@ -86,6 +81,7 @@ public Entity href(String href) {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -105,6 +101,7 @@ public Entity id(String id) {
   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -124,6 +121,7 @@ public Entity atSchemaLocation(String atSchemaLocation) {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("@schemaLocation")
   public String getAtSchemaLocation() {
     return atSchemaLocation;
   }
@@ -143,6 +141,7 @@ public Entity atBaseType(String atBaseType) {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("@baseType")
   public String getAtBaseType() {
     return atBaseType;
   }
@@ -162,6 +161,7 @@ public Entity atType(String atType) {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("@type")
   public String getAtType() {
     return atType;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java
index aa5d638da283..22ae84383632 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/EntityRef.java
@@ -37,25 +37,18 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class EntityRef {
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("@referredType")
   private String atReferredType;
 
-  @JsonProperty("href")
   private String href;
 
-  @JsonProperty("id")
   private String id;
 
-  @JsonProperty("@schemaLocation")
   private String atSchemaLocation;
 
-  @JsonProperty("@baseType")
   private String atBaseType;
 
-  @JsonProperty("@type")
   private String atType;
 
   /**
@@ -85,6 +78,7 @@ public EntityRef name(String name) {
   */
   
   @Schema(name = "name", description = "Name of the related entity.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -104,6 +98,7 @@ public EntityRef atReferredType(String atReferredType) {
   */
   
   @Schema(name = "@referredType", description = "The actual type of the target instance when needed for disambiguation.", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("@referredType")
   public String getAtReferredType() {
     return atReferredType;
   }
@@ -123,6 +118,7 @@ public EntityRef href(String href) {
   */
   
   @Schema(name = "href", description = "Hyperlink reference", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("href")
   public String getHref() {
     return href;
   }
@@ -142,6 +138,7 @@ public EntityRef id(String id) {
   */
   
   @Schema(name = "id", description = "unique identifier", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public String getId() {
     return id;
   }
@@ -161,6 +158,7 @@ public EntityRef atSchemaLocation(String atSchemaLocation) {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("@schemaLocation")
   public String getAtSchemaLocation() {
     return atSchemaLocation;
   }
@@ -180,6 +178,7 @@ public EntityRef atBaseType(String atBaseType) {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("@baseType")
   public String getAtBaseType() {
     return atBaseType;
   }
@@ -199,6 +198,7 @@ public EntityRef atType(String atType) {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("@type")
   public String getAtType() {
     return atType;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java
index 1a441eee6e83..f62ccc5c6a09 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Extensible.java
@@ -21,13 +21,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Extensible {
 
-  @JsonProperty("@schemaLocation")
   private String atSchemaLocation;
 
-  @JsonProperty("@baseType")
   private String atBaseType;
 
-  @JsonProperty("@type")
   private String atType;
 
   /**
@@ -57,6 +54,7 @@ public Extensible atSchemaLocation(String atSchemaLocation) {
   */
   
   @Schema(name = "@schemaLocation", description = "A URI to a JSON-Schema file that defines additional attributes and relationships", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("@schemaLocation")
   public String getAtSchemaLocation() {
     return atSchemaLocation;
   }
@@ -76,6 +74,7 @@ public Extensible atBaseType(String atBaseType) {
   */
   
   @Schema(name = "@baseType", description = "When sub-classing, this defines the super-class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("@baseType")
   public String getAtBaseType() {
     return atBaseType;
   }
@@ -95,6 +94,7 @@ public Extensible atType(String atType) {
   */
   @NotNull 
   @Schema(name = "@type", description = "When sub-classing, this defines the sub-class Extensible name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("@type")
   public String getAtType() {
     return atType;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java
index 2a62b82f81de..76ef9bac7f43 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java
@@ -26,10 +26,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Foo extends Entity implements FooRefOrValue {
 
-  @JsonProperty("fooPropA")
   private String fooPropA;
 
-  @JsonProperty("fooPropB")
   private String fooPropB;
 
   /**
@@ -59,6 +57,7 @@ public Foo fooPropA(String fooPropA) {
   */
   
   @Schema(name = "fooPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("fooPropA")
   public String getFooPropA() {
     return fooPropA;
   }
@@ -78,6 +77,7 @@ public Foo fooPropB(String fooPropB) {
   */
   
   @Schema(name = "fooPropB", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("fooPropB")
   public String getFooPropB() {
     return fooPropB;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java
index f0386a82498c..b62f240056df 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FooRef extends EntityRef implements FooRefOrValue {
 
-  @JsonProperty("foorefPropA")
   private String foorefPropA;
 
   /**
@@ -56,6 +55,7 @@ public FooRef foorefPropA(String foorefPropA) {
   */
   
   @Schema(name = "foorefPropA", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("foorefPropA")
   public String getFoorefPropA() {
     return foorefPropA;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java
index ad5306785356..20611d5541be 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pasta extends Entity {
 
-  @JsonProperty("vendor")
   private String vendor;
 
   /**
@@ -56,6 +55,7 @@ public Pasta vendor(String vendor) {
   */
   
   @Schema(name = "vendor", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("vendor")
   public String getVendor() {
     return vendor;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java
index a87109514066..9d58604106eb 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java
@@ -36,7 +36,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pizza extends Entity {
 
-  @JsonProperty("pizzaSize")
   private BigDecimal pizzaSize;
 
   /**
@@ -66,6 +65,7 @@ public Pizza pizzaSize(BigDecimal pizzaSize) {
   */
   @Valid 
   @Schema(name = "pizzaSize", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("pizzaSize")
   public BigDecimal getPizzaSize() {
     return pizzaSize;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java
index a4c5f53565e2..3109ecf660d3 100644
--- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java
+++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class PizzaSpeziale extends Pizza {
 
-  @JsonProperty("toppings")
   private String toppings;
 
   /**
@@ -57,6 +56,7 @@ public PizzaSpeziale toppings(String toppings) {
   */
   
   @Schema(name = "toppings", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("toppings")
   public String getToppings() {
     return toppings;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
index 18b55b13d162..0c0e8e8e72a4 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
index e18ac769bd2f..00924b168ab8 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
index 317082440c61..4c1bb184a39c 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
index fdb5e59cd6bc..7ed29b5a5c00 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
index b748650e3c04..adea27d0193c 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
index ac6ddb97bbce..9ec0b712b144 100644
--- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
index e2206012211f..f288a0edde9d 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
index 6f12dac83ae1..369df105a62e 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
index 8e9325fbea42..906d04ddd72a 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
index f18b714d61ce..52bb7a983b17 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
index 98c023bf698f..2f0f6cb47607 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
index 753145eb0b3a..55f1824b9417 100644
--- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index dcd0fe591799..38c62f8a00e6 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber = null;
 
@@ -46,6 +45,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index d38ec8372a33..fb6a073750ad 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber = null;
 
@@ -46,6 +45,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
index 7bd997fdce43..54c8c21ef281 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
@@ -23,15 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString = null;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger = null;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel = null;
 
@@ -54,6 +51,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -81,6 +79,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -108,6 +107,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
index 71b077585e21..88a67562412f 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
@@ -58,7 +58,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -96,7 +95,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum = null;
 
@@ -111,6 +109,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -138,6 +137,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
index d84afd1cc533..bed4f577bd29 100644
--- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
@@ -23,99 +23,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray = null;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray = null;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray = null;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray = null;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray = null;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray = null;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray = null;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray = null;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray = null;
 
@@ -130,6 +101,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -149,6 +121,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -168,6 +141,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -187,6 +161,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -214,6 +189,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -233,6 +209,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -252,6 +229,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -271,6 +249,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -290,6 +269,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -317,6 +297,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -344,6 +325,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -363,6 +345,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -382,6 +365,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -401,6 +385,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -420,6 +405,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -447,6 +433,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -474,6 +461,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -493,6 +481,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -512,6 +501,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -531,6 +521,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -550,6 +541,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -577,6 +569,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -604,6 +597,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -623,6 +617,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -642,6 +637,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -661,6 +657,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -680,6 +677,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -707,6 +705,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -734,6 +733,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore
index 7484ee590a38..b7d19e03b54a 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore
+++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator-ignore
@@ -21,3 +21,5 @@
 #docs/*.md
 # Then explicitly reverse the ignore rule for a single file:
 #!docs/README.md
+
+src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java
\ No newline at end of file
diff --git a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES
index 16d8f2a63237..50815c779dc5 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES
+++ b/samples/openapi3/server/petstore/springboot-delegate/.openapi-generator/FILES
@@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index d047a0540c67..9f2e5b2da3e4 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
@@ -195,6 +196,33 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @Operation(
+        operationId = "responseObjectDifferentNames",
+        tags = { "pet" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "successful operation", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+    ) {
+        return getDelegate().responseObjectDifferentNames(petId);
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
index 726b17779f18..b88f61719554 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
index d1a650378e63..65ea3c13eae9 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import org.springframework.http.HttpStatus;
@@ -107,6 +108,27 @@ default ResponseEntity<String> fakeOuterStringSerialize(String body) {
 
     }
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     * @see FakeApi#responseObjectDifferentNames
+     */
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(Long petId) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 0661c1a9a8d6..690bd609d238 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a3f9c9057892..db5353d2d357 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index db5f8d3ce350..5beed6563d9c 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 66e0aed61c6c..eff5bd5fa4b1 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -28,45 +28,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index ff0d6d7241e1..e3d835a51244 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index cc212be855d8..6cde3b272d22 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 7c74b7de08dd..948a430c814c 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 6087e70dba76..d59141c231c2 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
index 1ecf10efc5c1..51d21426e8f0 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
@@ -38,10 +38,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -71,6 +69,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -90,6 +89,7 @@ public Animal color(String color) {
   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 5b6c415bd667..d7f3b9f37fa1 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4e84838be3b2..6215ba771a08 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
index f7c9710a1eeb..d53a9e07ad87 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
@@ -24,15 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -55,6 +52,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -82,6 +80,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -109,6 +108,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
index 8c5453c4a5b0..523598886070 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
@@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -96,6 +95,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
index 741de9f41a30..bff7b148aa2c 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -77,6 +76,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
index 0c56400050ba..31142a864ec9 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
@@ -21,22 +21,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -50,6 +44,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -69,6 +64,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -88,6 +84,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -107,6 +104,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -126,6 +124,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -145,6 +144,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
index a2feece8de89..7fe1ed5d2b83 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
@@ -35,7 +35,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -65,6 +64,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
index 50a9c2cdce9d..0bd8697513ef 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -37,6 +36,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
index 7ee1fde06461..745935143d19 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -54,6 +52,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -73,6 +72,7 @@ public Category name(String name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
index a1942e9c4040..95bad44f6807 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -36,6 +35,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
index c38b26829beb..c070bc9214b8 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -35,6 +34,7 @@ public Client client(String client) {
   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 55d205398170..ebcd1eede94e 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -26,19 +26,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -78,6 +74,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -105,6 +102,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -132,6 +130,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -159,6 +158,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
index 1bb3d6b51028..b339978e5422 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -56,6 +55,7 @@ public Dog breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
index 256925a78410..6b11905f99ac 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -37,6 +36,7 @@ public DogAllOf breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
index a96e0290b0b7..3d3280a42dcb 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
@@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -112,6 +110,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -139,6 +138,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
index 6f08d4ee9fb3..e785606f0e12 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
@@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -211,6 +206,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -230,6 +226,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -249,6 +246,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -268,6 +266,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -287,6 +286,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
index bf750ccdcb74..7b04101a36a5 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -36,6 +35,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index dae9b27f93aa..be6e37a7aba9 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
index 06e9dde8e89d..bc4f1de88e68 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -29,48 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -105,6 +91,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -126,6 +113,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -145,6 +133,7 @@ public FormatTest int64(Long int64) {
   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -166,6 +155,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -187,6 +177,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -208,6 +199,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -227,6 +219,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -246,6 +239,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -265,6 +259,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -284,6 +279,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -303,6 +299,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -322,6 +319,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -341,6 +339,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -360,6 +359,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c218d0e02b83..196214695a19 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -40,6 +38,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -59,6 +58,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
index 74cab2e2f8c6..7215fd65d7a0 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -94,6 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -121,6 +118,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -148,6 +146,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -175,6 +174,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d6b45daabd78..7dd078dbaa80 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,14 +27,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -49,6 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -68,6 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -95,6 +94,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
index 9ca96d114aae..32198c000f14 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -41,6 +39,7 @@ public Model200Response name(Integer name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -60,6 +59,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
index 06c806057b50..0a8030385516 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -62,6 +60,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -81,6 +80,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
index f168748f6a20..c2ac56a57a7e 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -37,6 +36,7 @@ public ModelList _123list(String _123list) {
   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
index 641c56cd81c2..83da161c83f7 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -38,6 +37,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
index d6dcb665651a..ed42396e8151 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
@@ -22,16 +22,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -61,6 +57,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -80,6 +77,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -99,6 +97,7 @@ public Name property(String property) {
   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -118,6 +117,7 @@ public Name _123number(Integer _123number) {
   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
index 4a3b6beffa27..1ec233732c33 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -36,6 +35,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
index 9a5b61bad434..9566edcbed86 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
@@ -24,16 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -91,6 +85,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -110,6 +105,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -129,6 +125,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -167,6 +165,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -186,6 +185,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
index b66d6d38afb2..6b6115048668 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -42,6 +39,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -61,6 +59,7 @@ public OuterComposite myString(String myString) {
   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -80,6 +79,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index ba99ad030276..0e76707f06f6 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -29,20 +29,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -114,6 +108,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -133,6 +128,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -152,6 +148,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -226,6 +225,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 8c43e7e8c307..8891d8dac559 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -38,6 +36,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -57,6 +56,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..c681122f5f86
--- /dev/null
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,155 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
index e0a16a7b89a6..51dfdf9de433 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -37,6 +36,7 @@ public class SpecialModelName {
   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
index 03d5607e29b1..b6dd153652a8 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -38,6 +36,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -57,6 +56,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 12b55e211855..c2217970131c 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -24,19 +24,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
index 8b74b97d38f3..96efe9c2627d 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -24,22 +24,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
index e09df9be7b7c..cf6f92336800 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
@@ -21,28 +21,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -56,6 +48,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -75,6 +68,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -94,6 +88,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -113,6 +108,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -132,6 +128,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -151,6 +148,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -170,6 +168,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
index 280941921cd9..cf49606e1814 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
@@ -24,99 +24,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -131,6 +102,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -150,6 +122,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -169,6 +142,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -188,6 +162,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -215,6 +190,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -234,6 +210,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -253,6 +230,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -272,6 +250,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -291,6 +270,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -318,6 +298,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -345,6 +326,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -364,6 +346,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -383,6 +366,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -402,6 +386,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -421,6 +406,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -448,6 +434,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -475,6 +462,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -494,6 +482,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -513,6 +502,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -532,6 +522,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -551,6 +542,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -578,6 +570,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -605,6 +598,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -624,6 +618,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -643,6 +638,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -662,6 +658,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -681,6 +678,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -708,6 +706,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -735,6 +734,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java b/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java
new file mode 100644
index 000000000000..7b2e5702ed62
--- /dev/null
+++ b/samples/openapi3/server/petstore/springboot-delegate/src/test/java/org/openapitools/ResponseObjectWithDifferentFieldNamesJsonSerializationTest.java
@@ -0,0 +1,57 @@
+package org.openapitools;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.assertj.core.api.Assertions;
+import org.json.JSONException;
+import org.junit.jupiter.api.Test;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+public class ResponseObjectWithDifferentFieldNamesJsonSerializationTest {
+
+    private static final String JSON_STRING = "{" +
+        "\"normalPropertyName\": \"normalPropertyName_value\"," +
+        "\"lower-case-property-dashes\": \"lowerCasePropertyDashes_value\"," +
+        "\"property name with spaces\": \"propertyNameWithSpaces_value\"," +
+        "\"UPPER_CASE_PROPERTY_SNAKE\": \"UPPER_CASE_PROPERTY_SNAKE_value\"" +
+        "}";
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Test
+    void shouldSerializedModelToJson() throws JsonProcessingException, JSONException {
+        ResponseObjectWithDifferentFieldNames object = new ResponseObjectWithDifferentFieldNames()
+            .normalPropertyName("normalPropertyName_value")
+            .UPPER_CASE_PROPERTY_SNAKE("UPPER_CASE_PROPERTY_SNAKE_value")
+            .lowerCasePropertyDashes("lowerCasePropertyDashes_value")
+            .propertyNameWithSpaces("propertyNameWithSpaces_value");
+
+        String actualJson = objectMapper.writeValueAsString(object);
+
+        JSONAssert.assertEquals(JSON_STRING, actualJson, true);
+    }
+
+    @Test
+    void shouldDeserializedJsonToModel() throws JsonProcessingException {
+        String json = "{" +
+            "\"normalPropertyName\": \"normalPropertyName_value\"," +
+            "\"lower-case-property-dashes\": \"lowerCasePropertyDashes_value\"," +
+            "\"property name with spaces\": \"propertyNameWithSpaces_value\"," +
+            "\"UPPER_CASE_PROPERTY_SNAKE\": \"UPPER_CASE_PROPERTY_SNAKE_value\"" +
+            "}";
+
+        ResponseObjectWithDifferentFieldNames object = objectMapper.readValue(json, ResponseObjectWithDifferentFieldNames.class);
+
+        Assertions.assertThat(object)
+            .returns("normalPropertyName_value", ResponseObjectWithDifferentFieldNames::getNormalPropertyName)
+            .returns("UPPER_CASE_PROPERTY_SNAKE_value", ResponseObjectWithDifferentFieldNames::getUPPERCASEPROPERTYSNAKE)
+            .returns("lowerCasePropertyDashes_value", ResponseObjectWithDifferentFieldNames::getLowerCasePropertyDashes)
+            .returns("propertyNameWithSpaces_value", ResponseObjectWithDifferentFieldNames::getPropertyNameWithSpaces);
+    }
+
+}
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES
index 8263ca2ee05c..c904db3800ae 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES
@@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 4e0a224db24e..47c0b05280fa 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
@@ -213,6 +214,43 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @Operation(
+        operationId = "responseObjectDifferentNames",
+        tags = { "pet" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "successful operation", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
index 5ae5d5fed985..9121a3951829 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 0661c1a9a8d6..690bd609d238 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a3f9c9057892..db5353d2d357 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index db5f8d3ce350..5beed6563d9c 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 66e0aed61c6c..eff5bd5fa4b1 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -28,45 +28,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index ff0d6d7241e1..e3d835a51244 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index cc212be855d8..6cde3b272d22 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 7c74b7de08dd..948a430c814c 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 6087e70dba76..d59141c231c2 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
index 1ecf10efc5c1..51d21426e8f0 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
@@ -38,10 +38,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -71,6 +69,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -90,6 +89,7 @@ public Animal color(String color) {
   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 5b6c415bd667..d7f3b9f37fa1 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4e84838be3b2..6215ba771a08 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
index f7c9710a1eeb..d53a9e07ad87 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
@@ -24,15 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -55,6 +52,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -82,6 +80,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -109,6 +108,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
index 8c5453c4a5b0..523598886070 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
@@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -96,6 +95,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
index 741de9f41a30..bff7b148aa2c 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -77,6 +76,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
index 0c56400050ba..31142a864ec9 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
@@ -21,22 +21,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -50,6 +44,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -69,6 +64,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -88,6 +84,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -107,6 +104,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -126,6 +124,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -145,6 +144,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
index a2feece8de89..7fe1ed5d2b83 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
@@ -35,7 +35,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -65,6 +64,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
index 50a9c2cdce9d..0bd8697513ef 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -37,6 +36,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
index 7ee1fde06461..745935143d19 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -54,6 +52,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -73,6 +72,7 @@ public Category name(String name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
index a1942e9c4040..95bad44f6807 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -36,6 +35,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
index c38b26829beb..c070bc9214b8 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -35,6 +34,7 @@ public Client client(String client) {
   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 55d205398170..ebcd1eede94e 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -26,19 +26,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -78,6 +74,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -105,6 +102,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -132,6 +130,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -159,6 +158,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
index 1bb3d6b51028..b339978e5422 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -56,6 +55,7 @@ public Dog breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
index 256925a78410..6b11905f99ac 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -37,6 +36,7 @@ public DogAllOf breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
index a96e0290b0b7..3d3280a42dcb 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
@@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -112,6 +110,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -139,6 +138,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
index 6f08d4ee9fb3..e785606f0e12 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
@@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -211,6 +206,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -230,6 +226,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -249,6 +246,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -268,6 +266,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -287,6 +286,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
index bf750ccdcb74..7b04101a36a5 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -36,6 +35,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index dae9b27f93aa..be6e37a7aba9 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
index 06e9dde8e89d..bc4f1de88e68 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -29,48 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -105,6 +91,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -126,6 +113,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -145,6 +133,7 @@ public FormatTest int64(Long int64) {
   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -166,6 +155,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -187,6 +177,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -208,6 +199,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -227,6 +219,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -246,6 +239,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -265,6 +259,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -284,6 +279,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -303,6 +299,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -322,6 +319,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -341,6 +339,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -360,6 +359,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c218d0e02b83..196214695a19 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -40,6 +38,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -59,6 +58,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
index 74cab2e2f8c6..7215fd65d7a0 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -94,6 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -121,6 +118,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -148,6 +146,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -175,6 +174,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d6b45daabd78..7dd078dbaa80 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,14 +27,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -49,6 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -68,6 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -95,6 +94,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
index 9ca96d114aae..32198c000f14 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -41,6 +39,7 @@ public Model200Response name(Integer name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -60,6 +59,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
index 06c806057b50..0a8030385516 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -62,6 +60,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -81,6 +80,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
index f168748f6a20..c2ac56a57a7e 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -37,6 +36,7 @@ public ModelList _123list(String _123list) {
   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
index 641c56cd81c2..83da161c83f7 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -38,6 +37,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
index d6dcb665651a..ed42396e8151 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
@@ -22,16 +22,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -61,6 +57,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -80,6 +77,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -99,6 +97,7 @@ public Name property(String property) {
   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -118,6 +117,7 @@ public Name _123number(Integer _123number) {
   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
index 4a3b6beffa27..1ec233732c33 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -36,6 +35,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
index 9a5b61bad434..9566edcbed86 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
@@ -24,16 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -91,6 +85,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -110,6 +105,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -129,6 +125,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -167,6 +165,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -186,6 +185,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
index b66d6d38afb2..6b6115048668 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -42,6 +39,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -61,6 +59,7 @@ public OuterComposite myString(String myString) {
   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -80,6 +79,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index ba99ad030276..0e76707f06f6 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -29,20 +29,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -114,6 +108,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -133,6 +128,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -152,6 +148,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -226,6 +225,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 8c43e7e8c307..8891d8dac559 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -38,6 +36,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -57,6 +56,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..c681122f5f86
--- /dev/null
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,155 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
index e0a16a7b89a6..51dfdf9de433 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -37,6 +36,7 @@ public class SpecialModelName {
   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
index 03d5607e29b1..b6dd153652a8 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -38,6 +36,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -57,6 +56,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 12b55e211855..c2217970131c 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -24,19 +24,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
index 8b74b97d38f3..96efe9c2627d 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -24,22 +24,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
index e09df9be7b7c..cf6f92336800 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
@@ -21,28 +21,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -56,6 +48,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -75,6 +68,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -94,6 +88,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -113,6 +108,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -132,6 +128,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -151,6 +148,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -170,6 +168,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
index 280941921cd9..cf49606e1814 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
@@ -24,99 +24,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -131,6 +102,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -150,6 +122,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -169,6 +142,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -188,6 +162,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -215,6 +190,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -234,6 +210,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -253,6 +230,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -272,6 +250,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -291,6 +270,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -318,6 +298,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -345,6 +326,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -364,6 +346,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -383,6 +366,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -402,6 +386,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -421,6 +406,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -448,6 +434,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -475,6 +462,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -494,6 +482,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -513,6 +502,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -532,6 +522,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -551,6 +542,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -578,6 +570,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -605,6 +598,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -624,6 +618,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -643,6 +638,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -662,6 +658,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -681,6 +678,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -708,6 +706,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -735,6 +734,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
+++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
index 0d2e56dfa3d9..d48f33e470be 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Category.java
@@ -20,10 +20,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -36,6 +34,7 @@ public Category id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -54,6 +53,7 @@ public Category name(String name) {
    * @return name
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
index f66ed8b59413..5376fa62cc31 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) {
    * @return code
   */
   
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -59,6 +57,7 @@ public ModelApiResponse type(String type) {
    * @return type
   */
   
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -77,6 +76,7 @@ public ModelApiResponse message(String message) {
    * @return message
   */
   
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
index aafcfc0cc192..ad7ddb217362 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Order.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -73,10 +69,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -89,6 +83,7 @@ public Order id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -107,6 +102,7 @@ public Order petId(Long petId) {
    * @return petId
   */
   
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -125,6 +121,7 @@ public Order quantity(Integer quantity) {
    * @return quantity
   */
   
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -143,6 +140,7 @@ public Order shipDate(OffsetDateTime shipDate) {
    * @return shipDate
   */
   @Valid 
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -161,6 +159,7 @@ public Order status(StatusEnum status) {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -179,6 +178,7 @@ public Order complete(Boolean complete) {
    * @return complete
   */
   
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
index 05bed382e38e..f72251ebac0d 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Pet.java
@@ -25,20 +25,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -79,7 +74,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -109,6 +103,7 @@ public Pet id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -127,6 +122,7 @@ public Pet category(Category category) {
    * @return category
   */
   @Valid 
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -145,6 +141,7 @@ public Pet name(String name) {
    * @return name
   */
   @NotNull 
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -171,6 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
    * @return photoUrls
   */
   @NotNull 
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -197,6 +195,7 @@ public Pet addTagsItem(Tag tagsItem) {
    * @return tags
   */
   @Valid 
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -215,6 +214,7 @@ public Pet status(StatusEnum status) {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
index 32f55514e089..ae8b17e77928 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/Tag.java
@@ -20,10 +20,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -36,6 +34,7 @@ public Tag id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -54,6 +53,7 @@ public Tag name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
index 16f35830e845..f825d42b636b 100644
--- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/model/User.java
@@ -20,28 +20,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -54,6 +46,7 @@ public User id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -72,6 +65,7 @@ public User username(String username) {
    * @return username
   */
   
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -90,6 +84,7 @@ public User firstName(String firstName) {
    * @return firstName
   */
   
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -108,6 +103,7 @@ public User lastName(String lastName) {
    * @return lastName
   */
   
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -126,6 +122,7 @@ public User email(String email) {
    * @return email
   */
   
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -144,6 +141,7 @@ public User password(String password) {
    * @return password
   */
   
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -162,6 +160,7 @@ public User phone(String phone) {
    * @return phone
   */
   
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -180,6 +179,7 @@ public User userStatus(Integer userStatus) {
    * @return userStatus
   */
   
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
index 18b55b13d162..0c0e8e8e72a4 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -39,6 +37,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
index e18ac769bd2f..00924b168ab8 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
index 317082440c61..4c1bb184a39c 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
index fdb5e59cd6bc..7ed29b5a5c00 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
index b748650e3c04..adea27d0193c 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
index ac6ddb97bbce..9ec0b712b144 100644
--- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
+++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
index 72502d0f0e26..5fe001a360f0 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Category.java
@@ -30,11 +30,9 @@
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
 public class Category {
 
-  @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
   private Long id;
 
-  @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
   private String name;
 
@@ -49,6 +47,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -68,6 +67,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
index d7fd8f87d926..37ee933d1276 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -32,15 +32,12 @@
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   @JacksonXmlProperty(localName = "code")
   private Integer code;
 
-  @JsonProperty("type")
   @JacksonXmlProperty(localName = "type")
   private String type;
 
-  @JsonProperty("message")
   @JacksonXmlProperty(localName = "message")
   private String message;
 
@@ -55,6 +52,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -74,6 +72,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -93,6 +92,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
index a2507752ed07..19cc6ec9bf51 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Order.java
@@ -33,19 +33,15 @@
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
 public class Order {
 
-  @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
   private Long id;
 
-  @JsonProperty("petId")
   @JacksonXmlProperty(localName = "petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   @JacksonXmlProperty(localName = "quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @JacksonXmlProperty(localName = "shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private Date shipDate;
@@ -87,11 +83,9 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   @JacksonXmlProperty(localName = "status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   @JacksonXmlProperty(localName = "complete")
   private Boolean complete = false;
 
@@ -106,6 +100,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -125,6 +120,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -144,6 +140,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -163,6 +160,7 @@ public Order shipDate(Date shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public Date getShipDate() {
     return shipDate;
   }
@@ -182,6 +180,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -201,6 +200,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
index 6fa31a30601d..410419edbaab 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Pet.java
@@ -35,24 +35,19 @@
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
   private Long id;
 
-  @JsonProperty("category")
   @JacksonXmlProperty(localName = "category")
   private Category category;
 
-  @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @JacksonXmlProperty(localName = "photoUrl")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @JacksonXmlProperty(localName = "tag")
   @Valid
   private List<@Valid Tag> tags;
@@ -94,7 +89,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   @JacksonXmlProperty(localName = "status")
   private StatusEnum status;
 
@@ -126,6 +120,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -145,6 +140,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -164,6 +160,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -191,6 +188,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -218,6 +216,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -237,6 +236,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
index e841695b5e09..f2c6219aeb89 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/Tag.java
@@ -30,11 +30,9 @@
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
   private Long id;
 
-  @JsonProperty("name")
   @JacksonXmlProperty(localName = "name")
   private String name;
 
@@ -49,6 +47,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -68,6 +67,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
index 5a2a1168ea85..94ac85834347 100644
--- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/model/User.java
@@ -30,35 +30,27 @@
 @Generated(value = "org.openapitools.codegen.languages.JavaCamelServerCodegen")
 public class User {
 
-  @JsonProperty("id")
   @JacksonXmlProperty(localName = "id")
   private Long id;
 
-  @JsonProperty("username")
   @JacksonXmlProperty(localName = "username")
   private String username;
 
-  @JsonProperty("firstName")
   @JacksonXmlProperty(localName = "firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   @JacksonXmlProperty(localName = "lastName")
   private String lastName;
 
-  @JsonProperty("email")
   @JacksonXmlProperty(localName = "email")
   private String email;
 
-  @JsonProperty("password")
   @JacksonXmlProperty(localName = "password")
   private String password;
 
-  @JsonProperty("phone")
   @JacksonXmlProperty(localName = "phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   @JacksonXmlProperty(localName = "userStatus")
   private Integer userStatus;
 
@@ -73,6 +65,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -92,6 +85,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -111,6 +105,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -130,6 +125,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -149,6 +145,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -168,6 +165,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -187,6 +185,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -206,6 +205,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES
index 18561f6ffff9..10f1284050fd 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/.openapi-generator/FILES
@@ -50,6 +50,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
index 66dfa30d774a..d974ae15f0e3 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
@@ -185,6 +186,31 @@ ResponseEntity<String> fakeOuterStringSerialize(
     ) throws Exception;
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @Operation(
+        operationId = "responseObjectDifferentNames",
+        tags = { "pet" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "successful operation", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+    ) throws Exception;
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 0661c1a9a8d6..690bd609d238 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index a3f9c9057892..db5353d2d357 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index db5f8d3ce350..5beed6563d9c 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 66e0aed61c6c..eff5bd5fa4b1 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -28,45 +28,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index ff0d6d7241e1..e3d835a51244 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index cc212be855d8..6cde3b272d22 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 7c74b7de08dd..948a430c814c 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 6087e70dba76..d59141c231c2 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
index 1ecf10efc5c1..51d21426e8f0 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Animal.java
@@ -38,10 +38,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -71,6 +69,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -90,6 +89,7 @@ public Animal color(String color) {
   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 5b6c415bd667..d7f3b9f37fa1 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index 4e84838be3b2..6215ba771a08 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
index f7c9710a1eeb..d53a9e07ad87 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ArrayTest.java
@@ -24,15 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -55,6 +52,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -82,6 +80,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -109,6 +108,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java
index 8c5453c4a5b0..523598886070 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCat.java
@@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -96,6 +95,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java
index 741de9f41a30..bff7b148aa2c 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -77,6 +76,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
index 0c56400050ba..31142a864ec9 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Capitalization.java
@@ -21,22 +21,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -50,6 +44,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -69,6 +64,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -88,6 +84,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -107,6 +104,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -126,6 +124,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -145,6 +144,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java
index a2feece8de89..7fe1ed5d2b83 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Cat.java
@@ -35,7 +35,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -65,6 +64,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java
index 50a9c2cdce9d..0bd8697513ef 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/CatAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -37,6 +36,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
index 7ee1fde06461..745935143d19 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Category.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -54,6 +52,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -73,6 +72,7 @@ public Category name(String name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
index a1942e9c4040..95bad44f6807 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ClassModel.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -36,6 +35,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
index c38b26829beb..c070bc9214b8 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Client.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -35,6 +34,7 @@ public Client client(String client) {
   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 55d205398170..ebcd1eede94e 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -26,19 +26,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -78,6 +74,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -105,6 +102,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -132,6 +130,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -159,6 +158,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java
index 1bb3d6b51028..b339978e5422 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Dog.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -56,6 +55,7 @@ public Dog breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java
index 256925a78410..6b11905f99ac 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/DogAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -37,6 +36,7 @@ public DogAllOf breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
index a96e0290b0b7..3d3280a42dcb 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumArrays.java
@@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -112,6 +110,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -139,6 +138,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
index 6f08d4ee9fb3..e785606f0e12 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/EnumTest.java
@@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -211,6 +206,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -230,6 +226,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -249,6 +246,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -268,6 +266,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -287,6 +286,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
index bf750ccdcb74..7b04101a36a5 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/File.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -36,6 +35,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index dae9b27f93aa..be6e37a7aba9 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
index 06e9dde8e89d..bc4f1de88e68 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/FormatTest.java
@@ -29,48 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -105,6 +91,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -126,6 +113,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -145,6 +133,7 @@ public FormatTest int64(Long int64) {
   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -166,6 +155,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -187,6 +177,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -208,6 +199,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -227,6 +219,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -246,6 +239,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -265,6 +259,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -284,6 +279,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -303,6 +299,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -322,6 +319,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -341,6 +339,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -360,6 +359,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index c218d0e02b83..196214695a19 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -40,6 +38,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -59,6 +58,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
index 74cab2e2f8c6..7215fd65d7a0 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -94,6 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -121,6 +118,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -148,6 +146,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -175,6 +174,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index d6b45daabd78..7dd078dbaa80 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,14 +27,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -49,6 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -68,6 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -95,6 +94,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
index 9ca96d114aae..32198c000f14 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Model200Response.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -41,6 +39,7 @@ public Model200Response name(Integer name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -60,6 +59,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
index 06c806057b50..0a8030385516 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -62,6 +60,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -81,6 +80,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
index f168748f6a20..c2ac56a57a7e 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelList.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -37,6 +36,7 @@ public ModelList _123list(String _123list) {
   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
index 641c56cd81c2..83da161c83f7 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ModelReturn.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -38,6 +37,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
index d6dcb665651a..ed42396e8151 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Name.java
@@ -22,16 +22,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -61,6 +57,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -80,6 +77,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -99,6 +97,7 @@ public Name property(String property) {
   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -118,6 +117,7 @@ public Name _123number(Integer _123number) {
   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
index 4a3b6beffa27..1ec233732c33 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/NumberOnly.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -36,6 +35,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
index 9a5b61bad434..9566edcbed86 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Order.java
@@ -24,16 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -91,6 +85,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -110,6 +105,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -129,6 +125,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -167,6 +165,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -186,6 +185,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
index b66d6d38afb2..6b6115048668 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/OuterComposite.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -42,6 +39,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -61,6 +59,7 @@ public OuterComposite myString(String myString) {
   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -80,6 +79,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
index ba99ad030276..0e76707f06f6 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Pet.java
@@ -29,20 +29,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -114,6 +108,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -133,6 +128,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -152,6 +148,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -226,6 +225,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index 8c43e7e8c307..8891d8dac559 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -38,6 +36,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -57,6 +56,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..c681122f5f86
--- /dev/null
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,155 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
index e0a16a7b89a6..51dfdf9de433 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -37,6 +36,7 @@ public class SpecialModelName {
   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
index 03d5607e29b1..b6dd153652a8 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/Tag.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -38,6 +36,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -57,6 +56,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 12b55e211855..c2217970131c 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -24,19 +24,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
index 8b74b97d38f3..96efe9c2627d 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -24,22 +24,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
index e09df9be7b7c..cf6f92336800 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/User.java
@@ -21,28 +21,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -56,6 +48,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -75,6 +68,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -94,6 +88,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -113,6 +108,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -132,6 +128,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -151,6 +148,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -170,6 +168,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
index 280941921cd9..cf49606e1814 100644
--- a/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledException/src/main/java/org/openapitools/model/XmlItem.java
@@ -24,99 +24,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -131,6 +102,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -150,6 +122,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -169,6 +142,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -188,6 +162,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -215,6 +190,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -234,6 +210,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -253,6 +230,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -272,6 +250,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -291,6 +270,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -318,6 +298,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -345,6 +326,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -364,6 +346,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -383,6 +366,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -402,6 +386,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -421,6 +406,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -448,6 +434,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -475,6 +462,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -494,6 +482,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -513,6 +502,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -532,6 +522,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -551,6 +542,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -578,6 +570,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -605,6 +598,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -624,6 +618,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -643,6 +638,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -662,6 +658,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -681,6 +678,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -708,6 +706,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -735,6 +734,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java
index 6f461bfe6284..b0060f3ed536 100644
--- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java
+++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java
@@ -31,27 +31,21 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ObjectWithUniqueItems {
 
-  @JsonProperty("nullSet")
   @Valid
   private JsonNullable<Set<String>> nullSet = JsonNullable.undefined();
 
-  @JsonProperty("notNullSet")
   @Valid
   private Set<String> notNullSet;
 
-  @JsonProperty("nullList")
   @Valid
   private JsonNullable<List<String>> nullList = JsonNullable.undefined();
 
-  @JsonProperty("notNullList")
   @Valid
   private List<String> notNullList;
 
-  @JsonProperty("notNullDateField")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime notNullDateField;
 
-  @JsonProperty("nullDateField")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime nullDateField;
 
@@ -74,6 +68,7 @@ public ObjectWithUniqueItems addNullSetItem(String nullSetItem) {
   */
   
   @Schema(name = "nullSet", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullSet")
   public JsonNullable<Set<String>> getNullSet() {
     return nullSet;
   }
@@ -101,6 +96,7 @@ public ObjectWithUniqueItems addNotNullSetItem(String notNullSetItem) {
   */
   
   @Schema(name = "notNullSet", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("notNullSet")
   public Set<String> getNotNullSet() {
     return notNullSet;
   }
@@ -129,6 +125,7 @@ public ObjectWithUniqueItems addNullListItem(String nullListItem) {
   */
   
   @Schema(name = "nullList", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullList")
   public JsonNullable<List<String>> getNullList() {
     return nullList;
   }
@@ -156,6 +153,7 @@ public ObjectWithUniqueItems addNotNullListItem(String notNullListItem) {
   */
   
   @Schema(name = "notNullList", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("notNullList")
   public List<String> getNotNullList() {
     return notNullList;
   }
@@ -175,6 +173,7 @@ public ObjectWithUniqueItems notNullDateField(OffsetDateTime notNullDateField) {
   */
   @Valid 
   @Schema(name = "notNullDateField", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("notNullDateField")
   public OffsetDateTime getNotNullDateField() {
     return notNullDateField;
   }
@@ -194,6 +193,7 @@ public ObjectWithUniqueItems nullDateField(OffsetDateTime nullDateField) {
   */
   @Valid 
   @Schema(name = "nullDateField", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullDateField")
   public OffsetDateTime getNullDateField() {
     return nullDateField;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES
index 32921b847d0c..946be0025614 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/.openapi-generator/FILES
@@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
index edf5c41ea0fc..046ebd0a351a 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.annotations.*;
@@ -203,6 +204,44 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiOperation(
+        tags = { "pet" },
+        value = "",
+        nickname = "responseObjectDifferentNames",
+        notes = "",
+        response = ResponseObjectWithDifferentFieldNames.class
+    )
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class)
+    })
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java
index 5ae5d5fed985..9121a3951829 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 32dc0c3fd933..57be2f556f53 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index b030575ce32b..f2e2533ad4a2 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index a0be618b483c..f29e8fdc477c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index ccad3b7842e8..da623886687a 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -25,45 +25,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private Object anytype2 = null;
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -85,6 +74,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -112,6 +102,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -139,6 +130,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -166,6 +158,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -193,6 +186,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -220,6 +214,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -247,6 +242,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -274,6 +270,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -293,6 +290,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -312,6 +310,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public Object getAnytype2() {
     return anytype2;
   }
@@ -331,6 +330,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 0b50eae96233..74f4c62dadf6 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8777da8266d9..cb4c419d891c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 3d723f313ba1..1dd741d8228d 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 8be627cf95e1..1b33552ee8a1 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
index c914c2141a75..cd1675c12743 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Animal.java
@@ -38,10 +38,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -71,6 +69,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -90,6 +89,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index b125422b2130..015b113f1710 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index c596865402f8..6a29ab265a80 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
index c2e98872c520..7ff2226dd74c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ArrayTest.java
@@ -24,15 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -55,6 +52,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -82,6 +80,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -109,6 +108,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
index 5b4fd14d861b..91cd349ca0aa 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java
@@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -96,6 +95,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
index 9eee7b140851..dd11506a9036 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -77,6 +76,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
index f2cd4ce28cfb..96aca57f16f9 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Capitalization.java
@@ -21,22 +21,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -50,6 +44,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -69,6 +64,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -88,6 +84,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -107,6 +104,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -126,6 +124,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -145,6 +144,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
index aeb4370edc37..b1b009f533b2 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Cat.java
@@ -35,7 +35,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -65,6 +64,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
index 649703382e4b..fbde7c3a8dcd 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/CatAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -37,6 +36,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
index e7e940c65fc1..f29b1ee05d31 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Category.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -54,6 +52,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -73,6 +72,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
index 2666fe6a16d3..630599723ec8 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ClassModel.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -36,6 +35,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
index a877f6b3ecc2..12947bfa3d9f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Client.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -35,6 +34,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index 193fbbcab334..862accc3be52 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -23,19 +23,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private List<String> nullableArray;
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private List<String> nullableRequiredArray;
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private List<String> nullableArrayWithDefault = new ArrayList<>(Arrays.asList("foo", "bar"));
 
@@ -75,6 +71,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array")
   public List<String> getNullableArray() {
     return nullableArray;
   }
@@ -102,6 +99,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("nullable_required_array")
   public List<String> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -129,6 +127,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -156,6 +155,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array_with_default")
   public List<String> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
index 4a406912e6f9..d15a20308b55 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Dog.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -56,6 +55,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
index 6e9cc3f76c8f..c1ff31fcefc5 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/DogAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -37,6 +36,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
index ea20037b4f27..36bbc2374aa4 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumArrays.java
@@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -112,6 +110,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -139,6 +138,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
index 3779fa30d64a..7d071f8a81f4 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/EnumTest.java
@@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -211,6 +206,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -230,6 +226,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -249,6 +246,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -268,6 +266,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -287,6 +286,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
index 3206bff29712..19a28937ff00 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/File.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -36,6 +35,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 67bf9c73d2f4..514188584da7 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
index dcbbc7fbde73..b564b8380921 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/FormatTest.java
@@ -29,48 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -105,6 +91,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -126,6 +113,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -145,6 +133,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -166,6 +155,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -187,6 +177,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -208,6 +199,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -227,6 +219,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -246,6 +239,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -265,6 +259,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -284,6 +279,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -303,6 +299,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -322,6 +319,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -341,6 +339,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -360,6 +359,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 36d854ff06c0..aac0264cd7da 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -40,6 +38,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -59,6 +58,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
index 909f43125d0e..70194d82f757 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MapTest.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -94,6 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -121,6 +118,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -148,6 +146,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -175,6 +174,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ae7d7930f7e7..205b8049fefa 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,14 +27,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -49,6 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -68,6 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -95,6 +94,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
index fac227135b94..88fb0a01d340 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Model200Response.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -41,6 +39,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -60,6 +59,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
index 6efe7c8047f7..dd87a3c1b394 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -62,6 +60,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -81,6 +80,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
index dc9eb8ae5255..4705ec66df4c 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelList.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -37,6 +36,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
index 4622b115826f..997950759deb 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ModelReturn.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -38,6 +37,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
index d4d9ed411d9b..c1efbf9ecdba 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Name.java
@@ -22,16 +22,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -61,6 +57,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -80,6 +77,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -99,6 +97,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -118,6 +117,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
index 33fadd6869b4..7c96db2d2c52 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/NumberOnly.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -36,6 +35,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
index 1ce3810c20df..4492c665a86d 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Order.java
@@ -24,16 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -91,6 +85,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -110,6 +105,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -129,6 +125,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -167,6 +165,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -186,6 +185,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
index a590e26b3f1d..10b8a8879a3a 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/OuterComposite.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -42,6 +39,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -61,6 +59,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -80,6 +79,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
index 84968c2299d7..db4b7dab2fc1 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Pet.java
@@ -29,20 +29,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -114,6 +108,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -133,6 +128,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -152,6 +148,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -226,6 +225,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index c09e0076810e..2e16544e4cdc 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -38,6 +36,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -57,6 +56,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..386aaf06884d
--- /dev/null
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,155 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
index 5f1ed55d3d41..25baeb0e45c3 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -37,6 +36,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
index 6ccb99b1e73e..ea0574787c28 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/Tag.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -38,6 +36,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -57,6 +56,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
index ac1c34f7878c..1f070eb65c82 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -24,19 +24,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
index ee14d628a10a..19956d3114db 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -24,22 +24,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
index e5180de1584e..f9546be0278f 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/User.java
@@ -21,28 +21,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -56,6 +48,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -75,6 +68,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -94,6 +88,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -113,6 +108,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -132,6 +128,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -151,6 +148,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -170,6 +168,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
index 9e98a7214bb4..2a7c27a7a47d 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/XmlItem.java
@@ -24,99 +24,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -131,6 +102,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -150,6 +122,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -169,6 +142,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -188,6 +162,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -215,6 +190,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -234,6 +210,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -253,6 +230,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -272,6 +250,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -291,6 +270,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -318,6 +298,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -345,6 +326,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -364,6 +346,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -383,6 +366,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -402,6 +386,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -421,6 +406,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -448,6 +434,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -475,6 +462,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -494,6 +482,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -513,6 +502,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -532,6 +522,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -551,6 +542,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -578,6 +570,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -605,6 +598,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -624,6 +618,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -643,6 +638,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -662,6 +658,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -681,6 +678,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -708,6 +706,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -735,6 +734,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES
index 9ecdb11614b2..d46ab21480e3 100644
--- a/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot-beanvalidation/.openapi-generator/FILES
@@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
index edf5c41ea0fc..046ebd0a351a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.annotations.*;
@@ -203,6 +204,44 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiOperation(
+        tags = { "pet" },
+        value = "",
+        nickname = "responseObjectDifferentNames",
+        notes = "",
+        response = ResponseObjectWithDifferentFieldNames.class
+    )
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class)
+    })
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java
index 5ae5d5fed985..9121a3951829 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 4d0595e38d0f..34712a94057a 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -29,45 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
index d91e6d2ef40a..8a1f3096018e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Animal.java
@@ -39,10 +39,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -72,6 +70,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -91,6 +90,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
index e9a1391ec0de..077f6becae15 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java
@@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -97,6 +96,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
index 35ae937c0009..59ab1d8d2bf8 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -78,6 +77,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
index ebd1416c5bd5..1cf97a016869 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Cat.java
@@ -36,7 +36,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -66,6 +65,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index f513931c7181..5da3d386b4d4 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -27,19 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
index da6c47fcc8bb..159881692803 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Pet.java
@@ -30,20 +30,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -115,6 +109,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -134,6 +129,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -153,6 +149,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -227,6 +226,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..187960e94e4b
--- /dev/null
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,156 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
index 1ee2b748142b..bf67444d3cb7 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7654de1cd322..da676b10f0df 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES
index 05fbaa353e8b..5789fc3c2952 100644
--- a/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot-delegate-j8/.openapi-generator/FILES
@@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
index ae78c71d5303..19557bc37d06 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.annotations.*;
@@ -185,6 +186,34 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiOperation(
+        tags = { "pet" },
+        value = "",
+        nickname = "responseObjectDifferentNames",
+        notes = "",
+        response = ResponseObjectWithDifferentFieldNames.class
+    )
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class)
+    })
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+    ) {
+        return getDelegate().responseObjectDifferentNames(petId);
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java
index 726b17779f18..b88f61719554 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
index d1a650378e63..65ea3c13eae9 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import org.springframework.http.HttpStatus;
@@ -107,6 +108,27 @@ default ResponseEntity<String> fakeOuterStringSerialize(String body) {
 
     }
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     * @see FakeApi#responseObjectDifferentNames
+     */
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(Long petId) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 4d0595e38d0f..34712a94057a 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -29,45 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
index d91e6d2ef40a..8a1f3096018e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Animal.java
@@ -39,10 +39,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -72,6 +70,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -91,6 +90,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
index e9a1391ec0de..077f6becae15 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java
@@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -97,6 +96,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
index 35ae937c0009..59ab1d8d2bf8 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -78,6 +77,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
index ebd1416c5bd5..1cf97a016869 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Cat.java
@@ -36,7 +36,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -66,6 +65,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index f513931c7181..5da3d386b4d4 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -27,19 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
index da6c47fcc8bb..159881692803 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Pet.java
@@ -30,20 +30,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -115,6 +109,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -134,6 +129,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -153,6 +149,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -227,6 +226,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..187960e94e4b
--- /dev/null
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,156 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index 1ee2b748142b..bf67444d3cb7 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7654de1cd322..da676b10f0df 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java
index 909b0aba4e34..4a167e1c112e 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Category.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -40,6 +38,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public Category name(String name) {
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java
index 52fb11fd3cf7..a6a565214984 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -25,13 +25,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -45,6 +42,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -64,6 +62,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -83,6 +82,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java
index 66d9df6dfd95..45802212a9da 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Order.java
@@ -26,16 +26,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -76,10 +72,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -93,6 +87,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -112,6 +107,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -131,6 +127,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -150,6 +147,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -169,6 +167,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -188,6 +187,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
index ce02f3c7d4e4..086df08a3ed0 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Pet.java
@@ -28,20 +28,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -82,7 +77,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -113,6 +107,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -132,6 +127,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -151,6 +147,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -178,6 +175,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -205,6 +203,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -224,6 +223,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java
index b30aa3fd9a2c..b6d3df295734 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/Tag.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -40,6 +38,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -59,6 +58,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java
index 8d71f0fcc040..a5233b08ae5c 100644
--- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/model/User.java
@@ -23,28 +23,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -58,6 +50,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -77,6 +70,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -96,6 +90,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -115,6 +110,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -134,6 +130,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -153,6 +150,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -172,6 +170,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -191,6 +190,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES
index 05fbaa353e8b..5789fc3c2952 100644
--- a/samples/server/petstore/springboot-delegate/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot-delegate/.openapi-generator/FILES
@@ -67,6 +67,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
index ae78c71d5303..19557bc37d06 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.annotations.*;
@@ -185,6 +186,34 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiOperation(
+        tags = { "pet" },
+        value = "",
+        nickname = "responseObjectDifferentNames",
+        notes = "",
+        response = ResponseObjectWithDifferentFieldNames.class
+    )
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class)
+    })
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+    ) {
+        return getDelegate().responseObjectDifferentNames(petId);
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
index 726b17779f18..b88f61719554 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
index d1a650378e63..65ea3c13eae9 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import org.springframework.http.HttpStatus;
@@ -107,6 +108,27 @@ default ResponseEntity<String> fakeOuterStringSerialize(String body) {
 
     }
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     * @see FakeApi#responseObjectDifferentNames
+     */
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(Long petId) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 4d0595e38d0f..34712a94057a 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -29,45 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
index d91e6d2ef40a..8a1f3096018e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Animal.java
@@ -39,10 +39,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -72,6 +70,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -91,6 +90,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
index e9a1391ec0de..077f6becae15 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java
@@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -97,6 +96,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
index 35ae937c0009..59ab1d8d2bf8 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -78,6 +77,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
index ebd1416c5bd5..1cf97a016869 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Cat.java
@@ -36,7 +36,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -66,6 +65,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index f513931c7181..5da3d386b4d4 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -27,19 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
index da6c47fcc8bb..159881692803 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Pet.java
@@ -30,20 +30,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -115,6 +109,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -134,6 +129,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -153,6 +149,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -227,6 +226,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..187960e94e4b
--- /dev/null
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,156 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
index 1ee2b748142b..bf67444d3cb7 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7654de1cd322..da676b10f0df 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java
index 0d2e56dfa3d9..d48f33e470be 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Category.java
@@ -20,10 +20,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Category id(Long id) {
@@ -36,6 +34,7 @@ public Category id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -54,6 +53,7 @@ public Category name(String name) {
    * @return name
   */
   @Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") 
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java
index f66ed8b59413..5376fa62cc31 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -41,6 +38,7 @@ public ModelApiResponse code(Integer code) {
    * @return code
   */
   
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -59,6 +57,7 @@ public ModelApiResponse type(String type) {
    * @return type
   */
   
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -77,6 +76,7 @@ public ModelApiResponse message(String message) {
    * @return message
   */
   
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java
index aafcfc0cc192..ad7ddb217362 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Order.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -73,10 +69,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -89,6 +83,7 @@ public Order id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -107,6 +102,7 @@ public Order petId(Long petId) {
    * @return petId
   */
   
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -125,6 +121,7 @@ public Order quantity(Integer quantity) {
    * @return quantity
   */
   
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -143,6 +140,7 @@ public Order shipDate(OffsetDateTime shipDate) {
    * @return shipDate
   */
   @Valid 
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -161,6 +159,7 @@ public Order status(StatusEnum status) {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -179,6 +178,7 @@ public Order complete(Boolean complete) {
    * @return complete
   */
   
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
index 05bed382e38e..f72251ebac0d 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Pet.java
@@ -25,20 +25,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -79,7 +74,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -109,6 +103,7 @@ public Pet id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -127,6 +122,7 @@ public Pet category(Category category) {
    * @return category
   */
   @Valid 
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -145,6 +141,7 @@ public Pet name(String name) {
    * @return name
   */
   @NotNull 
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -171,6 +168,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
    * @return photoUrls
   */
   @NotNull 
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -197,6 +195,7 @@ public Pet addTagsItem(Tag tagsItem) {
    * @return tags
   */
   @Valid 
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -215,6 +214,7 @@ public Pet status(StatusEnum status) {
    * @return status
   */
   
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java
index 32f55514e089..ae8b17e77928 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/Tag.java
@@ -20,10 +20,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -36,6 +34,7 @@ public Tag id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -54,6 +53,7 @@ public Tag name(String name) {
    * @return name
   */
   
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java
index 16f35830e845..f825d42b636b 100644
--- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/model/User.java
@@ -20,28 +20,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -54,6 +46,7 @@ public User id(Long id) {
    * @return id
   */
   
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -72,6 +65,7 @@ public User username(String username) {
    * @return username
   */
   
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -90,6 +84,7 @@ public User firstName(String firstName) {
    * @return firstName
   */
   
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -108,6 +103,7 @@ public User lastName(String lastName) {
    * @return lastName
   */
   
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -126,6 +122,7 @@ public User email(String email) {
    * @return email
   */
   
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -144,6 +141,7 @@ public User password(String password) {
    * @return password
   */
   
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -162,6 +160,7 @@ public User phone(String phone) {
    * @return phone
   */
   
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -180,6 +179,7 @@ public User userStatus(Integer userStatus) {
    * @return userStatus
   */
   
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES
index 32921b847d0c..946be0025614 100644
--- a/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot-implicitHeaders/.openapi-generator/FILES
@@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
index 46f0bab3f016..de404285b492 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.annotations.*;
@@ -203,6 +204,44 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiOperation(
+        tags = { "pet" },
+        value = "",
+        nickname = "responseObjectDifferentNames",
+        notes = "",
+        response = ResponseObjectWithDifferentFieldNames.class
+    )
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class)
+    })
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
index 5ae5d5fed985..9121a3951829 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 4d0595e38d0f..34712a94057a 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -29,45 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
index d91e6d2ef40a..8a1f3096018e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Animal.java
@@ -39,10 +39,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -72,6 +70,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -91,6 +90,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
index e9a1391ec0de..077f6becae15 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java
@@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -97,6 +96,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
index 35ae937c0009..59ab1d8d2bf8 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -78,6 +77,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
index ebd1416c5bd5..1cf97a016869 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Cat.java
@@ -36,7 +36,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -66,6 +65,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index f513931c7181..5da3d386b4d4 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -27,19 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
index da6c47fcc8bb..159881692803 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Pet.java
@@ -30,20 +30,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -115,6 +109,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -134,6 +129,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -153,6 +149,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -227,6 +226,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..187960e94e4b
--- /dev/null
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,156 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
index 1ee2b748142b..bf67444d3cb7 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7654de1cd322..da676b10f0df 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES
index a38d317b824f..d91ebbece087 100644
--- a/samples/server/petstore/springboot-reactive/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot-reactive/.openapi-generator/FILES
@@ -66,6 +66,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
index 8e2522bda4ea..2dcd1304cba2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -15,6 +15,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.annotations.*;
@@ -195,6 +196,35 @@ default Mono<ResponseEntity<String>> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiOperation(
+        tags = { "pet" },
+        value = "",
+        nickname = "responseObjectDifferentNames",
+        notes = "",
+        response = ResponseObjectWithDifferentFieldNames.class
+    )
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class)
+    })
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default Mono<ResponseEntity<ResponseObjectWithDifferentFieldNames>> responseObjectDifferentNames(
+        @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId,
+        @ApiIgnore final ServerWebExchange exchange
+    ) {
+        return getDelegate().responseObjectDifferentNames(petId, exchange);
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java
index db9b0dff167e..ea2bb6629564 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiController.java
@@ -10,6 +10,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
index db5642bdaa15..1bc0667788a1 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -10,6 +10,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import org.springframework.http.HttpStatus;
@@ -125,6 +126,28 @@ default Mono<ResponseEntity<String>> fakeOuterStringSerialize(Mono<String> body,
 
     }
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     * @see FakeApi#responseObjectDifferentNames
+     */
+    default Mono<ResponseEntity<ResponseObjectWithDifferentFieldNames>> responseObjectDifferentNames(Long petId,
+        ServerWebExchange exchange) {
+        Mono<Void> result = Mono.empty();
+        exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED);
+        for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) {
+            if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                result = ApiUtil.getExampleResponse(exchange, mediaType, exampleString);
+                break;
+            }
+        }
+        return result.then(Mono.empty());
+
+    }
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 4d0595e38d0f..34712a94057a 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -29,45 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
index d91e6d2ef40a..8a1f3096018e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Animal.java
@@ -39,10 +39,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -72,6 +70,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -91,6 +90,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
index e9a1391ec0de..077f6becae15 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java
@@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -97,6 +96,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
index 35ae937c0009..59ab1d8d2bf8 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -78,6 +77,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
index ebd1416c5bd5..1cf97a016869 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Cat.java
@@ -36,7 +36,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -66,6 +65,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index f513931c7181..5da3d386b4d4 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -27,19 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
index da6c47fcc8bb..159881692803 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Pet.java
@@ -30,20 +30,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -115,6 +109,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -134,6 +129,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -153,6 +149,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -227,6 +226,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..187960e94e4b
--- /dev/null
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,156 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
index 1ee2b748142b..bf67444d3cb7 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7654de1cd322..da676b10f0df 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 8bbdc0a24826..8cb85cb8bd5b 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -26,45 +26,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private Object anytype2;
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -86,6 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -113,6 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -140,6 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -167,6 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -194,6 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -221,6 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -248,6 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -275,6 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -294,6 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -313,6 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public Object getAnytype2() {
     return anytype2;
   }
@@ -332,6 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
index aa84943bc684..cd1801f743b0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Animal.java
@@ -37,10 +37,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -70,6 +68,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -89,6 +88,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java
index d89c77e1749d..76e10b9855ae 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Cat.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -57,6 +56,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
index 0e55c9b7873e..5e04a5fe734d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index 80d9ff323092..c4fe1a6869ab 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 546799427252..e8ab08ec2379 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 8bbdc0a24826..8cb85cb8bd5b 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -26,45 +26,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private Object anytype2;
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -86,6 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -113,6 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -140,6 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -167,6 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -194,6 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -221,6 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -248,6 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -275,6 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -294,6 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -313,6 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public Object getAnytype2() {
     return anytype2;
   }
@@ -332,6 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
index aa84943bc684..cd1801f743b0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Animal.java
@@ -37,10 +37,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -70,6 +68,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -89,6 +88,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java
index d89c77e1749d..76e10b9855ae 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Cat.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -57,6 +56,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
index 0e55c9b7873e..5e04a5fe734d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
index 80d9ff323092..c4fe1a6869ab 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 546799427252..e8ab08ec2379 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 8bbdc0a24826..8cb85cb8bd5b 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -26,45 +26,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private Object anytype2;
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -86,6 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -113,6 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -140,6 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -167,6 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -194,6 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -221,6 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -248,6 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -275,6 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -294,6 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -313,6 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public Object getAnytype2() {
     return anytype2;
   }
@@ -332,6 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
index aa84943bc684..cd1801f743b0 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Animal.java
@@ -37,10 +37,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -70,6 +68,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -89,6 +88,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java
index d89c77e1749d..76e10b9855ae 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Cat.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -57,6 +56,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
index 0e55c9b7873e..5e04a5fe734d 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
index 80d9ff323092..c4fe1a6869ab 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 546799427252..e8ab08ec2379 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 8bbdc0a24826..8cb85cb8bd5b 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -26,45 +26,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private Object anytype2;
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -86,6 +75,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -113,6 +103,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -140,6 +131,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -167,6 +159,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -194,6 +187,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -221,6 +215,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -248,6 +243,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -275,6 +271,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -294,6 +291,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -313,6 +311,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public Object getAnytype2() {
     return anytype2;
   }
@@ -332,6 +331,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
index aa84943bc684..cd1801f743b0 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Animal.java
@@ -37,10 +37,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -70,6 +68,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -89,6 +88,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java
index d89c77e1749d..76e10b9855ae 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Cat.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -57,6 +56,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
index 0e55c9b7873e..5e04a5fe734d 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Pet.java
@@ -27,20 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private List<String> photoUrls = new ArrayList<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -81,7 +76,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -112,6 +106,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -131,6 +126,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -150,6 +146,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -177,6 +174,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -204,6 +202,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -223,6 +222,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
index 80d9ff323092..c4fe1a6869ab 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 546799427252..e8ab08ec2379 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES
index 32921b847d0c..946be0025614 100644
--- a/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot-useoptional/.openapi-generator/FILES
@@ -61,6 +61,7 @@ src/main/java/org/openapitools/model/OuterComposite.java
 src/main/java/org/openapitools/model/OuterEnum.java
 src/main/java/org/openapitools/model/Pet.java
 src/main/java/org/openapitools/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/model/SpecialModelName.java
 src/main/java/org/openapitools/model/Tag.java
 src/main/java/org/openapitools/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
index adbc6c1f1e83..a00b75c4c9e1 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 import io.swagger.annotations.*;
@@ -203,6 +204,44 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiOperation(
+        tags = { "pet" },
+        value = "",
+        nickname = "responseObjectDifferentNames",
+        notes = "",
+        response = ResponseObjectWithDifferentFieldNames.class
+    )
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNames.class)
+    })
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java
index 5ae5d5fed985..9121a3951829 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterComposite;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.model.User;
 import org.openapitools.model.XmlItem;
 
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
index 8e4c17989762..686fafb2faaf 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
index 27a8f01607f1..a2c3df24a2df 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
index bc7b87d760a9..82fcada6f56a 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
index 4d0595e38d0f..34712a94057a 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java
@@ -29,45 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -89,6 +78,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -116,6 +106,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -143,6 +134,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -170,6 +162,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -197,6 +190,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -224,6 +218,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -251,6 +246,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -278,6 +274,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -297,6 +294,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -316,6 +314,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -335,6 +334,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
index 00b5174e93b7..ea2ec5365edc 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
index 8fec423ffb1b..4ca4b5a2f509 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -39,6 +38,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
index 67033332b0d6..7b9d8ef0b0b2 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
index 993f83bb2cc1..fdc4baa9de7b 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
index d91e6d2ef40a..8a1f3096018e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java
@@ -39,10 +39,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -72,6 +70,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -91,6 +90,7 @@ public Animal color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
index 450e9b21edf1..91fca22a4579 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
index f2b7f74a6b88..a901b8de3858 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayOfNumberOnly.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -48,6 +47,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
index 7d560306b65a..819eb6062abd 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ArrayTest.java
@@ -25,15 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -56,6 +53,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -83,6 +81,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -110,6 +109,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
index e9a1391ec0de..077f6becae15 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java
@@ -67,7 +67,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -97,6 +96,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
index 35ae937c0009..59ab1d8d2bf8 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCatAllOf.java
@@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -78,6 +77,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
index e9cce9de0115..feb0d643c5e5 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java
@@ -22,22 +22,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -51,6 +45,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -70,6 +65,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -89,6 +85,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -108,6 +105,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -127,6 +125,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -146,6 +145,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
index ebd1416c5bd5..1cf97a016869 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java
@@ -36,7 +36,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -66,6 +65,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
index eed74bea751a..85c6885ae000 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/CatAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
index 77ded60a4715..2bd31570c78d 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -55,6 +53,7 @@ public Category id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -74,6 +73,7 @@ public Category name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
index 69296da7e60e..2c511abe3ecb 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -37,6 +36,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
index b788daea14a3..a6bfdf58db7f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -36,6 +35,7 @@ public Client client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java
index f513931c7181..5da3d386b4d4 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java
@@ -27,19 +27,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -79,6 +75,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -106,6 +103,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -133,6 +131,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -160,6 +159,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
index 6d869993c196..5954daab5360 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -57,6 +56,7 @@ public Dog breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
index 4f275e535333..5784d207b4d2 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/DogAllOf.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOf breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
index f73ffa315292..89bc2c4ed1d8 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java
@@ -60,7 +60,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -98,7 +97,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -113,6 +111,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -140,6 +139,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
index 806094a98300..01bd1c3c986e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
index d82e4902623d..fedeea1c6389 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -37,6 +36,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
index 5bac01151ba3..e1106056505e 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -43,6 +41,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -70,6 +69,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
index b7fd007ab1d0..fee872bd4004 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTest int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
index 224b16d1a2d3..21a424459798 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
index d024c5cc5db0..16d8af2d7f6f 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MapTest.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -64,15 +63,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -95,6 +91,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -122,6 +119,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -149,6 +147,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -176,6 +175,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6ecb96d5e495..075d281eb4bc 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,14 +28,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -50,6 +47,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -69,6 +67,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -96,6 +95,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
index 36dfd34883e8..193231f85457 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -42,6 +40,7 @@ public Model200Response name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
index dfba6cb672d4..693e1669879c 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -44,6 +41,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ModelApiResponse type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ModelApiResponse message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
index 97ddf5359aa0..7853f3d408a0 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -38,6 +37,7 @@ public ModelList _123list(String _123list) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
index 4505ddfeeeca..b6f106cea222 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -39,6 +38,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
index cc8f667dbf05..53e568199f4d 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java
@@ -23,16 +23,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -62,6 +58,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -81,6 +78,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -100,6 +98,7 @@ public Name property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -119,6 +118,7 @@ public Name _123number(Integer _123number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
index 278146bfb899..1e3f9e15421d 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -37,6 +36,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
index 9a9ed4f6c960..b24c70c07808 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -75,10 +71,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -92,6 +86,7 @@ public Order id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -111,6 +106,7 @@ public Order petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -130,6 +126,7 @@ public Order quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -149,6 +146,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -168,6 +166,7 @@ public Order status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -187,6 +186,7 @@ public Order complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
index c1a709bb26ad..ade2b9150190 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -43,6 +40,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -62,6 +60,7 @@ public OuterComposite myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -81,6 +80,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
index da6c47fcc8bb..159881692803 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java
@@ -30,20 +30,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -84,7 +79,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -115,6 +109,7 @@ public Pet id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -134,6 +129,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -153,6 +149,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -180,6 +177,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -208,6 +206,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -227,6 +226,7 @@ public Pet status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
index b7a0a416782e..3eb0ebe069c1 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -39,6 +37,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -58,6 +57,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..187960e94e4b
--- /dev/null
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,156 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
index 1ee2b748142b..bf67444d3cb7 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelName {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
index 6161be4a9229..527e777278e2 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java
@@ -22,10 +22,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -39,6 +37,7 @@ public Tag id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -58,6 +57,7 @@ public Tag name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
index 7654de1cd322..da676b10f0df 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderDefault.java
@@ -25,19 +25,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -72,6 +67,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -91,6 +87,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -110,6 +107,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -129,6 +127,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -156,6 +155,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
index da3cb34f1e7b..bbc653f248a2 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/TypeHolderExample.java
@@ -25,22 +25,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -76,6 +70,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -95,6 +90,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -114,6 +110,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -133,6 +130,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -152,6 +150,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -179,6 +178,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
index ec85459bc99a..36d29ba307d0 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java
@@ -22,28 +22,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -57,6 +49,7 @@ public User id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +69,7 @@ public User username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -95,6 +89,7 @@ public User firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -114,6 +109,7 @@ public User lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -133,6 +129,7 @@ public User email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -152,6 +149,7 @@ public User password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -171,6 +169,7 @@ public User phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -190,6 +189,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
index 475d6fe9ec1e..58405cbb4863 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
+++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java
@@ -25,99 +25,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -132,6 +103,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -151,6 +123,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -170,6 +143,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -189,6 +163,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -216,6 +191,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -235,6 +211,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -254,6 +231,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -273,6 +251,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -292,6 +271,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -319,6 +299,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -346,6 +327,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -365,6 +347,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -384,6 +367,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -403,6 +387,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -422,6 +407,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -449,6 +435,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -476,6 +463,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -495,6 +483,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -514,6 +503,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -533,6 +523,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -552,6 +543,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -579,6 +571,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -606,6 +599,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -625,6 +619,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -644,6 +639,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -663,6 +659,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -682,6 +679,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -709,6 +707,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -736,6 +735,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES
index 2f1080a41502..8ba55df4658b 100644
--- a/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot-virtualan/.openapi-generator/FILES
@@ -61,6 +61,7 @@ src/main/java/org/openapitools/virtualan/model/OuterComposite.java
 src/main/java/org/openapitools/virtualan/model/OuterEnum.java
 src/main/java/org/openapitools/virtualan/model/Pet.java
 src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java
 src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
 src/main/java/org/openapitools/virtualan/model/Tag.java
 src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
index a902146a5f89..6ec4a6867acc 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java
@@ -14,6 +14,7 @@
 import org.openapitools.virtualan.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.virtualan.model.OuterComposite;
+import org.openapitools.virtualan.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.virtualan.model.User;
 import org.openapitools.virtualan.model.XmlItem;
 import io.swagger.v3.oas.annotations.ExternalDocumentation;
@@ -221,6 +222,44 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiVirtual
+    @Operation(
+        operationId = "responseObjectDifferentNames",
+        tags = { "pet" },
+        responses = {
+            @ApiResponse(responseCode = "200", description = "successful operation", content = {
+                @Content(mediaType = "application/json", schema = @Schema(implementation = ResponseObjectWithDifferentFieldNames.class))
+            })
+        }
+    )
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNames> responseObjectDifferentNames(
+        @Parameter(name = "petId", description = "ID of pet to update", required = true, in = ParameterIn.PATH) @PathVariable("petId") Long petId
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java
index d33842e20df7..6745966de43f 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import org.openapitools.virtualan.model.ModelApiResponse;
 import java.time.OffsetDateTime;
 import org.openapitools.virtualan.model.OuterComposite;
+import org.openapitools.virtualan.model.ResponseObjectWithDifferentFieldNames;
 import org.openapitools.virtualan.model.User;
 import org.openapitools.virtualan.model.XmlItem;
 
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
index 9f4aa42c8514..206db52a72f8 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesAnyType.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyType name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesAnyType name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
index a17c327fe247..1ccea4df28cf 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesArray.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArray extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArray name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesArray name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
index d1c746ffd00e..2343eb8798eb 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesBoolean.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBoolean name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesBoolean name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
index 170518a544d4..daa9ffe49c65 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java
@@ -28,45 +28,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClass {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
@@ -88,6 +77,7 @@ public AdditionalPropertiesClass putMapStringItem(String key, String mapStringIt
   */
   
   @Schema(name = "map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -115,6 +105,7 @@ public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumb
   */
   @Valid 
   @Schema(name = "map_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -142,6 +133,7 @@ public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntege
   */
   
   @Schema(name = "map_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -169,6 +161,7 @@ public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBoolea
   */
   
   @Schema(name = "map_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -196,6 +189,7 @@ public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer
   */
   @Valid 
   @Schema(name = "map_array_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -223,6 +217,7 @@ public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object>
   */
   @Valid 
   @Schema(name = "map_array_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -250,6 +245,7 @@ public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, Str
   */
   @Valid 
   @Schema(name = "map_map_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -277,6 +273,7 @@ public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Ob
   */
   @Valid 
   @Schema(name = "map_map_anytype", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -296,6 +293,7 @@ public AdditionalPropertiesClass anytype1(Object anytype1) {
   */
   
   @Schema(name = "anytype_1", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -315,6 +313,7 @@ public AdditionalPropertiesClass anytype2(Object anytype2) {
   */
   
   @Schema(name = "anytype_2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -334,6 +333,7 @@ public AdditionalPropertiesClass anytype3(Object anytype3) {
   */
   
   @Schema(name = "anytype_3", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
index b1ae91765bf9..4913c13bad43 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesInteger.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesInteger name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesInteger name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
index c5fea24d469d..1290ec6536eb 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesNumber.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumber name(String name) {
@@ -38,6 +37,7 @@ public AdditionalPropertiesNumber name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
index 068cdeda3b06..fab88cc6ac04 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesObject.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObject extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObject name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesObject name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
index e351a15df69d..592acfa0695d 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesString.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesString extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesString name(String name) {
@@ -37,6 +36,7 @@ public AdditionalPropertiesString name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
index e28dd10f0a7e..1ee0306572c0 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Animal.java
@@ -38,10 +38,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Animal {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -71,6 +69,7 @@ public Animal className(String className) {
   */
   @NotNull 
   @Schema(name = "className", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -90,6 +89,7 @@ public Animal color(String color) {
   */
   
   @Schema(name = "color", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
index e7ecfb0b7cd5..5afe4f0000dd 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnly {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayAr
   */
   @Valid 
   @Schema(name = "ArrayArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
index a75a6fd0f92f..35b81ceeef61 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayOfNumberOnly.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnly {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -47,6 +46,7 @@ public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @Schema(name = "ArrayNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
index 8f2b06deddbd..6004ba642eca 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ArrayTest.java
@@ -24,15 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTest {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirst>> arrayArrayOfModel;
 
@@ -55,6 +52,7 @@ public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @Schema(name = "array_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -82,6 +80,7 @@ public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem)
   */
   @Valid 
   @Schema(name = "array_array_of_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -109,6 +108,7 @@ public ArrayTest addArrayArrayOfModelItem(List<@Valid ReadOnlyFirst> arrayArrayO
   */
   @Valid 
   @Schema(name = "array_array_of_model", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
index bb4792650589..ea6751c1f758 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java
@@ -66,7 +66,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -96,6 +95,7 @@ public BigCat kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
index b3f40bf8215c..daf0315ddcb6 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCatAllOf.java
@@ -63,7 +63,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOf kind(KindEnum kind) {
@@ -77,6 +76,7 @@ public BigCatAllOf kind(KindEnum kind) {
   */
   
   @Schema(name = "kind", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
index ac66aa43baa7..a7458d3ebf5b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Capitalization.java
@@ -21,22 +21,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Capitalization {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public Capitalization smallCamel(String smallCamel) {
@@ -50,6 +44,7 @@ public Capitalization smallCamel(String smallCamel) {
   */
   
   @Schema(name = "smallCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -69,6 +64,7 @@ public Capitalization capitalCamel(String capitalCamel) {
   */
   
   @Schema(name = "CapitalCamel", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -88,6 +84,7 @@ public Capitalization smallSnake(String smallSnake) {
   */
   
   @Schema(name = "small_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -107,6 +104,7 @@ public Capitalization capitalSnake(String capitalSnake) {
   */
   
   @Schema(name = "Capital_Snake", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -126,6 +124,7 @@ public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @Schema(name = "SCA_ETH_Flow_Points", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -145,6 +144,7 @@ public Capitalization ATT_NAME(String ATT_NAME) {
   */
   
   @Schema(name = "ATT_NAME", description = "Name of the pet ", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
index 163822a26564..f1d2c5c97e9d 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Cat.java
@@ -35,7 +35,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Cat extends Animal {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -65,6 +64,7 @@ public Cat declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
index e8e73cc0c283..6959f4c07e54 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/CatAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOf {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOf declawed(Boolean declawed) {
@@ -37,6 +36,7 @@ public CatAllOf declawed(Boolean declawed) {
   */
   
   @Schema(name = "declawed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
index f781ae5574ce..061086c3c3f4 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Category.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Category {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -54,6 +52,7 @@ public Category id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -73,6 +72,7 @@ public Category name(String name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
index d3c9c803ec3d..33d10d79839a 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ClassModel.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModel {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModel propertyClass(String propertyClass) {
@@ -36,6 +35,7 @@ public ClassModel propertyClass(String propertyClass) {
   */
   
   @Schema(name = "_class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
index 7aa7dd5ee0ce..415ad50e2c88 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Client.java
@@ -21,7 +21,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Client {
 
-  @JsonProperty("client")
   private String client;
 
   public Client client(String client) {
@@ -35,6 +34,7 @@ public Client client(String client) {
   */
   
   @Schema(name = "client", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java
index ed71e7bf9a4c..9787053cbe38 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java
@@ -26,19 +26,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValue {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -78,6 +74,7 @@ public ContainerDefaultValue addNullableArrayItem(String nullableArrayItem) {
   */
   
   @Schema(name = "nullable_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -105,6 +102,7 @@ public ContainerDefaultValue addNullableRequiredArrayItem(String nullableRequire
   */
   @NotNull 
   @Schema(name = "nullable_required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -132,6 +130,7 @@ public ContainerDefaultValue addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @Schema(name = "required_array", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -159,6 +158,7 @@ public ContainerDefaultValue addNullableArrayWithDefaultItem(String nullableArra
   */
   
   @Schema(name = "nullable_array_with_default", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
index 1ae16f68d796..bf856e987055 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Dog.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Dog extends Animal {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -56,6 +55,7 @@ public Dog breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
index 0e8f816aa4f0..92fd0a1003a5 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/DogAllOf.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOf {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOf breed(String breed) {
@@ -37,6 +36,7 @@ public DogAllOf breed(String breed) {
   */
   
   @Schema(name = "breed", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
index f12f8bd05286..3231c81446e4 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumArrays.java
@@ -59,7 +59,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -97,7 +96,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -112,6 +110,7 @@ public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @Schema(name = "just_symbol", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -139,6 +138,7 @@ public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @Schema(name = "array_enum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
index a9557c84a908..33431bc6b3be 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/EnumTest.java
@@ -62,7 +62,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -102,7 +101,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -140,7 +138,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -178,10 +175,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnum outerEnum;
 
   /**
@@ -211,6 +206,7 @@ public EnumTest enumString(EnumStringEnum enumString) {
   */
   
   @Schema(name = "enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -230,6 +226,7 @@ public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
   */
   @NotNull 
   @Schema(name = "enum_string_required", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -249,6 +246,7 @@ public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @Schema(name = "enum_integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -268,6 +266,7 @@ public EnumTest enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @Schema(name = "enum_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -287,6 +286,7 @@ public EnumTest outerEnum(OuterEnum outerEnum) {
   */
   @Valid 
   @Schema(name = "outerEnum", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("outerEnum")
   public OuterEnum getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
index b98a0b9589ed..90ae951c28cf 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/File.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class File {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public File sourceURI(String sourceURI) {
@@ -36,6 +35,7 @@ public File sourceURI(String sourceURI) {
   */
   
   @Schema(name = "sourceURI", description = "Test capitalization", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
index 37db6d702e05..26c11a8e86b9 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FileSchemaTestClass.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClass {
 
-  @JsonProperty("file")
   private File file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid File> files;
 
@@ -42,6 +40,7 @@ public FileSchemaTestClass file(File file) {
   */
   @Valid 
   @Schema(name = "file", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("file")
   public File getFile() {
     return file;
   }
@@ -69,6 +68,7 @@ public FileSchemaTestClass addFilesItem(File filesItem) {
   */
   @Valid 
   @Schema(name = "files", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("files")
   public List<@Valid File> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
index e4ad2be91770..f2cc31357aa6 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/FormatTest.java
@@ -29,48 +29,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTest {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -105,6 +91,7 @@ public FormatTest integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -126,6 +113,7 @@ public FormatTest int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @Schema(name = "int32", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -145,6 +133,7 @@ public FormatTest int64(Long int64) {
   */
   
   @Schema(name = "int64", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -166,6 +155,7 @@ public FormatTest number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @Schema(name = "number", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -187,6 +177,7 @@ public FormatTest _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @Schema(name = "float", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -208,6 +199,7 @@ public FormatTest _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @Schema(name = "double", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -227,6 +219,7 @@ public FormatTest string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -246,6 +239,7 @@ public FormatTest _byte(byte[] _byte) {
   */
   @NotNull 
   @Schema(name = "byte", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -265,6 +259,7 @@ public FormatTest binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @Schema(name = "binary", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -284,6 +279,7 @@ public FormatTest date(LocalDate date) {
   */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -303,6 +299,7 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -322,6 +319,7 @@ public FormatTest uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -341,6 +339,7 @@ public FormatTest password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @Schema(name = "password", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -360,6 +359,7 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
index cf9c6e9d27e4..a359abf6d616 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/HasOnlyReadOnly.java
@@ -23,10 +23,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnly {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnly bar(String bar) {
@@ -40,6 +38,7 @@ public HasOnlyReadOnly bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -59,6 +58,7 @@ public HasOnlyReadOnly foo(String foo) {
   */
   
   @Schema(name = "foo", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
index 9f6f0f6c5899..a14b03430446 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MapTest.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTest {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -63,15 +62,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -94,6 +90,7 @@ public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStr
   */
   @Valid 
   @Schema(name = "map_map_of_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -121,6 +118,7 @@ public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem)
   */
   
   @Schema(name = "map_of_enum_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -148,6 +146,7 @@ public MapTest putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @Schema(name = "direct_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -175,6 +174,7 @@ public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @Schema(name = "indirect_map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 247cf3cae21b..2165294c3be5 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -27,14 +27,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, Animal> map = new HashMap<>();
 
@@ -49,6 +46,7 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -68,6 +66,7 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -95,6 +94,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("map")
   public Map<String, Animal> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
index 3cbf29bb8ae9..3e96c3c5eb58 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Model200Response.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200Response {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200Response name(Integer name) {
@@ -41,6 +39,7 @@ public Model200Response name(Integer name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -60,6 +59,7 @@ public Model200Response propertyClass(String propertyClass) {
   */
   
   @Schema(name = "class", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
index c4c57e9b55ad..1dafc875a738 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelApiResponse.java
@@ -23,13 +23,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelApiResponse {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ModelApiResponse code(Integer code) {
@@ -43,6 +40,7 @@ public ModelApiResponse code(Integer code) {
   */
   
   @Schema(name = "code", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -62,6 +60,7 @@ public ModelApiResponse type(String type) {
   */
   
   @Schema(name = "type", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -81,6 +80,7 @@ public ModelApiResponse message(String message) {
   */
   
   @Schema(name = "message", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
index 4c9f7b965f0c..b2d5036185c7 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelList.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelList {
 
-  @JsonProperty("123-list")
   private String _123list;
 
   public ModelList _123list(String _123list) {
@@ -37,6 +36,7 @@ public ModelList _123list(String _123list) {
   */
   
   @Schema(name = "123-list", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123-list")
   public String get123list() {
     return _123list;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
index 4f7b1d6a7078..748bb9666efe 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ModelReturn.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ModelReturn {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ModelReturn _return(Integer _return) {
@@ -38,6 +37,7 @@ public ModelReturn _return(Integer _return) {
   */
   
   @Schema(name = "return", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
index c765c47d4623..f00cb75ddc77 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Name.java
@@ -22,16 +22,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Name {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123number;
 
   /**
@@ -61,6 +57,7 @@ public Name name(Integer name) {
   */
   @NotNull 
   @Schema(name = "name", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -80,6 +77,7 @@ public Name snakeCase(Integer snakeCase) {
   */
   
   @Schema(name = "snake_case", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -99,6 +97,7 @@ public Name property(String property) {
   */
   
   @Schema(name = "property", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -118,6 +117,7 @@ public Name _123number(Integer _123number) {
   */
   
   @Schema(name = "123Number", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("123Number")
   public Integer get123number() {
     return _123number;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
index fa289a07a107..8a64f4c3b974 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NumberOnly.java
@@ -22,7 +22,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnly {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnly justNumber(BigDecimal justNumber) {
@@ -36,6 +35,7 @@ public NumberOnly justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @Schema(name = "JustNumber", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
index 6d2bc0009434..5d1e4d7d9dd7 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Order.java
@@ -24,16 +24,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Order {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -74,10 +70,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public Order id(Long id) {
@@ -91,6 +85,7 @@ public Order id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -110,6 +105,7 @@ public Order petId(Long petId) {
   */
   
   @Schema(name = "petId", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -129,6 +125,7 @@ public Order quantity(Integer quantity) {
   */
   
   @Schema(name = "quantity", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -148,6 +145,7 @@ public Order shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @Schema(name = "shipDate", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -167,6 +165,7 @@ public Order status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "Order Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -186,6 +185,7 @@ public Order complete(Boolean complete) {
   */
   
   @Schema(name = "complete", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
index 53b0591789c7..fdc4d2d3a677 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/OuterComposite.java
@@ -22,13 +22,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterComposite {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterComposite myNumber(BigDecimal myNumber) {
@@ -42,6 +39,7 @@ public OuterComposite myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @Schema(name = "my_number", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -61,6 +59,7 @@ public OuterComposite myString(String myString) {
   */
   
   @Schema(name = "my_string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -80,6 +79,7 @@ public OuterComposite myBoolean(Boolean myBoolean) {
   */
   
   @Schema(name = "my_boolean", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
index a6e1d1a95731..92c95332cbdd 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Pet.java
@@ -29,20 +29,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Pet {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private Category category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid Tag> tags;
 
@@ -83,7 +78,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -114,6 +108,7 @@ public Pet id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -133,6 +128,7 @@ public Pet category(Category category) {
   */
   @Valid 
   @Schema(name = "category", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("category")
   public Category getCategory() {
     return category;
   }
@@ -152,6 +148,7 @@ public Pet name(String name) {
   */
   @NotNull 
   @Schema(name = "name", example = "doggie", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -179,6 +176,7 @@ public Pet addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @Schema(name = "photoUrls", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -207,6 +205,7 @@ public Pet addTagsItem(Tag tagsItem) {
   */
   @Valid 
   @Schema(name = "tags", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("tags")
   public List<@Valid Tag> getTags() {
     return tags;
   }
@@ -226,6 +225,7 @@ public Pet status(StatusEnum status) {
   */
   
   @Schema(name = "status", description = "pet status in the store", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
index ab46b7db4cd8..7609052eca33 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ReadOnlyFirst.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirst {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirst bar(String bar) {
@@ -38,6 +36,7 @@ public ReadOnlyFirst bar(String bar) {
   */
   
   @Schema(name = "bar", accessMode = Schema.AccessMode.READ_ONLY, requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -57,6 +56,7 @@ public ReadOnlyFirst baz(String baz) {
   */
   
   @Schema(name = "baz", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java
new file mode 100644
index 000000000000..390bd1ee9e49
--- /dev/null
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ResponseObjectWithDifferentFieldNames.java
@@ -0,0 +1,155 @@
+package org.openapitools.virtualan.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNames
+ */
+
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNames {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @Schema(name = "normalPropertyName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @Schema(name = "UPPER_CASE_PROPERTY_SNAKE", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @Schema(name = "lower-case-property-dashes", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @Schema(name = "property name with spaces", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNames responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNames) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNames {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
index 02f421df163a..79e507fccc34 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/SpecialModelName.java
@@ -23,7 +23,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelName {
 
-  @JsonProperty("$special[property.name]")
   private Long $specialPropertyName;
 
   public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
@@ -37,6 +36,7 @@ public class SpecialModelName {
   */
   
   @Schema(name = "$special[property.name]", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
index 1924be7de113..2c284e36e4ff 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/Tag.java
@@ -21,10 +21,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Tag {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public Tag id(Long id) {
@@ -38,6 +36,7 @@ public Tag id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -57,6 +56,7 @@ public Tag name(String name) {
   */
   
   @Schema(name = "name", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
index 0fd5ba6fa7b1..0deae5af294e 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderDefault.java
@@ -24,19 +24,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefault {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -71,6 +66,7 @@ public TypeHolderDefault stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -90,6 +86,7 @@ public TypeHolderDefault numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -109,6 +106,7 @@ public TypeHolderDefault integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -128,6 +126,7 @@ public TypeHolderDefault boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -155,6 +154,7 @@ public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
index 21d9337da769..9c37a6348092 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/TypeHolderExample.java
@@ -24,22 +24,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExample {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -75,6 +69,7 @@ public TypeHolderExample stringItem(String stringItem) {
   */
   @NotNull 
   @Schema(name = "string_item", example = "what", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -94,6 +89,7 @@ public TypeHolderExample numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @Schema(name = "number_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -113,6 +109,7 @@ public TypeHolderExample floatItem(Float floatItem) {
   */
   @NotNull 
   @Schema(name = "float_item", example = "1.234", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -132,6 +129,7 @@ public TypeHolderExample integerItem(Integer integerItem) {
   */
   @NotNull 
   @Schema(name = "integer_item", example = "-2", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -151,6 +149,7 @@ public TypeHolderExample boolItem(Boolean boolItem) {
   */
   @NotNull 
   @Schema(name = "bool_item", example = "true", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -178,6 +177,7 @@ public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @Schema(name = "array_item", example = "[0,1,2,3]", requiredMode = Schema.RequiredMode.REQUIRED)
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
index 3a2458136cb9..319d6d960ca3 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/User.java
@@ -21,28 +21,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class User {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public User id(Long id) {
@@ -56,6 +48,7 @@ public User id(Long id) {
   */
   
   @Schema(name = "id", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -75,6 +68,7 @@ public User username(String username) {
   */
   
   @Schema(name = "username", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -94,6 +88,7 @@ public User firstName(String firstName) {
   */
   
   @Schema(name = "firstName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -113,6 +108,7 @@ public User lastName(String lastName) {
   */
   
   @Schema(name = "lastName", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -132,6 +128,7 @@ public User email(String email) {
   */
   
   @Schema(name = "email", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -151,6 +148,7 @@ public User password(String password) {
   */
   
   @Schema(name = "password", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -170,6 +168,7 @@ public User phone(String phone) {
   */
   
   @Schema(name = "phone", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -189,6 +188,7 @@ public User userStatus(Integer userStatus) {
   */
   
   @Schema(name = "userStatus", description = "User Status", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
index 84f991273fe0..77160243ee2b 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
+++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/XmlItem.java
@@ -24,99 +24,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItem {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -131,6 +102,7 @@ public XmlItem attributeString(String attributeString) {
   */
   
   @Schema(name = "attribute_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -150,6 +122,7 @@ public XmlItem attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @Schema(name = "attribute_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -169,6 +142,7 @@ public XmlItem attributeInteger(Integer attributeInteger) {
   */
   
   @Schema(name = "attribute_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -188,6 +162,7 @@ public XmlItem attributeBoolean(Boolean attributeBoolean) {
   */
   
   @Schema(name = "attribute_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -215,6 +190,7 @@ public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @Schema(name = "wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -234,6 +210,7 @@ public XmlItem nameString(String nameString) {
   */
   
   @Schema(name = "name_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -253,6 +230,7 @@ public XmlItem nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @Schema(name = "name_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -272,6 +250,7 @@ public XmlItem nameInteger(Integer nameInteger) {
   */
   
   @Schema(name = "name_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -291,6 +270,7 @@ public XmlItem nameBoolean(Boolean nameBoolean) {
   */
   
   @Schema(name = "name_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -318,6 +298,7 @@ public XmlItem addNameArrayItem(Integer nameArrayItem) {
   */
   
   @Schema(name = "name_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -345,6 +326,7 @@ public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @Schema(name = "name_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -364,6 +346,7 @@ public XmlItem prefixString(String prefixString) {
   */
   
   @Schema(name = "prefix_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -383,6 +366,7 @@ public XmlItem prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @Schema(name = "prefix_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -402,6 +386,7 @@ public XmlItem prefixInteger(Integer prefixInteger) {
   */
   
   @Schema(name = "prefix_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -421,6 +406,7 @@ public XmlItem prefixBoolean(Boolean prefixBoolean) {
   */
   
   @Schema(name = "prefix_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -448,6 +434,7 @@ public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @Schema(name = "prefix_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -475,6 +462,7 @@ public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -494,6 +482,7 @@ public XmlItem namespaceString(String namespaceString) {
   */
   
   @Schema(name = "namespace_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -513,6 +502,7 @@ public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @Schema(name = "namespace_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -532,6 +522,7 @@ public XmlItem namespaceInteger(Integer namespaceInteger) {
   */
   
   @Schema(name = "namespace_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -551,6 +542,7 @@ public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @Schema(name = "namespace_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -578,6 +570,7 @@ public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @Schema(name = "namespace_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -605,6 +598,7 @@ public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
   */
   
   @Schema(name = "namespace_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -624,6 +618,7 @@ public XmlItem prefixNsString(String prefixNsString) {
   */
   
   @Schema(name = "prefix_ns_string", example = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -643,6 +638,7 @@ public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @Schema(name = "prefix_ns_number", example = "1.234", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -662,6 +658,7 @@ public XmlItem prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @Schema(name = "prefix_ns_integer", example = "-2", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -681,6 +678,7 @@ public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @Schema(name = "prefix_ns_boolean", example = "true", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -708,6 +706,7 @@ public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @Schema(name = "prefix_ns_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -735,6 +734,7 @@ public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
   */
   
   @Schema(name = "prefix_ns_wrapped_array", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml
index 1fa32524cf2f..260abafd6eaa 100644
--- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2114,6 +2139,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name:
diff --git a/samples/server/petstore/springboot/.openapi-generator/FILES b/samples/server/petstore/springboot/.openapi-generator/FILES
index ed149e7e75b9..1a5080e64349 100644
--- a/samples/server/petstore/springboot/.openapi-generator/FILES
+++ b/samples/server/petstore/springboot/.openapi-generator/FILES
@@ -60,6 +60,7 @@ src/main/java/org/openapitools/model/OuterCompositeDto.java
 src/main/java/org/openapitools/model/OuterEnumDto.java
 src/main/java/org/openapitools/model/PetDto.java
 src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
+src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
 src/main/java/org/openapitools/model/ReturnDto.java
 src/main/java/org/openapitools/model/SpecialModelNameDto.java
 src/main/java/org/openapitools/model/TagDto.java
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
index d169863b1042..49c9d624f080 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java
@@ -14,6 +14,7 @@
 import java.util.Map;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterCompositeDto;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto;
 import org.openapitools.model.UserDto;
 import org.openapitools.model.XmlItemDto;
 import io.swagger.annotations.*;
@@ -203,6 +204,44 @@ default ResponseEntity<String> fakeOuterStringSerialize(
     }
 
 
+    /**
+     * GET /fake/{petId}/response-object-different-names
+     *
+     * @param petId ID of pet to update (required)
+     * @return successful operation (status code 200)
+     */
+    @ApiOperation(
+        tags = { "pet" },
+        value = "",
+        nickname = "responseObjectDifferentNames",
+        notes = "",
+        response = ResponseObjectWithDifferentFieldNamesDto.class
+    )
+    @ApiResponses({
+        @ApiResponse(code = 200, message = "successful operation", response = ResponseObjectWithDifferentFieldNamesDto.class)
+    })
+    @RequestMapping(
+        method = RequestMethod.GET,
+        value = "/fake/{petId}/response-object-different-names",
+        produces = { "application/json" }
+    )
+    default ResponseEntity<ResponseObjectWithDifferentFieldNamesDto> responseObjectDifferentNames(
+        @ApiParam(value = "ID of pet to update", required = true) @PathVariable("petId") Long petId
+    ) {
+        getRequest().ifPresent(request -> {
+            for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) {
+                if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) {
+                    String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }";
+                    ApiUtil.setExampleResponse(request, "application/json", exampleString);
+                    break;
+                }
+            }
+        });
+        return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
+
+    }
+
+
     /**
      * PUT /fake/body-with-file-schema
      * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java
index 832b3bbf29fb..ad3ca0f55b62 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApiController.java
@@ -9,6 +9,7 @@
 import java.util.Map;
 import java.time.OffsetDateTime;
 import org.openapitools.model.OuterCompositeDto;
+import org.openapitools.model.ResponseObjectWithDifferentFieldNamesDto;
 import org.openapitools.model.UserDto;
 import org.openapitools.model.XmlItemDto;
 
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
index 4ae78f07714e..a6ba7205ba72 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesAnyTypeDto.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesAnyTypeDto extends HashMap<String, Object> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesAnyTypeDto name(String name) {
@@ -40,6 +39,7 @@ public AdditionalPropertiesAnyTypeDto name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
index f3a031c68b56..2d3046d21528 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesArrayDto.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesArrayDto extends HashMap<String, List> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesArrayDto name(String name) {
@@ -41,6 +40,7 @@ public AdditionalPropertiesArrayDto name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
index e58c2612b57b..48df16e5b138 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesBooleanDto.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesBooleanDto extends HashMap<String, Boolean> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesBooleanDto name(String name) {
@@ -40,6 +39,7 @@ public AdditionalPropertiesBooleanDto name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
index fda780a36c33..cce9f53867ef 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java
@@ -31,45 +31,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesClassDto {
 
-  @JsonProperty("map_string")
   @Valid
   private Map<String, String> mapString = new HashMap<>();
 
-  @JsonProperty("map_number")
   @Valid
   private Map<String, BigDecimal> mapNumber = new HashMap<>();
 
-  @JsonProperty("map_integer")
   @Valid
   private Map<String, Integer> mapInteger = new HashMap<>();
 
-  @JsonProperty("map_boolean")
   @Valid
   private Map<String, Boolean> mapBoolean = new HashMap<>();
 
-  @JsonProperty("map_array_integer")
   @Valid
   private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
 
-  @JsonProperty("map_array_anytype")
   @Valid
   private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
 
-  @JsonProperty("map_map_string")
   @Valid
   private Map<String, Map<String, String>> mapMapString = new HashMap<>();
 
-  @JsonProperty("map_map_anytype")
   @Valid
   private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
 
-  @JsonProperty("anytype_1")
   private Object anytype1;
 
-  @JsonProperty("anytype_2")
   private JsonNullable<Object> anytype2 = JsonNullable.undefined();
 
-  @JsonProperty("anytype_3")
   private Object anytype3;
 
   public AdditionalPropertiesClassDto mapString(Map<String, String> mapString) {
@@ -91,6 +80,7 @@ public AdditionalPropertiesClassDto putMapStringItem(String key, String mapStrin
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_string")
   public Map<String, String> getMapString() {
     return mapString;
   }
@@ -118,6 +108,7 @@ public AdditionalPropertiesClassDto putMapNumberItem(String key, BigDecimal mapN
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_number")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
   }
@@ -145,6 +136,7 @@ public AdditionalPropertiesClassDto putMapIntegerItem(String key, Integer mapInt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_integer")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
   }
@@ -172,6 +164,7 @@ public AdditionalPropertiesClassDto putMapBooleanItem(String key, Boolean mapBoo
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_boolean")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
   }
@@ -199,6 +192,7 @@ public AdditionalPropertiesClassDto putMapArrayIntegerItem(String key, List<Inte
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_integer")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
   }
@@ -226,6 +220,7 @@ public AdditionalPropertiesClassDto putMapArrayAnytypeItem(String key, List<Obje
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_array_anytype")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
   }
@@ -253,6 +248,7 @@ public AdditionalPropertiesClassDto putMapMapStringItem(String key, Map<String,
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_string")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
   }
@@ -280,6 +276,7 @@ public AdditionalPropertiesClassDto putMapMapAnytypeItem(String key, Map<String,
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_anytype")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
   }
@@ -299,6 +296,7 @@ public AdditionalPropertiesClassDto anytype1(Object anytype1) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_1")
   public Object getAnytype1() {
     return anytype1;
   }
@@ -318,6 +316,7 @@ public AdditionalPropertiesClassDto anytype2(Object anytype2) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_2")
   public JsonNullable<Object> getAnytype2() {
     return anytype2;
   }
@@ -337,6 +336,7 @@ public AdditionalPropertiesClassDto anytype3(Object anytype3) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("anytype_3")
   public Object getAnytype3() {
     return anytype3;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
index a53cb5d6447b..9a2882492713 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesIntegerDto.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesIntegerDto extends HashMap<String, Integer> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesIntegerDto name(String name) {
@@ -40,6 +39,7 @@ public AdditionalPropertiesIntegerDto name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
index 7014b116fd59..9623f9828ee9 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesNumberDto.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesNumberDto extends HashMap<String, BigDecimal> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesNumberDto name(String name) {
@@ -41,6 +40,7 @@ public AdditionalPropertiesNumberDto name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
index 112fc024ae6f..513a01771060 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesObjectDto.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesObjectDto extends HashMap<String, Map> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesObjectDto name(String name) {
@@ -40,6 +39,7 @@ public AdditionalPropertiesObjectDto name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
index c611ccb01c78..239aa573c7af 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesStringDto.java
@@ -26,7 +26,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AdditionalPropertiesStringDto extends HashMap<String, String> {
 
-  @JsonProperty("name")
   private String name;
 
   public AdditionalPropertiesStringDto name(String name) {
@@ -40,6 +39,7 @@ public AdditionalPropertiesStringDto name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java
index ac989cfb9c37..e9f6006abda7 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AnimalDto.java
@@ -40,10 +40,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class AnimalDto {
 
-  @JsonProperty("className")
   private String className;
 
-  @JsonProperty("color")
   private String color = "red";
 
   /**
@@ -73,6 +71,7 @@ public AnimalDto className(String className) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("className")
   public String getClassName() {
     return className;
   }
@@ -92,6 +91,7 @@ public AnimalDto color(String color) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("color")
   public String getColor() {
     return color;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java
index b491a360fe13..dcf05a96d97c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ApiResponseDto.java
@@ -24,13 +24,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ApiResponseDto {
 
-  @JsonProperty("code")
   private Integer code;
 
-  @JsonProperty("type")
   private String type;
 
-  @JsonProperty("message")
   private String message;
 
   public ApiResponseDto code(Integer code) {
@@ -44,6 +41,7 @@ public ApiResponseDto code(Integer code) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("code")
   public Integer getCode() {
     return code;
   }
@@ -63,6 +61,7 @@ public ApiResponseDto type(String type) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
@@ -82,6 +81,7 @@ public ApiResponseDto message(String message) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("message")
   public String getMessage() {
     return message;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
index da4445a1ba94..f822315149c0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfArrayOfNumberOnlyDto.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfArrayOfNumberOnlyDto {
 
-  @JsonProperty("ArrayArrayNumber")
   @Valid
   private List<List<BigDecimal>> arrayArrayNumber;
 
@@ -50,6 +49,7 @@ public ArrayOfArrayOfNumberOnlyDto addArrayArrayNumberItem(List<BigDecimal> arra
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayArrayNumber")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
index 1c885b7ebd8d..036ce2279473 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayOfNumberOnlyDto.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayOfNumberOnlyDto {
 
-  @JsonProperty("ArrayNumber")
   @Valid
   private List<BigDecimal> arrayNumber;
 
@@ -50,6 +49,7 @@ public ArrayOfNumberOnlyDto addArrayNumberItem(BigDecimal arrayNumberItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("ArrayNumber")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java
index 3c2137595f2e..45768a4fb3f4 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ArrayTestDto.java
@@ -27,15 +27,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ArrayTestDto {
 
-  @JsonProperty("array_of_string")
   @Valid
   private List<String> arrayOfString;
 
-  @JsonProperty("array_array_of_integer")
   @Valid
   private List<List<Long>> arrayArrayOfInteger;
 
-  @JsonProperty("array_array_of_model")
   @Valid
   private List<List<ReadOnlyFirstDto>> arrayArrayOfModel;
 
@@ -58,6 +55,7 @@ public ArrayTestDto addArrayOfStringItem(String arrayOfStringItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_of_string")
   public List<String> getArrayOfString() {
     return arrayOfString;
   }
@@ -85,6 +83,7 @@ public ArrayTestDto addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerIte
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_integer")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
   }
@@ -112,6 +111,7 @@ public ArrayTestDto addArrayArrayOfModelItem(List<@Valid ReadOnlyFirstDto> array
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("array_array_of_model")
   public List<List<ReadOnlyFirstDto>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOfDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOfDto.java
index 5b7c1bd8094b..546ab564a99b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOfDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatAllOfDto.java
@@ -64,7 +64,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   public BigCatAllOfDto kind(KindEnum kind) {
@@ -78,6 +77,7 @@ public BigCatAllOfDto kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java
index dd08693ca408..5cf349a53348 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java
@@ -69,7 +69,6 @@ public static KindEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("kind")
   private KindEnum kind;
 
   /**
@@ -99,6 +98,7 @@ public BigCatDto kind(KindEnum kind) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("kind")
   public KindEnum getKind() {
     return kind;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java
index 404b2b016e53..0d9f693f54e4 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CapitalizationDto.java
@@ -24,22 +24,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CapitalizationDto {
 
-  @JsonProperty("smallCamel")
   private String smallCamel;
 
-  @JsonProperty("CapitalCamel")
   private String capitalCamel;
 
-  @JsonProperty("small_Snake")
   private String smallSnake;
 
-  @JsonProperty("Capital_Snake")
   private String capitalSnake;
 
-  @JsonProperty("SCA_ETH_Flow_Points")
   private String scAETHFlowPoints;
 
-  @JsonProperty("ATT_NAME")
   private String ATT_NAME;
 
   public CapitalizationDto smallCamel(String smallCamel) {
@@ -53,6 +47,7 @@ public CapitalizationDto smallCamel(String smallCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("smallCamel")
   public String getSmallCamel() {
     return smallCamel;
   }
@@ -72,6 +67,7 @@ public CapitalizationDto capitalCamel(String capitalCamel) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("CapitalCamel")
   public String getCapitalCamel() {
     return capitalCamel;
   }
@@ -91,6 +87,7 @@ public CapitalizationDto smallSnake(String smallSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("small_Snake")
   public String getSmallSnake() {
     return smallSnake;
   }
@@ -110,6 +107,7 @@ public CapitalizationDto capitalSnake(String capitalSnake) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("Capital_Snake")
   public String getCapitalSnake() {
     return capitalSnake;
   }
@@ -129,6 +127,7 @@ public CapitalizationDto scAETHFlowPoints(String scAETHFlowPoints) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("SCA_ETH_Flow_Points")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
   }
@@ -148,6 +147,7 @@ public CapitalizationDto ATT_NAME(String ATT_NAME) {
   */
   
   @ApiModelProperty(value = "Name of the pet ")
+  @JsonProperty("ATT_NAME")
   public String getATTNAME() {
     return ATT_NAME;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOfDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOfDto.java
index 1fc610ad6cbc..5381c543ba35 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOfDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatAllOfDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatAllOfDto {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   public CatAllOfDto declawed(Boolean declawed) {
@@ -38,6 +37,7 @@ public CatAllOfDto declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java
index a990352b6073..fc461e6b11f0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CatDto.java
@@ -37,7 +37,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CatDto extends AnimalDto {
 
-  @JsonProperty("declawed")
   private Boolean declawed;
 
   /**
@@ -67,6 +66,7 @@ public CatDto declawed(Boolean declawed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("declawed")
   public Boolean getDeclawed() {
     return declawed;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java
index 557df9bb685d..3c3b3abd47ad 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/CategoryDto.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class CategoryDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name = "default-name";
 
   /**
@@ -57,6 +55,7 @@ public CategoryDto id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -76,6 +75,7 @@ public CategoryDto name(String name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java
index e82763d08e6c..d25c1804dbc1 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClassModelDto.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClassModelDto {
 
-  @JsonProperty("_class")
   private String propertyClass;
 
   public ClassModelDto propertyClass(String propertyClass) {
@@ -39,6 +38,7 @@ public ClassModelDto propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("_class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java
index 469d640a365f..128213807796 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ClientDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ClientDto {
 
-  @JsonProperty("client")
   private String client;
 
   public ClientDto client(String client) {
@@ -38,6 +37,7 @@ public ClientDto client(String client) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("client")
   public String getClient() {
     return client;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
index cea6d655ab4c..b7c7f4e573de 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java
@@ -29,19 +29,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ContainerDefaultValueDto {
 
-  @JsonProperty("nullable_array")
   @Valid
   private JsonNullable<List<String>> nullableArray = JsonNullable.undefined();
 
-  @JsonProperty("nullable_required_array")
   @Valid
   private JsonNullable<List<String>> nullableRequiredArray = JsonNullable.undefined();
 
-  @JsonProperty("required_array")
   @Valid
   private List<String> requiredArray = new ArrayList<>();
 
-  @JsonProperty("nullable_array_with_default")
   @Valid
   private JsonNullable<List<String>> nullableArrayWithDefault = JsonNullable.undefined();
 
@@ -81,6 +77,7 @@ public ContainerDefaultValueDto addNullableArrayItem(String nullableArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array")
   public JsonNullable<List<String>> getNullableArray() {
     return nullableArray;
   }
@@ -108,6 +105,7 @@ public ContainerDefaultValueDto addNullableRequiredArrayItem(String nullableRequ
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("nullable_required_array")
   public JsonNullable<List<String>> getNullableRequiredArray() {
     return nullableRequiredArray;
   }
@@ -135,6 +133,7 @@ public ContainerDefaultValueDto addRequiredArrayItem(String requiredArrayItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("required_array")
   public List<String> getRequiredArray() {
     return requiredArray;
   }
@@ -162,6 +161,7 @@ public ContainerDefaultValueDto addNullableArrayWithDefaultItem(String nullableA
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("nullable_array_with_default")
   public JsonNullable<List<String>> getNullableArrayWithDefault() {
     return nullableArrayWithDefault;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOfDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOfDto.java
index e28550249470..d855ccb5e826 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOfDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogAllOfDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogAllOfDto {
 
-  @JsonProperty("breed")
   private String breed;
 
   public DogAllOfDto breed(String breed) {
@@ -38,6 +37,7 @@ public DogAllOfDto breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java
index 44649549f191..c5aa58ba0727 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/DogDto.java
@@ -29,7 +29,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class DogDto extends AnimalDto {
 
-  @JsonProperty("breed")
   private String breed;
 
   /**
@@ -59,6 +58,7 @@ public DogDto breed(String breed) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("breed")
   public String getBreed() {
     return breed;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java
index c7c37c6c34e0..faf57f8317bd 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumArraysDto.java
@@ -62,7 +62,6 @@ public static JustSymbolEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("just_symbol")
   private JustSymbolEnum justSymbol;
 
   /**
@@ -100,7 +99,6 @@ public static ArrayEnumEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("array_enum")
   @Valid
   private List<ArrayEnumEnum> arrayEnum;
 
@@ -115,6 +113,7 @@ public EnumArraysDto justSymbol(JustSymbolEnum justSymbol) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("just_symbol")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
   }
@@ -142,6 +141,7 @@ public EnumArraysDto addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("array_enum")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java
index ddf3979b7b2f..569cba845e8f 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/EnumTestDto.java
@@ -63,7 +63,6 @@ public static EnumStringEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string")
   private EnumStringEnum enumString;
 
   /**
@@ -103,7 +102,6 @@ public static EnumStringRequiredEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("enum_string_required")
   private EnumStringRequiredEnum enumStringRequired;
 
   /**
@@ -141,7 +139,6 @@ public static EnumIntegerEnum fromValue(Integer value) {
     }
   }
 
-  @JsonProperty("enum_integer")
   private EnumIntegerEnum enumInteger;
 
   /**
@@ -179,10 +176,8 @@ public static EnumNumberEnum fromValue(Double value) {
     }
   }
 
-  @JsonProperty("enum_number")
   private EnumNumberEnum enumNumber;
 
-  @JsonProperty("outerEnum")
   private OuterEnumDto outerEnum;
 
   /**
@@ -212,6 +207,7 @@ public EnumTestDto enumString(EnumStringEnum enumString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_string")
   public EnumStringEnum getEnumString() {
     return enumString;
   }
@@ -231,6 +227,7 @@ public EnumTestDto enumStringRequired(EnumStringRequiredEnum enumStringRequired)
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("enum_string_required")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
   }
@@ -250,6 +247,7 @@ public EnumTestDto enumInteger(EnumIntegerEnum enumInteger) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_integer")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
   }
@@ -269,6 +267,7 @@ public EnumTestDto enumNumber(EnumNumberEnum enumNumber) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("enum_number")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
   }
@@ -288,6 +287,7 @@ public EnumTestDto outerEnum(OuterEnumDto outerEnum) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("outerEnum")
   public OuterEnumDto getOuterEnum() {
     return outerEnum;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java
index 380a2a9a77ee..09f0cb543a31 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileDto.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileDto {
 
-  @JsonProperty("sourceURI")
   private String sourceURI;
 
   public FileDto sourceURI(String sourceURI) {
@@ -39,6 +38,7 @@ public FileDto sourceURI(String sourceURI) {
   */
   
   @ApiModelProperty(value = "Test capitalization")
+  @JsonProperty("sourceURI")
   public String getSourceURI() {
     return sourceURI;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
index 347e615ed996..20934ecff640 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FileSchemaTestClassDto.java
@@ -27,10 +27,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FileSchemaTestClassDto {
 
-  @JsonProperty("file")
   private FileDto file;
 
-  @JsonProperty("files")
   @Valid
   private List<@Valid FileDto> files;
 
@@ -45,6 +43,7 @@ public FileSchemaTestClassDto file(FileDto file) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("file")
   public FileDto getFile() {
     return file;
   }
@@ -72,6 +71,7 @@ public FileSchemaTestClassDto addFilesItem(FileDto filesItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("files")
   public List<@Valid FileDto> getFiles() {
     return files;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java
index 9958d734539c..2a12fb9c44bc 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/FormatTestDto.java
@@ -30,48 +30,34 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class FormatTestDto {
 
-  @JsonProperty("integer")
   private Integer integer;
 
-  @JsonProperty("int32")
   private Integer int32;
 
-  @JsonProperty("int64")
   private Long int64;
 
-  @JsonProperty("number")
   private BigDecimal number;
 
-  @JsonProperty("float")
   private Float _float;
 
-  @JsonProperty("double")
   private Double _double;
 
-  @JsonProperty("string")
   private String string;
 
-  @JsonProperty("byte")
   private byte[] _byte;
 
-  @JsonProperty("binary")
   private org.springframework.core.io.Resource binary;
 
-  @JsonProperty("date")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
   private LocalDate date;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("BigDecimal")
   private BigDecimal bigDecimal;
 
   /**
@@ -106,6 +92,7 @@ public FormatTestDto integer(Integer integer) {
   */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
+  @JsonProperty("integer")
   public Integer getInteger() {
     return integer;
   }
@@ -127,6 +114,7 @@ public FormatTestDto int32(Integer int32) {
   */
   @Min(20) @Max(200) 
   @ApiModelProperty(value = "")
+  @JsonProperty("int32")
   public Integer getInt32() {
     return int32;
   }
@@ -146,6 +134,7 @@ public FormatTestDto int64(Long int64) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("int64")
   public Long getInt64() {
     return int64;
   }
@@ -167,6 +156,7 @@ public FormatTestDto number(BigDecimal number) {
   */
   @NotNull @Valid @DecimalMin("32.1") @DecimalMax("543.2") 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number")
   public BigDecimal getNumber() {
     return number;
   }
@@ -188,6 +178,7 @@ public FormatTestDto _float(Float _float) {
   */
   @DecimalMin("54.3") @DecimalMax("987.6") 
   @ApiModelProperty(value = "")
+  @JsonProperty("float")
   public Float getFloat() {
     return _float;
   }
@@ -209,6 +200,7 @@ public FormatTestDto _double(Double _double) {
   */
   @DecimalMin("67.8") @DecimalMax("123.4") 
   @ApiModelProperty(value = "")
+  @JsonProperty("double")
   public Double getDouble() {
     return _double;
   }
@@ -228,6 +220,7 @@ public FormatTestDto string(String string) {
   */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
+  @JsonProperty("string")
   public String getString() {
     return string;
   }
@@ -247,6 +240,7 @@ public FormatTestDto _byte(byte[] _byte) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("byte")
   public byte[] getByte() {
     return _byte;
   }
@@ -266,6 +260,7 @@ public FormatTestDto binary(org.springframework.core.io.Resource binary) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("binary")
   public org.springframework.core.io.Resource getBinary() {
     return binary;
   }
@@ -285,6 +280,7 @@ public FormatTestDto date(LocalDate date) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("date")
   public LocalDate getDate() {
     return date;
   }
@@ -304,6 +300,7 @@ public FormatTestDto dateTime(OffsetDateTime dateTime) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -323,6 +320,7 @@ public FormatTestDto uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -342,6 +340,7 @@ public FormatTestDto password(String password) {
   */
   @NotNull @Size(min = 10, max = 64) 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -361,6 +360,7 @@ public FormatTestDto bigDecimal(BigDecimal bigDecimal) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
     return bigDecimal;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
index 2b8b8181dd23..4911ed09bf30 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/HasOnlyReadOnlyDto.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class HasOnlyReadOnlyDto {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("foo")
   private String foo;
 
   public HasOnlyReadOnlyDto bar(String bar) {
@@ -41,6 +39,7 @@ public HasOnlyReadOnlyDto bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public HasOnlyReadOnlyDto foo(String foo) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("foo")
   public String getFoo() {
     return foo;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java
index b62ae7e5cb09..915c901ea75b 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ListDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ListDto {
 
-  @JsonProperty("123-list")
   private String _123List;
 
   public ListDto _123List(String _123List) {
@@ -38,6 +37,7 @@ public ListDto _123List(String _123List) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("123-list")
   public String get123List() {
     return _123List;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java
index 7edf8258281d..6d74ef6517ea 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MapTestDto.java
@@ -27,7 +27,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MapTestDto {
 
-  @JsonProperty("map_map_of_string")
   @Valid
   private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
 
@@ -66,15 +65,12 @@ public static InnerEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("map_of_enum_string")
   @Valid
   private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
 
-  @JsonProperty("direct_map")
   @Valid
   private Map<String, Boolean> directMap = new HashMap<>();
 
-  @JsonProperty("indirect_map")
   @Valid
   private Map<String, Boolean> indirectMap = new HashMap<>();
 
@@ -97,6 +93,7 @@ public MapTestDto putMapMapOfStringItem(String key, Map<String, String> mapMapOf
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map_map_of_string")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
   }
@@ -124,6 +121,7 @@ public MapTestDto putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringIt
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("map_of_enum_string")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
   }
@@ -151,6 +149,7 @@ public MapTestDto putDirectMapItem(String key, Boolean directMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("direct_map")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
   }
@@ -178,6 +177,7 @@ public MapTestDto putIndirectMapItem(String key, Boolean indirectMapItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("indirect_map")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
index c602c9a77e04..3640ff771d12 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClassDto.java
@@ -30,14 +30,11 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class MixedPropertiesAndAdditionalPropertiesClassDto {
 
-  @JsonProperty("uuid")
   private UUID uuid;
 
-  @JsonProperty("dateTime")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime dateTime;
 
-  @JsonProperty("map")
   @Valid
   private Map<String, AnimalDto> map = new HashMap<>();
 
@@ -52,6 +49,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("uuid")
   public UUID getUuid() {
     return uuid;
   }
@@ -71,6 +69,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime da
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
     return dateTime;
   }
@@ -98,6 +97,7 @@ public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, Ani
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("map")
   public Map<String, AnimalDto> getMap() {
     return map;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java
index 88f61f6732cf..6a9cd2b5ef22 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/Model200ResponseDto.java
@@ -25,10 +25,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class Model200ResponseDto {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("class")
   private String propertyClass;
 
   public Model200ResponseDto name(Integer name) {
@@ -42,6 +40,7 @@ public Model200ResponseDto name(Integer name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -61,6 +60,7 @@ public Model200ResponseDto propertyClass(String propertyClass) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("class")
   public String getPropertyClass() {
     return propertyClass;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java
index 1428f8ee913b..21351e2fced0 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NameDto.java
@@ -25,16 +25,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NameDto {
 
-  @JsonProperty("name")
   private Integer name;
 
-  @JsonProperty("snake_case")
   private Integer snakeCase;
 
-  @JsonProperty("property")
   private String property;
 
-  @JsonProperty("123Number")
   private Integer _123Number;
 
   /**
@@ -64,6 +60,7 @@ public NameDto name(Integer name) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("name")
   public Integer getName() {
     return name;
   }
@@ -83,6 +80,7 @@ public NameDto snakeCase(Integer snakeCase) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("snake_case")
   public Integer getSnakeCase() {
     return snakeCase;
   }
@@ -102,6 +100,7 @@ public NameDto property(String property) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("property")
   public String getProperty() {
     return property;
   }
@@ -121,6 +120,7 @@ public NameDto _123Number(Integer _123Number) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("123Number")
   public Integer get123Number() {
     return _123Number;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java
index d3ae78d54cb7..23b53177c219 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NumberOnlyDto.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class NumberOnlyDto {
 
-  @JsonProperty("JustNumber")
   private BigDecimal justNumber;
 
   public NumberOnlyDto justNumber(BigDecimal justNumber) {
@@ -39,6 +38,7 @@ public NumberOnlyDto justNumber(BigDecimal justNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("JustNumber")
   public BigDecimal getJustNumber() {
     return justNumber;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java
index 52825dc3d50b..05e501b79e46 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OrderDto.java
@@ -27,16 +27,12 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OrderDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("petId")
   private Long petId;
 
-  @JsonProperty("quantity")
   private Integer quantity;
 
-  @JsonProperty("shipDate")
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
   private OffsetDateTime shipDate;
 
@@ -77,10 +73,8 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
-  @JsonProperty("complete")
   private Boolean complete = false;
 
   public OrderDto id(Long id) {
@@ -94,6 +88,7 @@ public OrderDto id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -113,6 +108,7 @@ public OrderDto petId(Long petId) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("petId")
   public Long getPetId() {
     return petId;
   }
@@ -132,6 +128,7 @@ public OrderDto quantity(Integer quantity) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("quantity")
   public Integer getQuantity() {
     return quantity;
   }
@@ -151,6 +148,7 @@ public OrderDto shipDate(OffsetDateTime shipDate) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("shipDate")
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -170,6 +168,7 @@ public OrderDto status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "Order Status")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
@@ -189,6 +188,7 @@ public OrderDto complete(Boolean complete) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("complete")
   public Boolean getComplete() {
     return complete;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java
index e7d74089cb2a..68c1e7f760df 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/OuterCompositeDto.java
@@ -25,13 +25,10 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class OuterCompositeDto {
 
-  @JsonProperty("my_number")
   private BigDecimal myNumber;
 
-  @JsonProperty("my_string")
   private String myString;
 
-  @JsonProperty("my_boolean")
   private Boolean myBoolean;
 
   public OuterCompositeDto myNumber(BigDecimal myNumber) {
@@ -45,6 +42,7 @@ public OuterCompositeDto myNumber(BigDecimal myNumber) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("my_number")
   public BigDecimal getMyNumber() {
     return myNumber;
   }
@@ -64,6 +62,7 @@ public OuterCompositeDto myString(String myString) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_string")
   public String getMyString() {
     return myString;
   }
@@ -83,6 +82,7 @@ public OuterCompositeDto myBoolean(Boolean myBoolean) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("my_boolean")
   public Boolean getMyBoolean() {
     return myBoolean;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
index bbd680e89fa0..88d38a4e5031 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/PetDto.java
@@ -32,20 +32,15 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class PetDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("category")
   private CategoryDto category;
 
-  @JsonProperty("name")
   private String name;
 
-  @JsonProperty("photoUrls")
   @Valid
   private Set<String> photoUrls = new LinkedHashSet<>();
 
-  @JsonProperty("tags")
   @Valid
   private List<@Valid TagDto> tags;
 
@@ -86,7 +81,6 @@ public static StatusEnum fromValue(String value) {
     }
   }
 
-  @JsonProperty("status")
   private StatusEnum status;
 
   /**
@@ -117,6 +111,7 @@ public PetDto id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -136,6 +131,7 @@ public PetDto category(CategoryDto category) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("category")
   public CategoryDto getCategory() {
     return category;
   }
@@ -155,6 +151,7 @@ public PetDto name(String name) {
   */
   @NotNull 
   @ApiModelProperty(example = "doggie", required = true, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -182,6 +179,7 @@ public PetDto addPhotoUrlsItem(String photoUrlsItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("photoUrls")
   public Set<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -210,6 +208,7 @@ public PetDto addTagsItem(TagDto tagsItem) {
   */
   @Valid 
   @ApiModelProperty(value = "")
+  @JsonProperty("tags")
   public List<@Valid TagDto> getTags() {
     return tags;
   }
@@ -229,6 +228,7 @@ public PetDto status(StatusEnum status) {
   */
   
   @ApiModelProperty(value = "pet status in the store")
+  @JsonProperty("status")
   public StatusEnum getStatus() {
     return status;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
index 9d60f0b4f2ec..5112782b2297 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReadOnlyFirstDto.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReadOnlyFirstDto {
 
-  @JsonProperty("bar")
   private String bar;
 
-  @JsonProperty("baz")
   private String baz;
 
   public ReadOnlyFirstDto bar(String bar) {
@@ -41,6 +39,7 @@ public ReadOnlyFirstDto bar(String bar) {
   */
   
   @ApiModelProperty(readOnly = true, value = "")
+  @JsonProperty("bar")
   public String getBar() {
     return bar;
   }
@@ -60,6 +59,7 @@ public ReadOnlyFirstDto baz(String baz) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("baz")
   public String getBaz() {
     return baz;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
new file mode 100644
index 000000000000..3276113a5c98
--- /dev/null
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNamesDto.java
@@ -0,0 +1,158 @@
+package org.openapitools.model;
+
+import java.net.URI;
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.jackson.nullable.JsonNullable;
+import java.time.OffsetDateTime;
+import javax.validation.Valid;
+import javax.validation.constraints.*;
+
+
+import java.util.*;
+import javax.annotation.Generated;
+
+/**
+ * ResponseObjectWithDifferentFieldNamesDto
+ */
+
+@JsonTypeName("ResponseObjectWithDifferentFieldNames")
+@Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
+public class ResponseObjectWithDifferentFieldNamesDto {
+
+  private String normalPropertyName;
+
+  private String UPPER_CASE_PROPERTY_SNAKE;
+
+  private String lowerCasePropertyDashes;
+
+  private String propertyNameWithSpaces;
+
+  public ResponseObjectWithDifferentFieldNamesDto normalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+    return this;
+  }
+
+  /**
+   * Get normalPropertyName
+   * @return normalPropertyName
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("normalPropertyName")
+  public String getNormalPropertyName() {
+    return normalPropertyName;
+  }
+
+  public void setNormalPropertyName(String normalPropertyName) {
+    this.normalPropertyName = normalPropertyName;
+  }
+
+  public ResponseObjectWithDifferentFieldNamesDto UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+    return this;
+  }
+
+  /**
+   * Get UPPER_CASE_PROPERTY_SNAKE
+   * @return UPPER_CASE_PROPERTY_SNAKE
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("UPPER_CASE_PROPERTY_SNAKE")
+  public String getUPPERCASEPROPERTYSNAKE() {
+    return UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public void setUPPERCASEPROPERTYSNAKE(String UPPER_CASE_PROPERTY_SNAKE) {
+    this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE;
+  }
+
+  public ResponseObjectWithDifferentFieldNamesDto lowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+    return this;
+  }
+
+  /**
+   * Get lowerCasePropertyDashes
+   * @return lowerCasePropertyDashes
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("lower-case-property-dashes")
+  public String getLowerCasePropertyDashes() {
+    return lowerCasePropertyDashes;
+  }
+
+  public void setLowerCasePropertyDashes(String lowerCasePropertyDashes) {
+    this.lowerCasePropertyDashes = lowerCasePropertyDashes;
+  }
+
+  public ResponseObjectWithDifferentFieldNamesDto propertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+    return this;
+  }
+
+  /**
+   * Get propertyNameWithSpaces
+   * @return propertyNameWithSpaces
+  */
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("property name with spaces")
+  public String getPropertyNameWithSpaces() {
+    return propertyNameWithSpaces;
+  }
+
+  public void setPropertyNameWithSpaces(String propertyNameWithSpaces) {
+    this.propertyNameWithSpaces = propertyNameWithSpaces;
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ResponseObjectWithDifferentFieldNamesDto responseObjectWithDifferentFieldNames = (ResponseObjectWithDifferentFieldNamesDto) o;
+    return Objects.equals(this.normalPropertyName, responseObjectWithDifferentFieldNames.normalPropertyName) &&
+        Objects.equals(this.UPPER_CASE_PROPERTY_SNAKE, responseObjectWithDifferentFieldNames.UPPER_CASE_PROPERTY_SNAKE) &&
+        Objects.equals(this.lowerCasePropertyDashes, responseObjectWithDifferentFieldNames.lowerCasePropertyDashes) &&
+        Objects.equals(this.propertyNameWithSpaces, responseObjectWithDifferentFieldNames.propertyNameWithSpaces);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(normalPropertyName, UPPER_CASE_PROPERTY_SNAKE, lowerCasePropertyDashes, propertyNameWithSpaces);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ResponseObjectWithDifferentFieldNamesDto {\n");
+    sb.append("    normalPropertyName: ").append(toIndentedString(normalPropertyName)).append("\n");
+    sb.append("    UPPER_CASE_PROPERTY_SNAKE: ").append(toIndentedString(UPPER_CASE_PROPERTY_SNAKE)).append("\n");
+    sb.append("    lowerCasePropertyDashes: ").append(toIndentedString(lowerCasePropertyDashes)).append("\n");
+    sb.append("    propertyNameWithSpaces: ").append(toIndentedString(propertyNameWithSpaces)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java
index 44c776f01c1f..033daa6a1805 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ReturnDto.java
@@ -25,7 +25,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class ReturnDto {
 
-  @JsonProperty("return")
   private Integer _return;
 
   public ReturnDto _return(Integer _return) {
@@ -39,6 +38,7 @@ public ReturnDto _return(Integer _return) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("return")
   public Integer getReturn() {
     return _return;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java
index f5ea44d681ab..35c91451a265 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/SpecialModelNameDto.java
@@ -24,7 +24,6 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class SpecialModelNameDto {
 
-  @JsonProperty("$special[property.name]")
   private Long $SpecialPropertyName;
 
   public SpecialModelNameDto $SpecialPropertyName(Long $SpecialPropertyName) {
@@ -38,6 +37,7 @@ public class SpecialModelNameDto {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("$special[property.name]")
   public Long get$SpecialPropertyName() {
     return $SpecialPropertyName;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java
index 073b54c2b988..18f25a440445 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TagDto.java
@@ -24,10 +24,8 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TagDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("name")
   private String name;
 
   public TagDto id(Long id) {
@@ -41,6 +39,7 @@ public TagDto id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -60,6 +59,7 @@ public TagDto name(String name) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
index 465fb77c08c5..ef1a9c240ee7 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderDefaultDto.java
@@ -27,19 +27,14 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderDefaultDto {
 
-  @JsonProperty("string_item")
   private String stringItem = "what";
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem = new BigDecimal("1.234");
 
-  @JsonProperty("integer_item")
   private Integer integerItem = -2;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem = true;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>(Arrays.asList(0, 1, 2, 3));
 
@@ -74,6 +69,7 @@ public TypeHolderDefaultDto stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -93,6 +89,7 @@ public TypeHolderDefaultDto numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -112,6 +109,7 @@ public TypeHolderDefaultDto integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -131,6 +129,7 @@ public TypeHolderDefaultDto boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -158,6 +157,7 @@ public TypeHolderDefaultDto addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
index 15dc401681a8..c4eb4d967212 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/TypeHolderExampleDto.java
@@ -27,22 +27,16 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class TypeHolderExampleDto {
 
-  @JsonProperty("string_item")
   private String stringItem;
 
-  @JsonProperty("number_item")
   private BigDecimal numberItem;
 
-  @JsonProperty("float_item")
   private Float floatItem;
 
-  @JsonProperty("integer_item")
   private Integer integerItem;
 
-  @JsonProperty("bool_item")
   private Boolean boolItem;
 
-  @JsonProperty("array_item")
   @Valid
   private List<Integer> arrayItem = new ArrayList<>();
 
@@ -78,6 +72,7 @@ public TypeHolderExampleDto stringItem(String stringItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "what", required = true, value = "")
+  @JsonProperty("string_item")
   public String getStringItem() {
     return stringItem;
   }
@@ -97,6 +92,7 @@ public TypeHolderExampleDto numberItem(BigDecimal numberItem) {
   */
   @NotNull @Valid 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("number_item")
   public BigDecimal getNumberItem() {
     return numberItem;
   }
@@ -116,6 +112,7 @@ public TypeHolderExampleDto floatItem(Float floatItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "1.234", required = true, value = "")
+  @JsonProperty("float_item")
   public Float getFloatItem() {
     return floatItem;
   }
@@ -135,6 +132,7 @@ public TypeHolderExampleDto integerItem(Integer integerItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "-2", required = true, value = "")
+  @JsonProperty("integer_item")
   public Integer getIntegerItem() {
     return integerItem;
   }
@@ -154,6 +152,7 @@ public TypeHolderExampleDto boolItem(Boolean boolItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "true", required = true, value = "")
+  @JsonProperty("bool_item")
   public Boolean getBoolItem() {
     return boolItem;
   }
@@ -181,6 +180,7 @@ public TypeHolderExampleDto addArrayItemItem(Integer arrayItemItem) {
   */
   @NotNull 
   @ApiModelProperty(example = "[0,1,2,3]", required = true, value = "")
+  @JsonProperty("array_item")
   public List<Integer> getArrayItem() {
     return arrayItem;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java
index 43f14f44bffc..e8f22138103d 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/UserDto.java
@@ -24,28 +24,20 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class UserDto {
 
-  @JsonProperty("id")
   private Long id;
 
-  @JsonProperty("username")
   private String username;
 
-  @JsonProperty("firstName")
   private String firstName;
 
-  @JsonProperty("lastName")
   private String lastName;
 
-  @JsonProperty("email")
   private String email;
 
-  @JsonProperty("password")
   private String password;
 
-  @JsonProperty("phone")
   private String phone;
 
-  @JsonProperty("userStatus")
   private Integer userStatus;
 
   public UserDto id(Long id) {
@@ -59,6 +51,7 @@ public UserDto id(Long id) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -78,6 +71,7 @@ public UserDto username(String username) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -97,6 +91,7 @@ public UserDto firstName(String firstName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("firstName")
   public String getFirstName() {
     return firstName;
   }
@@ -116,6 +111,7 @@ public UserDto lastName(String lastName) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("lastName")
   public String getLastName() {
     return lastName;
   }
@@ -135,6 +131,7 @@ public UserDto email(String email) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -154,6 +151,7 @@ public UserDto password(String password) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
@@ -173,6 +171,7 @@ public UserDto phone(String phone) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("phone")
   public String getPhone() {
     return phone;
   }
@@ -192,6 +191,7 @@ public UserDto userStatus(Integer userStatus) {
   */
   
   @ApiModelProperty(value = "User Status")
+  @JsonProperty("userStatus")
   public Integer getUserStatus() {
     return userStatus;
   }
diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java
index a100cd912839..10677d46297c 100644
--- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java
+++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/XmlItemDto.java
@@ -27,99 +27,70 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen")
 public class XmlItemDto {
 
-  @JsonProperty("attribute_string")
   private String attributeString;
 
-  @JsonProperty("attribute_number")
   private BigDecimal attributeNumber;
 
-  @JsonProperty("attribute_integer")
   private Integer attributeInteger;
 
-  @JsonProperty("attribute_boolean")
   private Boolean attributeBoolean;
 
-  @JsonProperty("wrapped_array")
   @Valid
   private List<Integer> wrappedArray;
 
-  @JsonProperty("name_string")
   private String nameString;
 
-  @JsonProperty("name_number")
   private BigDecimal nameNumber;
 
-  @JsonProperty("name_integer")
   private Integer nameInteger;
 
-  @JsonProperty("name_boolean")
   private Boolean nameBoolean;
 
-  @JsonProperty("name_array")
   @Valid
   private List<Integer> nameArray;
 
-  @JsonProperty("name_wrapped_array")
   @Valid
   private List<Integer> nameWrappedArray;
 
-  @JsonProperty("prefix_string")
   private String prefixString;
 
-  @JsonProperty("prefix_number")
   private BigDecimal prefixNumber;
 
-  @JsonProperty("prefix_integer")
   private Integer prefixInteger;
 
-  @JsonProperty("prefix_boolean")
   private Boolean prefixBoolean;
 
-  @JsonProperty("prefix_array")
   @Valid
   private List<Integer> prefixArray;
 
-  @JsonProperty("prefix_wrapped_array")
   @Valid
   private List<Integer> prefixWrappedArray;
 
-  @JsonProperty("namespace_string")
   private String namespaceString;
 
-  @JsonProperty("namespace_number")
   private BigDecimal namespaceNumber;
 
-  @JsonProperty("namespace_integer")
   private Integer namespaceInteger;
 
-  @JsonProperty("namespace_boolean")
   private Boolean namespaceBoolean;
 
-  @JsonProperty("namespace_array")
   @Valid
   private List<Integer> namespaceArray;
 
-  @JsonProperty("namespace_wrapped_array")
   @Valid
   private List<Integer> namespaceWrappedArray;
 
-  @JsonProperty("prefix_ns_string")
   private String prefixNsString;
 
-  @JsonProperty("prefix_ns_number")
   private BigDecimal prefixNsNumber;
 
-  @JsonProperty("prefix_ns_integer")
   private Integer prefixNsInteger;
 
-  @JsonProperty("prefix_ns_boolean")
   private Boolean prefixNsBoolean;
 
-  @JsonProperty("prefix_ns_array")
   @Valid
   private List<Integer> prefixNsArray;
 
-  @JsonProperty("prefix_ns_wrapped_array")
   @Valid
   private List<Integer> prefixNsWrappedArray;
 
@@ -134,6 +105,7 @@ public XmlItemDto attributeString(String attributeString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("attribute_string")
   public String getAttributeString() {
     return attributeString;
   }
@@ -153,6 +125,7 @@ public XmlItemDto attributeNumber(BigDecimal attributeNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("attribute_number")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
   }
@@ -172,6 +145,7 @@ public XmlItemDto attributeInteger(Integer attributeInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("attribute_integer")
   public Integer getAttributeInteger() {
     return attributeInteger;
   }
@@ -191,6 +165,7 @@ public XmlItemDto attributeBoolean(Boolean attributeBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("attribute_boolean")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
   }
@@ -218,6 +193,7 @@ public XmlItemDto addWrappedArrayItem(Integer wrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("wrapped_array")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
   }
@@ -237,6 +213,7 @@ public XmlItemDto nameString(String nameString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("name_string")
   public String getNameString() {
     return nameString;
   }
@@ -256,6 +233,7 @@ public XmlItemDto nameNumber(BigDecimal nameNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("name_number")
   public BigDecimal getNameNumber() {
     return nameNumber;
   }
@@ -275,6 +253,7 @@ public XmlItemDto nameInteger(Integer nameInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("name_integer")
   public Integer getNameInteger() {
     return nameInteger;
   }
@@ -294,6 +273,7 @@ public XmlItemDto nameBoolean(Boolean nameBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("name_boolean")
   public Boolean getNameBoolean() {
     return nameBoolean;
   }
@@ -321,6 +301,7 @@ public XmlItemDto addNameArrayItem(Integer nameArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_array")
   public List<Integer> getNameArray() {
     return nameArray;
   }
@@ -348,6 +329,7 @@ public XmlItemDto addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("name_wrapped_array")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
   }
@@ -367,6 +349,7 @@ public XmlItemDto prefixString(String prefixString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_string")
   public String getPrefixString() {
     return prefixString;
   }
@@ -386,6 +369,7 @@ public XmlItemDto prefixNumber(BigDecimal prefixNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_number")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
   }
@@ -405,6 +389,7 @@ public XmlItemDto prefixInteger(Integer prefixInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_integer")
   public Integer getPrefixInteger() {
     return prefixInteger;
   }
@@ -424,6 +409,7 @@ public XmlItemDto prefixBoolean(Boolean prefixBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_boolean")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
   }
@@ -451,6 +437,7 @@ public XmlItemDto addPrefixArrayItem(Integer prefixArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_array")
   public List<Integer> getPrefixArray() {
     return prefixArray;
   }
@@ -478,6 +465,7 @@ public XmlItemDto addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_wrapped_array")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
   }
@@ -497,6 +485,7 @@ public XmlItemDto namespaceString(String namespaceString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("namespace_string")
   public String getNamespaceString() {
     return namespaceString;
   }
@@ -516,6 +505,7 @@ public XmlItemDto namespaceNumber(BigDecimal namespaceNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("namespace_number")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
   }
@@ -535,6 +525,7 @@ public XmlItemDto namespaceInteger(Integer namespaceInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("namespace_integer")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
   }
@@ -554,6 +545,7 @@ public XmlItemDto namespaceBoolean(Boolean namespaceBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("namespace_boolean")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
   }
@@ -581,6 +573,7 @@ public XmlItemDto addNamespaceArrayItem(Integer namespaceArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_array")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
   }
@@ -608,6 +601,7 @@ public XmlItemDto addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("namespace_wrapped_array")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
   }
@@ -627,6 +621,7 @@ public XmlItemDto prefixNsString(String prefixNsString) {
   */
   
   @ApiModelProperty(example = "string", value = "")
+  @JsonProperty("prefix_ns_string")
   public String getPrefixNsString() {
     return prefixNsString;
   }
@@ -646,6 +641,7 @@ public XmlItemDto prefixNsNumber(BigDecimal prefixNsNumber) {
   */
   @Valid 
   @ApiModelProperty(example = "1.234", value = "")
+  @JsonProperty("prefix_ns_number")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
   }
@@ -665,6 +661,7 @@ public XmlItemDto prefixNsInteger(Integer prefixNsInteger) {
   */
   
   @ApiModelProperty(example = "-2", value = "")
+  @JsonProperty("prefix_ns_integer")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
   }
@@ -684,6 +681,7 @@ public XmlItemDto prefixNsBoolean(Boolean prefixNsBoolean) {
   */
   
   @ApiModelProperty(example = "true", value = "")
+  @JsonProperty("prefix_ns_boolean")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
   }
@@ -711,6 +709,7 @@ public XmlItemDto addPrefixNsArrayItem(Integer prefixNsArrayItem) {
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_array")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
   }
@@ -738,6 +737,7 @@ public XmlItemDto addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem)
   */
   
   @ApiModelProperty(value = "")
+  @JsonProperty("prefix_ns_wrapped_array")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
   }
diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml
index c2cce49a8004..2151d60d7584 100644
--- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml
+++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml
@@ -1174,6 +1174,31 @@ paths:
       x-accepts: application/json
       x-tags:
       - tag: pet
+  /fake/{petId}/response-object-different-names:
+    get:
+      operationId: responseObjectDifferentNames
+      parameters:
+      - description: ID of pet to update
+        explode: false
+        in: path
+        name: petId
+        required: true
+        schema:
+          format: int64
+          type: integer
+        style: simple
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/ResponseObjectWithDifferentFieldNames'
+          description: successful operation
+      tags:
+      - pet
+      x-accepts: application/json
+      x-tags:
+      - tag: pet
 components:
   requestBodies:
     UserArray:
@@ -2106,6 +2131,22 @@ components:
       - nullable_required_array
       - required_array
       type: object
+    ResponseObjectWithDifferentFieldNames:
+      example:
+        UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE
+        lower-case-property-dashes: lower-case-property-dashes
+        property name with spaces: property name with spaces
+        normalPropertyName: normalPropertyName
+      properties:
+        normalPropertyName:
+          type: string
+        UPPER_CASE_PROPERTY_SNAKE:
+          type: string
+        lower-case-property-dashes:
+          type: string
+        property name with spaces:
+          type: string
+      type: object
     updatePetWithForm_request:
       properties:
         name: