diff --git a/docs/generators/groovy.md b/docs/generators/groovy.md
index 5407b0b894ef..d98428debc79 100644
--- a/docs/generators/groovy.md
+++ b/docs/generators/groovy.md
@@ -142,10 +142,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -153,6 +157,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -165,14 +171,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -188,19 +198,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -208,8 +220,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-camel.md b/docs/generators/java-camel.md
index e77c38151eb3..07d826e65844 100644
--- a/docs/generators/java-camel.md
+++ b/docs/generators/java-camel.md
@@ -181,10 +181,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -192,26 +196,31 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
 <li>else</li>
 <li>enum</li>
 <li>extends</li>
-<li>file</li>
 <li>final</li>
 <li>finally</li>
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -227,19 +236,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -247,8 +258,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-helidon-client.md b/docs/generators/java-helidon-client.md
index a274c0e0307f..70d20b839464 100644
--- a/docs/generators/java-helidon-client.md
+++ b/docs/generators/java-helidon-client.md
@@ -135,10 +135,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -146,6 +150,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -158,14 +164,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -181,19 +191,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -201,8 +213,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-helidon-server.md b/docs/generators/java-helidon-server.md
index a34d62118c13..1da9f24f8d1b 100644
--- a/docs/generators/java-helidon-server.md
+++ b/docs/generators/java-helidon-server.md
@@ -137,10 +137,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -148,6 +152,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -160,14 +166,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -183,19 +193,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -203,8 +215,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-inflector.md b/docs/generators/java-inflector.md
index 8b8b35ea29dc..3781bf5a3d8c 100644
--- a/docs/generators/java-inflector.md
+++ b/docs/generators/java-inflector.md
@@ -139,10 +139,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -150,6 +154,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -162,14 +168,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -185,19 +195,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -205,8 +217,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-micronaut-client.md b/docs/generators/java-micronaut-client.md
index 1d3c4c201bd7..789ce3a03192 100644
--- a/docs/generators/java-micronaut-client.md
+++ b/docs/generators/java-micronaut-client.md
@@ -161,12 +161,16 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiexception</li>
 <li>apiresponse</li>
 <li>application</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
 <li>authorization</li>
+<li>bigdecimal</li>
 <li>body</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -176,6 +180,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>const</li>
 <li>continue</li>
 <li>cookie</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -189,15 +195,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>for</li>
 <li>format</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>header</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -213,11 +223,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>pathvariable</li>
 <li>private</li>
@@ -226,9 +236,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>queryparam</li>
 <li>queryvalue</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -236,8 +248,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-micronaut-server.md b/docs/generators/java-micronaut-server.md
index a848e57254ac..f6f79acede82 100644
--- a/docs/generators/java-micronaut-server.md
+++ b/docs/generators/java-micronaut-server.md
@@ -161,21 +161,28 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiexception</li>
 <li>apiresponse</li>
 <li>application</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
 <li>authorization</li>
+<li>bigdecimal</li>
 <li>body</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
 <li>class</li>
 <li>client</li>
+<li>completedfileupload</li>
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
 <li>cookie</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -189,15 +196,19 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>for</li>
 <li>format</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>header</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -213,11 +224,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>pathvariable</li>
 <li>private</li>
@@ -226,9 +237,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>queryparam</li>
 <li>queryvalue</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -236,8 +249,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-microprofile.md b/docs/generators/java-microprofile.md
index 1a6d6369a0a6..a8a932f4d474 100644
--- a/docs/generators/java-microprofile.md
+++ b/docs/generators/java-microprofile.md
@@ -172,10 +172,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -183,6 +187,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -195,14 +201,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -218,19 +228,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -238,8 +250,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-msf4j.md b/docs/generators/java-msf4j.md
index d321b030be83..d0d195ae2864 100644
--- a/docs/generators/java-msf4j.md
+++ b/docs/generators/java-msf4j.md
@@ -145,10 +145,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -156,6 +160,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -168,14 +174,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -191,19 +201,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -211,8 +223,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-pkmst.md b/docs/generators/java-pkmst.md
index 4a96c9d89d9b..61f8612c6288 100644
--- a/docs/generators/java-pkmst.md
+++ b/docs/generators/java-pkmst.md
@@ -146,10 +146,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -157,6 +161,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -169,14 +175,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -192,19 +202,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -212,8 +224,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-play-framework.md b/docs/generators/java-play-framework.md
index 1e4efaaeae5b..331716ef6ff6 100644
--- a/docs/generators/java-play-framework.md
+++ b/docs/generators/java-play-framework.md
@@ -149,10 +149,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -160,6 +164,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -172,14 +178,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -195,19 +205,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -215,8 +227,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-undertow-server.md b/docs/generators/java-undertow-server.md
index ca484ad146ed..19419bc0aeaa 100644
--- a/docs/generators/java-undertow-server.md
+++ b/docs/generators/java-undertow-server.md
@@ -139,10 +139,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -150,6 +154,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -162,14 +168,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -185,19 +195,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -205,8 +217,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-vertx-web.md b/docs/generators/java-vertx-web.md
index 8c98816db81c..7e909f20a7d7 100644
--- a/docs/generators/java-vertx-web.md
+++ b/docs/generators/java-vertx-web.md
@@ -139,10 +139,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -150,6 +154,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -162,14 +168,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -185,19 +195,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -205,8 +217,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-vertx.md b/docs/generators/java-vertx.md
index 9720c15d8bdb..95fa46473378 100644
--- a/docs/generators/java-vertx.md
+++ b/docs/generators/java-vertx.md
@@ -142,10 +142,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -153,6 +157,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -165,14 +171,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -188,19 +198,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -208,8 +220,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java-wiremock.md b/docs/generators/java-wiremock.md
index 09fb082309e2..ec37c8052e93 100644
--- a/docs/generators/java-wiremock.md
+++ b/docs/generators/java-wiremock.md
@@ -139,10 +139,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -150,6 +154,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -162,14 +168,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -185,19 +195,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -205,8 +217,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/java.md b/docs/generators/java.md
index 816f4f2228a6..7a63f4d383a3 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -172,10 +172,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -183,6 +187,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -195,14 +201,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -218,19 +228,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -238,8 +250,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md
index d911fd30b0f3..92a39d6a6a6e 100644
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -153,10 +153,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -164,6 +168,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -176,14 +182,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -199,19 +209,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -219,8 +231,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/jaxrs-cxf-client.md b/docs/generators/jaxrs-cxf-client.md
index 04ae1cfee4e1..8e93a178f9be 100644
--- a/docs/generators/jaxrs-cxf-client.md
+++ b/docs/generators/jaxrs-cxf-client.md
@@ -144,10 +144,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -155,6 +159,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -167,14 +173,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -190,19 +200,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -210,8 +222,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/jaxrs-cxf-extended.md b/docs/generators/jaxrs-cxf-extended.md
index 8c34c65d1460..165da71edf38 100644
--- a/docs/generators/jaxrs-cxf-extended.md
+++ b/docs/generators/jaxrs-cxf-extended.md
@@ -167,10 +167,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -178,6 +182,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -190,14 +196,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -213,19 +223,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -233,8 +245,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/jaxrs-cxf.md b/docs/generators/jaxrs-cxf.md
index 12deda54824d..98bcbd702fa6 100644
--- a/docs/generators/jaxrs-cxf.md
+++ b/docs/generators/jaxrs-cxf.md
@@ -162,10 +162,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -173,6 +177,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -185,14 +191,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -208,19 +218,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -228,8 +240,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/jaxrs-jersey.md b/docs/generators/jaxrs-jersey.md
index 0965570fdde4..0e377689ac8f 100644
--- a/docs/generators/jaxrs-jersey.md
+++ b/docs/generators/jaxrs-jersey.md
@@ -145,10 +145,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -156,6 +160,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -168,14 +174,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -191,19 +201,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -211,8 +223,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/jaxrs-resteasy-eap.md b/docs/generators/jaxrs-resteasy-eap.md
index 6973aecf1dba..9dde54d7d561 100644
--- a/docs/generators/jaxrs-resteasy-eap.md
+++ b/docs/generators/jaxrs-resteasy-eap.md
@@ -146,10 +146,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -157,6 +161,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -169,14 +175,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -192,19 +202,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -212,8 +224,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/jaxrs-resteasy.md b/docs/generators/jaxrs-resteasy.md
index f48428ba1c92..f15edc65564c 100644
--- a/docs/generators/jaxrs-resteasy.md
+++ b/docs/generators/jaxrs-resteasy.md
@@ -145,10 +145,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -156,6 +160,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -168,14 +174,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -191,19 +201,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -211,8 +223,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md
index 6f9fb5a40620..877e9390df63 100644
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -153,10 +153,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -164,6 +168,8 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
@@ -176,14 +182,18 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -199,19 +209,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -219,8 +231,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/docs/generators/spring.md b/docs/generators/spring.md
index b71cefb3c126..99756a2dbc65 100644
--- a/docs/generators/spring.md
+++ b/docs/generators/spring.md
@@ -174,10 +174,14 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>apiclient</li>
 <li>apiexception</li>
 <li>apiresponse</li>
+<li>array</li>
+<li>arraylist</li>
 <li>assert</li>
+<li>bigdecimal</li>
 <li>boolean</li>
 <li>break</li>
 <li>byte</li>
+<li>byte[]</li>
 <li>case</li>
 <li>catch</li>
 <li>char</li>
@@ -185,26 +189,31 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>configuration</li>
 <li>const</li>
 <li>continue</li>
+<li>date</li>
+<li>datetime</li>
 <li>default</li>
 <li>do</li>
 <li>double</li>
 <li>else</li>
 <li>enum</li>
 <li>extends</li>
-<li>file</li>
 <li>final</li>
 <li>finally</li>
 <li>float</li>
 <li>for</li>
 <li>goto</li>
+<li>hashmap</li>
 <li>if</li>
 <li>implements</li>
 <li>import</li>
 <li>instanceof</li>
 <li>int</li>
+<li>integer</li>
 <li>interface</li>
+<li>linkedhashset</li>
 <li>list</li>
 <li>localdate</li>
+<li>localdatetime</li>
 <li>localreturntype</li>
 <li>localtime</li>
 <li>localvaraccept</li>
@@ -220,19 +229,21 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>localvarpostbody</li>
 <li>localvarqueryparams</li>
 <li>long</li>
+<li>map</li>
 <li>native</li>
 <li>new</li>
 <li>null</li>
 <li>object</li>
-<li>offsetdatetime</li>
 <li>package</li>
 <li>private</li>
 <li>protected</li>
 <li>public</li>
 <li>return</li>
+<li>set</li>
 <li>short</li>
 <li>static</li>
 <li>strictfp</li>
+<li>string</li>
 <li>stringutil</li>
 <li>super</li>
 <li>switch</li>
@@ -240,8 +251,11 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 <li>this</li>
 <li>throw</li>
 <li>throws</li>
+<li>timestamp</li>
 <li>transient</li>
 <li>try</li>
+<li>uri</li>
+<li>uuid</li>
 <li>void</li>
 <li>volatile</li>
 <li>while</li>
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index 52e71fc22b79..53e8e6e49440 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -228,7 +228,7 @@ public AbstractJavaCodegen() {
         setReservedWordsLowerCase(
                 Arrays.asList(
                         // special words
-                        "object", "list", "file",
+                        "list", "file",
                         // used as internal variables, can collide with parameter names
                         "localVarPath", "localVarQueryParams", "localVarCollectionQueryParams",
                         "localVarHeaderParams", "localVarCookieParams", "localVarFormParams", "localVarPostBody",
@@ -238,12 +238,12 @@ public AbstractJavaCodegen() {
 
                         // language reserved words
                         "_", "abstract", "continue", "for", "new", "switch", "assert",
-                        "default", "if", "package", "synchronized", "boolean", "do", "goto", "private",
-                        "this", "break", "double", "implements", "protected", "throw", "byte", "else",
+                        "default", "if", "package", "synchronized", "do", "goto", "private",
+                        "this", "break", "implements", "protected", "throw", "byte", "else",
                         "import", "public", "throws", "case", "enum", "instanceof", "return", "transient",
                         "catch", "extends", "int", "short", "try", "char", "final", "interface", "static",
-                        "void", "class", "finally", "long", "strictfp", "volatile", "const", "float",
-                        "native", "super", "while", "null", "offsetdatetime", "localdate", "localtime")
+                        "void", "class", "finally", "strictfp", "volatile", "const",
+                        "native", "super", "while", "null")
         );
 
         languageSpecificPrimitives = Sets.newHashSet("String",
@@ -281,6 +281,8 @@ public AbstractJavaCodegen() {
         importMapping.put("LocalDate", "org.joda.time.*");
         importMapping.put("LocalTime", "org.joda.time.*");
 
+        updateReservedWords();
+
         cliOptions.add(new CliOption(CodegenConstants.MODEL_PACKAGE, CodegenConstants.MODEL_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.API_PACKAGE, CodegenConstants.API_PACKAGE_DESC));
         cliOptions.add(new CliOption(CodegenConstants.INVOKER_PACKAGE, CodegenConstants.INVOKER_PACKAGE_DESC).defaultValue(this.getInvokerPackage()));
@@ -628,6 +630,8 @@ public void processOpts() {
             additionalProperties.put("legacyDates", "true");
         }
 
+        updateReservedWords();
+
         convertPropertyToStringAndWriteBack(TEST_OUTPUT, this::setOutputTestFolder);
         convertPropertyToBooleanAndWriteBack(USE_JAKARTA_EE, this::setUseJakartaEe);
         if (useJakartaEe) {
@@ -795,6 +799,13 @@ protected void applyJakartaPackage() {
         writePropertyBack(JAVAX_PACKAGE, "jakarta");
     }
 
+    protected void updateReservedWords() {
+        final List<String> newReservedWords = new ArrayList<>(reservedWords());
+        newReservedWords.addAll(importMapping().keySet());
+        newReservedWords.addAll(languageSpecificPrimitives());
+        setReservedWordsLowerCase(newReservedWords);
+    }
+
     @Override
     public String escapeReservedWord(String name) {
         if (this.reservedWordsMappings().containsKey(name)) {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java
index 1b194c7a4da9..31e112ac4900 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GroovyClientCodegen.java
@@ -68,6 +68,7 @@ public GroovyClientCodegen() {
         languageSpecificPrimitives.add("File");
         languageSpecificPrimitives.add("Map");
         languageSpecificPrimitives.add("List");
+        updateReservedWords();
 
         // this must not be OS-specific
         sourceFolder = projectFolder + "/groovy";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java
index 1b72f5699acd..895c4173011d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFClientCodegen.java
@@ -85,6 +85,7 @@ public JavaCXFClientCodegen() {
 
         typeMapping.put("date", "LocalDate");
         importMapping.put("LocalDate", "org.joda.time.LocalDate");
+        updateReservedWords();
 
         embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf";
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java
index a1efb7ae720e..9c2819a5729f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaCXFServerCodegen.java
@@ -99,6 +99,7 @@ public JavaCXFServerCodegen() {
         typeMapping.put("date", "LocalDate");
 
         importMapping.put("LocalDate", "org.joda.time.LocalDate");
+        updateReservedWords();
 
         embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "cxf";
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index 397b41b17418..be866d30f39d 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -587,6 +587,7 @@ public void processOpts() {
         } else if (VERTX.equals(getLibrary())) {
             typeMapping.put("file", "AsyncFile");
             importMapping.put("AsyncFile", "io.vertx.core.file.AsyncFile");
+            updateReservedWords();
             forceSerializationLibrary(SERIALIZATION_LIBRARY_JACKSON);
             apiTemplateFiles.put("apiImpl.mustache", "Impl.java");
             apiTemplateFiles.put("rxApiImpl.mustache", ".java");
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java
index 980f2051ade1..744864771456 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonClientCodegen.java
@@ -201,6 +201,7 @@ public void processOpts() {
             importMapping.put("StringJoiner", "java.util.StringJoiner");
             importMapping.put("WebClientRequestHeaders", "io.helidon.webclient.WebClientRequestHeaders");
             importMapping.put("Pair", invokerPackage + ".Pair");
+            updateReservedWords();
 
 
             List<SupportingFile> modifiable = new ArrayList<>();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java
index 4e4cceb49603..01c95fb3fc78 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaHelidonServerCodegen.java
@@ -153,6 +153,7 @@ public void processOpts() {
         importMapping.put("ObjectMapper", "com.fasterxml.jackson.databind.ObjectMapper");
         importMapping.put("Jsonb", rootJavaEEPackage() + ".json.bind.Jsonb");
         importMapping.put("JsonbBuilder", rootJavaEEPackage() + ".json.bind.JsonbBuilder");
+        updateReservedWords();
 
         convertPropertyToBooleanAndWriteBack(USE_ABSTRACT_CLASS, value -> useAbstractClass = value);
         convertPropertyToBooleanAndWriteBack(GRADLE_PROJECT, value -> gradleProject = value);
@@ -205,6 +206,7 @@ public void processOpts() {
                 importMapping.put("ByteArrayInputStream", "java.io.ByteArrayInputStream");
             }
             importMapping.put("Handler", "io.helidon.webserver.Handler");
+            updateReservedWords();
             processSupportingFiles(modifiable, unmodifiable);
         } else {
             LOGGER.error("Unknown library option (-l/--library): {}", getLibrary());
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
index c0cc50bb49f5..82ca45d0bd39 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
@@ -107,6 +107,7 @@ public JavaJAXRSSpecServerCodegen() {
         typeMapping.put("date", "LocalDate");
 
         importMapping.put("LocalDate", "org.joda.time.LocalDate");
+        updateReservedWords();
 
         super.embeddedTemplateDir = templateDir = JAXRS_TEMPLATE_DIRECTORY_NAME + File.separator + "spec";
 
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java
index 8e19ac226ab5..a60d7bb61449 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautAbstractCodegen.java
@@ -364,6 +364,7 @@ public void processOpts() {
         importMapping.putIfAbsent("LocalDateTime", "java.time.LocalDateTime");
         importMapping.putIfAbsent("OffsetDateTime", "java.time.OffsetDateTime");
         importMapping.putIfAbsent("LocalDate", "java.time.LocalDate");
+        updateReservedWords();
 
         // Add documentation files
         modelDocTemplateFiles.clear();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java
index 7ff2fb2a1f35..ea011b7b2dd3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaMicronautServerCodegen.java
@@ -72,6 +72,7 @@ public JavaMicronautServerCodegen() {
         // It could be also StreamingFileUpload
         typeMapping.put("file", "CompletedFileUpload");
         importMapping.put("CompletedFileUpload", "io.micronaut.http.multipart.CompletedFileUpload");
+        updateReservedWords();
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
index 72deea70ce28..a17728ded694 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaPlayFrameworkCodegen.java
@@ -205,6 +205,8 @@ public void processOpts() {
 
         importMapping.put("InputStream", "java.io.InputStream");
         typeMapping.put("file", "InputStream");
+
+        updateReservedWords();
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java
index 8d8701b63723..31ae2918c49e 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXServerCodegen.java
@@ -160,6 +160,7 @@ public void processOpts() {
         importMapping.put("JsonProperty", "com.fasterxml.jackson.annotation.JsonProperty");
         importMapping.put("JsonValue", "com.fasterxml.jackson.annotation.JsonValue");
         importMapping.put("MainApiException", rootPackage + ".MainApiException");
+        updateReservedWords();
 
         modelDocTemplateFiles.clear();
         apiDocTemplateFiles.clear();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXWebServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXWebServerCodegen.java
index c55d972fa4eb..087e0ef5a429 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXWebServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaVertXWebServerCodegen.java
@@ -104,6 +104,7 @@ public void processOpts() {
         importMapping.put("JsonValue", "com.fasterxml.jackson.annotation.JsonValue");
         importMapping.put("FileUpload", "io.vertx.ext.web.FileUpload");
         importMapping.put("JsonObject", "io.vertx.core.json.JsonObject");
+        updateReservedWords();
 
         modelDocTemplateFiles.clear();
         apiDocTemplateFiles.clear();
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
index cb3c52a99c75..811c721a149a 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/SpringCodegen.java
@@ -337,10 +337,6 @@ public void processOpts() {
                 .map(e -> Pair.of(e.getKey(), e.getValue().toString())).collect(Collectors.toList());
         additionalProperties.put("configOptions", configOptions);
 
-        // TODO remove "file" from reserved word list as feign client doesn't support using `baseName`
-        // as the parameter name yet
-        reservedWords.remove("file");
-
         // Process java8 option before common java ones to change the default
         // dateLibrary to java8.
         LOGGER.info("----------------------------------");
@@ -453,6 +449,7 @@ public void processOpts() {
         if (isUseSpringBoot3()) {
             importMapping.put("ParameterObject", "org.springdoc.core.annotations.ParameterObject");
         }
+        updateReservedWords();
 
         if (interfaceOnly && delegatePattern) {
             delegateMethod = true;
@@ -629,6 +626,15 @@ public void processOpts() {
         supportsAdditionalPropertiesWithComposedSchema = true;
     }
 
+    @Override
+    protected void updateReservedWords() {
+        super.updateReservedWords();
+
+        // TODO remove "file" from reserved word list as feign client doesn't support using `baseName`
+        // as the parameter name yet
+        reservedWords.remove("file");
+    }
+
     private boolean containsEnums() {
         if (openAPI == null) {
             return false;
@@ -991,6 +997,7 @@ public CodegenOperation fromOperation(String path, String httpMethod, Operation
         // this allows to use a custom Pageable schema without importing Spring Pageable.
         if (Boolean.TRUE.equals(operation.getExtensions().get("x-spring-paginated"))) {
             importMapping.put("Pageable", "org.springframework.data.domain.Pageable");
+            updateReservedWords();
         }
 
         Set<String> provideArgsClassSet = reformatProvideArgsParams(operation);
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
index 91c36f642936..5f101e57ddb8 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelTest.java
@@ -975,7 +975,7 @@ public void modelWithWrappedXmlTest() {
         Assert.assertEquals(property2.getter, "getArray");
         Assert.assertEquals(property2.setter, "setArray");
         Assert.assertEquals(property2.dataType, "List<String>");
-        Assert.assertEquals(property2.name, "array");
+        Assert.assertEquals(property2.name, "_array");
         Assert.assertEquals(property2.defaultValue, "new ArrayList<>()");
         Assert.assertEquals(property2.baseType, "List");
         Assert.assertTrue(property2.isContainer);
@@ -985,7 +985,7 @@ public void modelWithWrappedXmlTest() {
         Assert.assertNotNull(property2.items);
         CodegenProperty items = property2.items;
         Assert.assertEquals(items.xmlName, "i");
-        Assert.assertEquals(items.baseName, "array");
+        Assert.assertEquals(items.baseName, "_array");
     }
 
     @Test(description = "convert a boolean parameter")
diff --git a/samples/client/echo_api/java/apache-httpclient/docs/DataQuery.md b/samples/client/echo_api/java/apache-httpclient/docs/DataQuery.md
index 338c467b2d56..35bcc72f1786 100644
--- a/samples/client/echo_api/java/apache-httpclient/docs/DataQuery.md
+++ b/samples/client/echo_api/java/apache-httpclient/docs/DataQuery.md
@@ -9,7 +9,7 @@
 |------------ | ------------- | ------------- | -------------|
 |**suffix** | **String** | test suffix |  [optional] |
 |**text** | **String** | Some text containing white spaces |  [optional] |
-|**date** | **OffsetDateTime** | A date |  [optional] |
+|**_date** | **OffsetDateTime** | A date |  [optional] |
 
 
 
diff --git a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java
index 51a75206c23a..043c7cecb148 100644
--- a/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/apache-httpclient/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -48,7 +48,7 @@ public class DataQuery extends Query {
   private String text;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private OffsetDateTime date;
+  private OffsetDateTime _date;
 
   public DataQuery() {
 
@@ -104,29 +104,29 @@ public void setText(String text) {
     this.text = text;
   }
 
-  public DataQuery date(OffsetDateTime date) {
+  public DataQuery _date(OffsetDateTime _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
    * A date
-   * @return date
+   * @return _date
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDate(OffsetDateTime date) {
-    this.date = date;
+  public void setDate(OffsetDateTime _date) {
+    this._date = _date;
   }
 
   @Override
@@ -152,13 +152,13 @@ public boolean equals(Object o) {
     DataQuery dataQuery = (DataQuery) o;
     return Objects.equals(this.suffix, dataQuery.suffix) &&
         Objects.equals(this.text, dataQuery.text) &&
-        Objects.equals(this.date, dataQuery.date) &&
+        Objects.equals(this._date, dataQuery._date) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(suffix, text, date, super.hashCode());
+    return Objects.hash(suffix, text, _date, super.hashCode());
   }
 
   @Override
@@ -168,7 +168,7 @@ public String toString() {
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    suffix: ").append(toIndentedString(suffix)).append("\n");
     sb.append("    text: ").append(toIndentedString(text)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java
index 63b5d3be120f..8d62dad8d35c 100644
--- a/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/feign-gson/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -42,7 +42,7 @@ public class DataQuery extends Query {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private OffsetDateTime date;
+  private OffsetDateTime _date;
 
   public DataQuery() {
 
@@ -92,25 +92,25 @@ public void setText(String text) {
   }
 
 
-  public DataQuery date(OffsetDateTime date) {
+  public DataQuery _date(OffsetDateTime _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
    * A date
-   * @return date
+   * @return _date
    */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDate() {
-    return date;
+    return _date;
   }
 
 
-  public void setDate(OffsetDateTime date) {
-    this.date = date;
+  public void setDate(OffsetDateTime _date) {
+    this._date = _date;
   }
 
 
@@ -125,13 +125,13 @@ public boolean equals(Object o) {
     DataQuery dataQuery = (DataQuery) o;
     return Objects.equals(this.suffix, dataQuery.suffix) &&
         Objects.equals(this.text, dataQuery.text) &&
-        Objects.equals(this.date, dataQuery.date) &&
+        Objects.equals(this._date, dataQuery._date) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(suffix, text, date, super.hashCode());
+    return Objects.hash(suffix, text, _date, super.hashCode());
   }
 
   @Override
@@ -141,7 +141,7 @@ public String toString() {
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    suffix: ").append(toIndentedString(suffix)).append("\n");
     sb.append("    text: ").append(toIndentedString(text)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/echo_api/java/native/docs/DataQuery.md b/samples/client/echo_api/java/native/docs/DataQuery.md
index d61a881571c0..6ebe4cae4003 100644
--- a/samples/client/echo_api/java/native/docs/DataQuery.md
+++ b/samples/client/echo_api/java/native/docs/DataQuery.md
@@ -9,7 +9,7 @@
 |------------ | ------------- | ------------- | -------------|
 |**suffix** | **String** | test suffix |  [optional] |
 |**text** | **String** | Some text containing white spaces |  [optional] |
-|**date** | **Instant** | A date |  [optional] |
+|**_date** | **Instant** | A date |  [optional] |
 
 
 
diff --git a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java
index b02b053a95e6..0d192cbefffb 100644
--- a/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/native/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -50,7 +50,7 @@ public class DataQuery extends Query {
   private String text;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private Instant date;
+  private Instant _date;
 
   public DataQuery() { 
   }
@@ -103,27 +103,27 @@ public void setText(String text) {
   }
 
 
-  public DataQuery date(Instant date) {
-    this.date = date;
+  public DataQuery _date(Instant _date) {
+    this._date = _date;
     return this;
   }
 
   /**
    * A date
-   * @return date
+   * @return _date
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Instant getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDate(Instant date) {
-    this.date = date;
+  public void setDate(Instant _date) {
+    this._date = _date;
   }
 
 
@@ -153,13 +153,13 @@ public boolean equals(Object o) {
     DataQuery dataQuery = (DataQuery) o;
     return Objects.equals(this.suffix, dataQuery.suffix) &&
         Objects.equals(this.text, dataQuery.text) &&
-        Objects.equals(this.date, dataQuery.date) &&
+        Objects.equals(this._date, dataQuery._date) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(suffix, text, date, super.hashCode());
+    return Objects.hash(suffix, text, _date, super.hashCode());
   }
 
   @Override
@@ -169,7 +169,7 @@ public String toString() {
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    suffix: ").append(toIndentedString(suffix)).append("\n");
     sb.append("    text: ").append(toIndentedString(text)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/echo_api/java/okhttp-gson/docs/DataQuery.md b/samples/client/echo_api/java/okhttp-gson/docs/DataQuery.md
index 338c467b2d56..35bcc72f1786 100644
--- a/samples/client/echo_api/java/okhttp-gson/docs/DataQuery.md
+++ b/samples/client/echo_api/java/okhttp-gson/docs/DataQuery.md
@@ -9,7 +9,7 @@
 |------------ | ------------- | ------------- | -------------|
 |**suffix** | **String** | test suffix |  [optional] |
 |**text** | **String** | Some text containing white spaces |  [optional] |
-|**date** | **OffsetDateTime** | A date |  [optional] |
+|**_date** | **OffsetDateTime** | A date |  [optional] |
 
 
 
diff --git a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java
index bec882d1bed8..701fe0f8afd5 100644
--- a/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/okhttp-gson/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -65,7 +65,7 @@ public class DataQuery extends Query {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private OffsetDateTime date;
+  private OffsetDateTime _date;
 
   public DataQuery() {
   }
@@ -108,22 +108,22 @@ public void setText(String text) {
   }
 
 
-  public DataQuery date(OffsetDateTime date) {
-    this.date = date;
+  public DataQuery _date(OffsetDateTime _date) {
+    this._date = _date;
     return this;
   }
 
   /**
    * A date
-   * @return date
+   * @return _date
    */
   @javax.annotation.Nullable
   public OffsetDateTime getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(OffsetDateTime date) {
-    this.date = date;
+  public void setDate(OffsetDateTime _date) {
+    this._date = _date;
   }
 
 
@@ -139,13 +139,13 @@ public boolean equals(Object o) {
     DataQuery dataQuery = (DataQuery) o;
     return Objects.equals(this.suffix, dataQuery.suffix) &&
         Objects.equals(this.text, dataQuery.text) &&
-        Objects.equals(this.date, dataQuery.date) &&
+        Objects.equals(this._date, dataQuery._date) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(suffix, text, date, super.hashCode());
+    return Objects.hash(suffix, text, _date, super.hashCode());
   }
 
   @Override
@@ -155,7 +155,7 @@ public String toString() {
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    suffix: ").append(toIndentedString(suffix)).append("\n");
     sb.append("    text: ").append(toIndentedString(text)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/echo_api/java/restclient/docs/DataQuery.md b/samples/client/echo_api/java/restclient/docs/DataQuery.md
index d61a881571c0..6ebe4cae4003 100644
--- a/samples/client/echo_api/java/restclient/docs/DataQuery.md
+++ b/samples/client/echo_api/java/restclient/docs/DataQuery.md
@@ -9,7 +9,7 @@
 |------------ | ------------- | ------------- | -------------|
 |**suffix** | **String** | test suffix |  [optional] |
 |**text** | **String** | Some text containing white spaces |  [optional] |
-|**date** | **Instant** | A date |  [optional] |
+|**_date** | **Instant** | A date |  [optional] |
 
 
 
diff --git a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DataQuery.java
index 223b3aea33f9..5259738d697f 100644
--- a/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/restclient/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -45,7 +45,7 @@ public class DataQuery extends Query {
   private String text;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private Instant date;
+  private Instant _date;
 
   public DataQuery() {
 
@@ -101,29 +101,29 @@ public void setText(String text) {
     this.text = text;
   }
 
-  public DataQuery date(Instant date) {
+  public DataQuery _date(Instant _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
    * A date
-   * @return date
+   * @return _date
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Instant getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDate(Instant date) {
-    this.date = date;
+  public void setDate(Instant _date) {
+    this._date = _date;
   }
 
   @Override
@@ -149,13 +149,13 @@ public boolean equals(Object o) {
     DataQuery dataQuery = (DataQuery) o;
     return Objects.equals(this.suffix, dataQuery.suffix) &&
         Objects.equals(this.text, dataQuery.text) &&
-        Objects.equals(this.date, dataQuery.date) &&
+        Objects.equals(this._date, dataQuery._date) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(suffix, text, date, super.hashCode());
+    return Objects.hash(suffix, text, _date, super.hashCode());
   }
 
   @Override
@@ -165,7 +165,7 @@ public String toString() {
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    suffix: ").append(toIndentedString(suffix)).append("\n");
     sb.append("    text: ").append(toIndentedString(text)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/echo_api/java/resteasy/docs/DataQuery.md b/samples/client/echo_api/java/resteasy/docs/DataQuery.md
index 338c467b2d56..35bcc72f1786 100644
--- a/samples/client/echo_api/java/resteasy/docs/DataQuery.md
+++ b/samples/client/echo_api/java/resteasy/docs/DataQuery.md
@@ -9,7 +9,7 @@
 |------------ | ------------- | ------------- | -------------|
 |**suffix** | **String** | test suffix |  [optional] |
 |**text** | **String** | Some text containing white spaces |  [optional] |
-|**date** | **OffsetDateTime** | A date |  [optional] |
+|**_date** | **OffsetDateTime** | A date |  [optional] |
 
 
 
diff --git a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java
index 995f120196e5..8c0e29d73d19 100644
--- a/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/resteasy/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -45,7 +45,7 @@ public class DataQuery extends Query {
   private String text;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private OffsetDateTime date;
+  private OffsetDateTime _date;
 
   public DataQuery() {
 
@@ -101,29 +101,29 @@ public void setText(String text) {
     this.text = text;
   }
 
-  public DataQuery date(OffsetDateTime date) {
+  public DataQuery _date(OffsetDateTime _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
    * A date
-   * @return date
+   * @return _date
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDate(OffsetDateTime date) {
-    this.date = date;
+  public void setDate(OffsetDateTime _date) {
+    this._date = _date;
   }
 
   @Override
@@ -149,13 +149,13 @@ public boolean equals(Object o) {
     DataQuery dataQuery = (DataQuery) o;
     return Objects.equals(this.suffix, dataQuery.suffix) &&
         Objects.equals(this.text, dataQuery.text) &&
-        Objects.equals(this.date, dataQuery.date) &&
+        Objects.equals(this._date, dataQuery._date) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(suffix, text, date, super.hashCode());
+    return Objects.hash(suffix, text, _date, super.hashCode());
   }
 
   @Override
@@ -165,7 +165,7 @@ public String toString() {
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    suffix: ").append(toIndentedString(suffix)).append("\n");
     sb.append("    text: ").append(toIndentedString(text)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/echo_api/java/resttemplate/docs/DataQuery.md b/samples/client/echo_api/java/resttemplate/docs/DataQuery.md
index 338c467b2d56..35bcc72f1786 100644
--- a/samples/client/echo_api/java/resttemplate/docs/DataQuery.md
+++ b/samples/client/echo_api/java/resttemplate/docs/DataQuery.md
@@ -9,7 +9,7 @@
 |------------ | ------------- | ------------- | -------------|
 |**suffix** | **String** | test suffix |  [optional] |
 |**text** | **String** | Some text containing white spaces |  [optional] |
-|**date** | **OffsetDateTime** | A date |  [optional] |
+|**_date** | **OffsetDateTime** | A date |  [optional] |
 
 
 
diff --git a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java
index 995f120196e5..8c0e29d73d19 100644
--- a/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java
+++ b/samples/client/echo_api/java/resttemplate/src/main/java/org/openapitools/client/model/DataQuery.java
@@ -45,7 +45,7 @@ public class DataQuery extends Query {
   private String text;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private OffsetDateTime date;
+  private OffsetDateTime _date;
 
   public DataQuery() {
 
@@ -101,29 +101,29 @@ public void setText(String text) {
     this.text = text;
   }
 
-  public DataQuery date(OffsetDateTime date) {
+  public DataQuery _date(OffsetDateTime _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
    * A date
-   * @return date
+   * @return _date
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDate(OffsetDateTime date) {
-    this.date = date;
+  public void setDate(OffsetDateTime _date) {
+    this._date = _date;
   }
 
   @Override
@@ -149,13 +149,13 @@ public boolean equals(Object o) {
     DataQuery dataQuery = (DataQuery) o;
     return Objects.equals(this.suffix, dataQuery.suffix) &&
         Objects.equals(this.text, dataQuery.text) &&
-        Objects.equals(this.date, dataQuery.date) &&
+        Objects.equals(this._date, dataQuery._date) &&
         super.equals(o);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(suffix, text, date, super.hashCode());
+    return Objects.hash(suffix, text, _date, super.hashCode());
   }
 
   @Override
@@ -165,7 +165,7 @@ public String toString() {
     sb.append("    ").append(toIndentedString(super.toString())).append("\n");
     sb.append("    suffix: ").append(toIndentedString(suffix)).append("\n");
     sb.append("    text: ").append(toIndentedString(text)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md
index 4cdd475689dd..5593ec250d46 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/FakeApi.md
@@ -477,7 +477,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -492,14 +492,14 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/FooGetDefaultResponse.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/FormatTest.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/FormatTest.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java-helidon-client/v3/mp/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java-helidon-client/v3/mp/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java
index 717ed9436919..cab0b1f72a29 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -143,7 +143,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String string, @FormParam("binary") File binary, @FormParam("date") LocalDate date, @FormParam("dateTime") OffsetDateTime dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException;
+    void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer _integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String _string, @FormParam("binary") File binary, @FormParam("date") LocalDate _date, @FormParam("dateTime") OffsetDateTime _dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException;
 
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 27971dae9168..f1defcba9dd8 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -24,25 +24,25 @@
 
 public class FooGetDefaultResponse  {
   
-  private Foo string;
+  private Foo _string;
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public Foo getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
@@ -55,7 +55,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/FormatTest.java
index 1f3fc84b65ae..b4ceece195ab 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 public class FormatTest  {
   
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,17 +42,17 @@ public class FormatTest  {
 
   private BigDecimal decimal;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private File binary;
 
-  private LocalDate date;
+  private LocalDate _date;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
@@ -67,24 +67,24 @@ public class FormatTest  {
   private String patternWithDigitsAndDelimiter;
 
  /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
   **/
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   /**
-    * Set integer
+    * Set _integer
   **/
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -217,22 +217,22 @@ public FormatTest decimal(BigDecimal decimal) {
   }
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public String getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -277,62 +277,62 @@ public FormatTest binary(File binary) {
   }
 
  /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
   **/
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   /**
-    * Set date
+    * Set _date
   **/
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -405,19 +405,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index de307d1e2860..5ca52e49a9a6 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,74 +28,74 @@
 
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
-  private UUID uuid;
+  private UUID _uuid;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private Map<String, Animal> map = null;
+  private Map<String, Animal> _map = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
   **/
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   /**
-    * Set map
+    * Set _map
   **/
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    this.map.put(key, mapItem);
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    this._map.put(key, _mapItem);
     return this;
   }
 
@@ -108,9 +108,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 254b7df22cb4..29c5809eaab0 100644
--- a/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java-helidon-client/v3/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -28,7 +28,7 @@
 
 public class ObjectWithDeprecatedFields  {
   
-  private String uuid;
+  private String _uuid;
 
   private BigDecimal id;
 
@@ -37,22 +37,22 @@ public class ObjectWithDeprecatedFields  {
   private List<String> bars = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -136,7 +136,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/FooGetDefaultResponse.md b/samples/client/petstore/java-helidon-client/v3/se/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/FormatTest.md b/samples/client/petstore/java-helidon-client/v3/se/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/FormatTest.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java-helidon-client/v3/se/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java-helidon-client/v3/se/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java-helidon-client/v3/se/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java-helidon-client/v3/se/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java
index a7f954df9a69..375becb7e36a 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -94,19 +94,19 @@ public interface FakeApi {
   * @param _double None (required)
   * @param patternWithoutDelimiter None (required)
   * @param _byte None (required)
-  * @param integer None (optional)
+  * @param _integer None (optional)
   * @param int32 None (optional)
   * @param int64 None (optional)
   * @param _float None (optional)
-  * @param string None (optional)
+  * @param _string None (optional)
   * @param binary None (optional)
-  * @param date None (optional)
-  * @param dateTime None (optional)
+  * @param _date None (optional)
+  * @param _dateTime None (optional)
   * @param password None (optional)
   * @param paramCallback None (optional)
   * @return {@code ApiResponse<Void>}
   */
-  ApiResponse<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback);
+  ApiResponse<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback);
 
  /**
   * To test enum parameters
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
index 8f6e7f539c0c..3254b5795f99 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/api/FakeApiImpl.java
@@ -598,13 +598,13 @@ protected ApiResponse<Client> testClientModelSubmit(WebClientRequestBuilder webC
   }
 
   @Override
-  public ApiResponse<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) {
+  public ApiResponse<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) {
     Objects.requireNonNull(number, "Required parameter 'number' not specified");
     Objects.requireNonNull(_double, "Required parameter '_double' not specified");
     Objects.requireNonNull(patternWithoutDelimiter, "Required parameter 'patternWithoutDelimiter' not specified");
     Objects.requireNonNull(_byte, "Required parameter '_byte' not specified");
-    WebClientRequestBuilder webClientRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
-    return testEndpointParametersSubmit(webClientRequestBuilder, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    WebClientRequestBuilder webClientRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
+    return testEndpointParametersSubmit(webClientRequestBuilder, number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
   }
 
   /**
@@ -615,19 +615,19 @@ public ApiResponse<Void> testEndpointParameters(BigDecimal number, Double _doubl
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return WebClientRequestBuilder for testEndpointParameters
    */
-  protected WebClientRequestBuilder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) {
+  protected WebClientRequestBuilder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) {
     WebClientRequestBuilder webClientRequestBuilder = apiClient.webClient()
             .method("POST");
 
@@ -647,32 +647,32 @@ protected WebClientRequestBuilder testEndpointParametersRequestBuilder(BigDecima
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return {@code ApiResponse<Void>} for the submitted request
    */
-  protected ApiResponse<Void> testEndpointParametersSubmit(WebClientRequestBuilder webClientRequestBuilder, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) {
+  protected ApiResponse<Void> testEndpointParametersSubmit(WebClientRequestBuilder webClientRequestBuilder, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) {
     String formParams = new StringJoiner("&")
-            .add("integer=" + integer)
+            .add("integer=" + _integer)
             .add("int32=" + int32)
             .add("int64=" + int64)
             .add("number=" + number)
             .add("float=" + _float)
             .add("double=" + _double)
-            .add("string=" + string)
+            .add("string=" + _string)
             .add("pattern_without_delimiter=" + patternWithoutDelimiter)
             .add("byte=" + _byte)
             .add("binary=" + binary)
-            .add("date=" + date)
-            .add("dateTime=" + dateTime)
+            .add("date=" + _date)
+            .add("dateTime=" + _dateTime)
             .add("password=" + password)
             .add("callback=" + paramCallback)
             .toString();
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 27971dae9168..f1defcba9dd8 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -24,25 +24,25 @@
 
 public class FooGetDefaultResponse  {
   
-  private Foo string;
+  private Foo _string;
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public Foo getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
@@ -55,7 +55,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/FormatTest.java
index 1f3fc84b65ae..b4ceece195ab 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 public class FormatTest  {
   
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,17 +42,17 @@ public class FormatTest  {
 
   private BigDecimal decimal;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private File binary;
 
-  private LocalDate date;
+  private LocalDate _date;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
@@ -67,24 +67,24 @@ public class FormatTest  {
   private String patternWithDigitsAndDelimiter;
 
  /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
   **/
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   /**
-    * Set integer
+    * Set _integer
   **/
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -217,22 +217,22 @@ public FormatTest decimal(BigDecimal decimal) {
   }
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public String getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -277,62 +277,62 @@ public FormatTest binary(File binary) {
   }
 
  /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
   **/
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   /**
-    * Set date
+    * Set _date
   **/
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -405,19 +405,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index de307d1e2860..5ca52e49a9a6 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,74 +28,74 @@
 
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
-  private UUID uuid;
+  private UUID _uuid;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private Map<String, Animal> map = null;
+  private Map<String, Animal> _map = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
   **/
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   /**
-    * Set map
+    * Set _map
   **/
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    this.map.put(key, mapItem);
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    this._map.put(key, _mapItem);
     return this;
   }
 
@@ -108,9 +108,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 254b7df22cb4..29c5809eaab0 100644
--- a/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java-helidon-client/v3/se/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -28,7 +28,7 @@
 
 public class ObjectWithDeprecatedFields  {
   
-  private String uuid;
+  private String _uuid;
 
   private BigDecimal id;
 
@@ -37,22 +37,22 @@ public class ObjectWithDeprecatedFields  {
   private List<String> bars = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -136,7 +136,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md
index 4cdd475689dd..5593ec250d46 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/FakeApi.md
@@ -477,7 +477,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -492,14 +492,14 @@ Fake endpoint for testing various parameters 假端點 偽のエンドポイン
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/FooGetDefaultResponse.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/FormatTest.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/FormatTest.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java-helidon-client/v4/mp/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java-helidon-client/v4/mp/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java
index 717ed9436919..cab0b1f72a29 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -143,7 +143,7 @@ public interface FakeApi  {
     @POST
     
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String string, @FormParam("binary") File binary, @FormParam("date") LocalDate date, @FormParam("dateTime") OffsetDateTime dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException;
+    void testEndpointParameters(@FormParam("number") BigDecimal number, @FormParam("double") Double _double, @FormParam("pattern_without_delimiter") String patternWithoutDelimiter, @FormParam("byte") byte[] _byte, @FormParam("integer") Integer _integer, @FormParam("int32") Integer int32, @FormParam("int64") Long int64, @FormParam("float") Float _float, @FormParam("string") String _string, @FormParam("binary") File binary, @FormParam("date") LocalDate _date, @FormParam("dateTime") OffsetDateTime _dateTime, @FormParam("password") String password, @FormParam("callback") String paramCallback) throws ApiException, ProcessingException;
 
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 27971dae9168..f1defcba9dd8 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -24,25 +24,25 @@
 
 public class FooGetDefaultResponse  {
   
-  private Foo string;
+  private Foo _string;
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public Foo getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
@@ -55,7 +55,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/FormatTest.java
index 1f3fc84b65ae..b4ceece195ab 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -28,7 +28,7 @@
 
 public class FormatTest  {
   
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,17 +42,17 @@ public class FormatTest  {
 
   private BigDecimal decimal;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private File binary;
 
-  private LocalDate date;
+  private LocalDate _date;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
@@ -67,24 +67,24 @@ public class FormatTest  {
   private String patternWithDigitsAndDelimiter;
 
  /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
   **/
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   /**
-    * Set integer
+    * Set _integer
   **/
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -217,22 +217,22 @@ public FormatTest decimal(BigDecimal decimal) {
   }
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public String getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -277,62 +277,62 @@ public FormatTest binary(File binary) {
   }
 
  /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
   **/
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   /**
-    * Set date
+    * Set _date
   **/
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -405,19 +405,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index de307d1e2860..5ca52e49a9a6 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,74 +28,74 @@
 
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
-  private UUID uuid;
+  private UUID _uuid;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private Map<String, Animal> map = null;
+  private Map<String, Animal> _map = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
   **/
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   /**
-    * Set map
+    * Set _map
   **/
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    this.map.put(key, mapItem);
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    this._map.put(key, _mapItem);
     return this;
   }
 
@@ -108,9 +108,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 254b7df22cb4..29c5809eaab0 100644
--- a/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java-helidon-client/v4/mp/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -28,7 +28,7 @@
 
 public class ObjectWithDeprecatedFields  {
   
-  private String uuid;
+  private String _uuid;
 
   private BigDecimal id;
 
@@ -37,22 +37,22 @@ public class ObjectWithDeprecatedFields  {
   private List<String> bars = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -136,7 +136,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java-micronaut-client/docs/apis/FakeApi.md b/samples/client/petstore/java-micronaut-client/docs/apis/FakeApi.md
index 50260b878f48..d940111b5a1a 100644
--- a/samples/client/petstore/java-micronaut-client/docs/apis/FakeApi.md
+++ b/samples/client/petstore/java-micronaut-client/docs/apis/FakeApi.md
@@ -247,7 +247,7 @@ To test \&quot;client\&quot; model
 <a id="testEndpointParameters"></a>
 # **testEndpointParameters**
 ```java
-Mono<Void> FakeApi.testEndpointParameters(number_doublepatternWithoutDelimiter_byteintegerint32int64_floatstringbinarydatedateTimepasswordparamCallback)
+Mono<Void> FakeApi.testEndpointParameters(number_doublepatternWithoutDelimiter_byte_integerint32int64_float_stringbinary_date_dateTimepasswordparamCallback)
 ```
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -261,14 +261,14 @@ Fake endpoint for testing various parameters  假端點  偽のエンドポイ
 | **_double** | `Double`| None | |
 | **patternWithoutDelimiter** | `String`| None | |
 | **_byte** | `byte[]`| None | |
-| **integer** | `Integer`| None | [optional parameter] |
+| **_integer** | `Integer`| None | [optional parameter] |
 | **int32** | `Integer`| None | [optional parameter] |
 | **int64** | `Long`| None | [optional parameter] |
 | **_float** | `Float`| None | [optional parameter] |
-| **string** | `String`| None | [optional parameter] |
+| **_string** | `String`| None | [optional parameter] |
 | **binary** | `File`| None | [optional parameter] |
-| **date** | `LocalDate`| None | [optional parameter] |
-| **dateTime** | `OffsetDateTime`| None | [optional parameter] |
+| **_date** | `LocalDate`| None | [optional parameter] |
+| **_dateTime** | `OffsetDateTime`| None | [optional parameter] |
 | **password** | `String`| None | [optional parameter] |
 | **paramCallback** | `String`| None | [optional parameter] |
 
diff --git a/samples/client/petstore/java-micronaut-client/docs/models/FormatTest.md b/samples/client/petstore/java-micronaut-client/docs/models/FormatTest.md
index 420fa584ec3f..c0fc9dcda073 100644
--- a/samples/client/petstore/java-micronaut-client/docs/models/FormatTest.md
+++ b/samples/client/petstore/java-micronaut-client/docs/models/FormatTest.md
@@ -8,20 +8,20 @@ The class is defined in **[FormatTest.java](../../src/main/java/org/openapitools
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**integer** | `Integer` |  |  [optional property]
+**_integer** | `Integer` |  |  [optional property]
 **int32** | `Integer` |  |  [optional property]
 **int64** | `Long` |  |  [optional property]
 **number** | `BigDecimal` |  | 
 **_float** | `Float` |  |  [optional property]
 **_double** | `Double` |  |  [optional property]
-**string** | `String` |  |  [optional property]
+**_string** | `String` |  |  [optional property]
 **_byte** | `byte[]` |  | 
 **binary** | `File` |  |  [optional property]
-**date** | `LocalDate` |  | 
-**dateTime** | `OffsetDateTime` |  |  [optional property]
-**uuid** | `UUID` |  |  [optional property]
+**_date** | `LocalDate` |  | 
+**_dateTime** | `OffsetDateTime` |  |  [optional property]
+**_uuid** | `UUID` |  |  [optional property]
 **password** | `String` |  | 
-**bigDecimal** | `BigDecimal` |  |  [optional property]
+**_bigDecimal** | `BigDecimal` |  |  [optional property]
 
 
 
diff --git a/samples/client/petstore/java-micronaut-client/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java-micronaut-client/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
index 5eac3d4d078a..3d49aaa8109e 100644
--- a/samples/client/petstore/java-micronaut-client/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java-micronaut-client/docs/models/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -8,9 +8,9 @@ The class is defined in **[MixedPropertiesAndAdditionalPropertiesClass.java](../
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**uuid** | `UUID` |  |  [optional property]
-**dateTime** | `OffsetDateTime` |  |  [optional property]
-**map** | [`Map&lt;String, Animal&gt;`](Animal.md) |  |  [optional property]
+**_uuid** | `UUID` |  |  [optional property]
+**_dateTime** | `OffsetDateTime` |  |  [optional property]
+**_map** | [`Map&lt;String, Animal&gt;`](Animal.md) |  |  [optional property]
 
 
 
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java
index b69afc3dd3b0..97138799caba 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/api/FakeApi.java
@@ -143,14 +143,14 @@ Mono<ModelClient> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      */
@@ -161,14 +161,14 @@ Mono<Void> testEndpointParameters(
         @NotNull @DecimalMin("67.8") @DecimalMax("123.4") Double _double, 
         @NotNull @Pattern(regexp="^[A-Z].*") String patternWithoutDelimiter, 
         @NotNull byte[] _byte, 
-        @Nullable @Min(10) @Max(100) Integer integer, 
+        @Nullable @Min(10) @Max(100) Integer _integer, 
         @Nullable @Min(20) @Max(200) Integer int32, 
         @Nullable Long int64, 
         @Nullable @DecimalMax("987.6") Float _float, 
-        @Nullable @Pattern(regexp="/[a-z]/i") String string, 
+        @Nullable @Pattern(regexp="/[a-z]/i") String _string, 
         @Nullable File binary, 
-        @Nullable @Format("yyyy-MM-dd") LocalDate date, 
-        @Nullable @Format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") OffsetDateTime dateTime, 
+        @Nullable @Format("yyyy-MM-dd") LocalDate _date, 
+        @Nullable @Format("yyyy-MM-dd'T'HH:mm:ss.SSSXXXX") OffsetDateTime _dateTime, 
         @Nullable @Size(min=10, max=64) String password, 
         @Nullable String paramCallback
     );
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java
index 6d050884ce37..01bfc8b1adab 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/FormatTest.java
@@ -51,7 +51,7 @@
 @Introspected
 public class FormatTest {
     public static final String JSON_PROPERTY_INTEGER = "integer";
-    private Integer integer;
+    private Integer _integer;
 
     public static final String JSON_PROPERTY_INT32 = "int32";
     private Integer int32;
@@ -69,7 +69,7 @@ public class FormatTest {
     private Double _double;
 
     public static final String JSON_PROPERTY_STRING = "string";
-    private String string;
+    private String _string;
 
     public static final String JSON_PROPERTY_BYTE = "byte";
     private byte[] _byte;
@@ -78,32 +78,32 @@ public class FormatTest {
     private File binary;
 
     public static final String JSON_PROPERTY_DATE = "date";
-    private LocalDate date;
+    private LocalDate _date;
 
     public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-    private OffsetDateTime dateTime;
+    private OffsetDateTime _dateTime;
 
     public static final String JSON_PROPERTY_UUID = "uuid";
-    private UUID uuid;
+    private UUID _uuid;
 
     public static final String JSON_PROPERTY_PASSWORD = "password";
     private String password;
 
     public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-    private BigDecimal bigDecimal;
+    private BigDecimal _bigDecimal;
 
     public FormatTest() {
     }
-    public FormatTest integer(Integer integer) {
-        this.integer = integer;
+    public FormatTest _integer(Integer _integer) {
+        this._integer = _integer;
         return this;
     }
 
     /**
-     * Get integer
+     * Get _integer
      * minimum: 10
      * maximum: 100
-     * @return integer
+     * @return _integer
      */
     @Nullable
     @Min(10)
@@ -111,13 +111,13 @@ public FormatTest integer(Integer integer) {
     @JsonProperty(JSON_PROPERTY_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Integer getInteger() {
-        return integer;
+        return _integer;
     }
 
     @JsonProperty(JSON_PROPERTY_INTEGER)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-    public void setInteger(Integer integer) {
-        this.integer = integer;
+    public void setInteger(Integer _integer) {
+        this._integer = _integer;
     }
 
     public FormatTest int32(Integer int32) {
@@ -246,27 +246,27 @@ public void setDouble(Double _double) {
         this._double = _double;
     }
 
-    public FormatTest string(String string) {
-        this.string = string;
+    public FormatTest _string(String _string) {
+        this._string = _string;
         return this;
     }
 
     /**
-     * Get string
-     * @return string
+     * Get _string
+     * @return _string
      */
     @Nullable
     @Pattern(regexp="/[a-z]/i")
     @JsonProperty(JSON_PROPERTY_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public String getString() {
-        return string;
+        return _string;
     }
 
     @JsonProperty(JSON_PROPERTY_STRING)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-    public void setString(String string) {
-        this.string = string;
+    public void setString(String _string) {
+        this._string = _string;
     }
 
     public FormatTest _byte(byte[] _byte) {
@@ -313,74 +313,74 @@ public void setBinary(File binary) {
         this.binary = binary;
     }
 
-    public FormatTest date(LocalDate date) {
-        this.date = date;
+    public FormatTest _date(LocalDate _date) {
+        this._date = _date;
         return this;
     }
 
     /**
-     * Get date
-     * @return date
+     * Get _date
+     * @return _date
      */
     @NotNull
     @JsonProperty(JSON_PROPERTY_DATE)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
     public LocalDate getDate() {
-        return date;
+        return _date;
     }
 
     @JsonProperty(JSON_PROPERTY_DATE)
     @JsonInclude(value = JsonInclude.Include.ALWAYS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    public void setDate(LocalDate date) {
-        this.date = date;
+    public void setDate(LocalDate _date) {
+        this._date = _date;
     }
 
-    public FormatTest dateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
+    public FormatTest _dateTime(OffsetDateTime _dateTime) {
+        this._dateTime = _dateTime;
         return this;
     }
 
     /**
-     * Get dateTime
-     * @return dateTime
+     * Get _dateTime
+     * @return _dateTime
      */
     @Nullable
     @JsonProperty(JSON_PROPERTY_DATE_TIME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX")
     public OffsetDateTime getDateTime() {
-        return dateTime;
+        return _dateTime;
     }
 
     @JsonProperty(JSON_PROPERTY_DATE_TIME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX")
-    public void setDateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
+    public void setDateTime(OffsetDateTime _dateTime) {
+        this._dateTime = _dateTime;
     }
 
-    public FormatTest uuid(UUID uuid) {
-        this.uuid = uuid;
+    public FormatTest _uuid(UUID _uuid) {
+        this._uuid = _uuid;
         return this;
     }
 
     /**
-     * Get uuid
-     * @return uuid
+     * Get _uuid
+     * @return _uuid
      */
     @Nullable
     @JsonProperty(JSON_PROPERTY_UUID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public UUID getUuid() {
-        return uuid;
+        return _uuid;
     }
 
     @JsonProperty(JSON_PROPERTY_UUID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
+    public void setUuid(UUID _uuid) {
+        this._uuid = _uuid;
     }
 
     public FormatTest password(String password) {
@@ -406,26 +406,26 @@ public void setPassword(String password) {
         this.password = password;
     }
 
-    public FormatTest bigDecimal(BigDecimal bigDecimal) {
-        this.bigDecimal = bigDecimal;
+    public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+        this._bigDecimal = _bigDecimal;
         return this;
     }
 
     /**
-     * Get bigDecimal
-     * @return bigDecimal
+     * Get _bigDecimal
+     * @return _bigDecimal
      */
     @Nullable
     @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public BigDecimal getBigDecimal() {
-        return bigDecimal;
+        return _bigDecimal;
     }
 
     @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-    public void setBigDecimal(BigDecimal bigDecimal) {
-        this.bigDecimal = bigDecimal;
+    public void setBigDecimal(BigDecimal _bigDecimal) {
+        this._bigDecimal = _bigDecimal;
     }
 
     @Override
@@ -437,45 +437,45 @@ public boolean equals(Object o) {
             return false;
         }
         FormatTest formatTest = (FormatTest) o;
-        return Objects.equals(this.integer, formatTest.integer) &&
+        return Objects.equals(this._integer, formatTest._integer) &&
             Objects.equals(this.int32, formatTest.int32) &&
             Objects.equals(this.int64, formatTest.int64) &&
             Objects.equals(this.number, formatTest.number) &&
             Objects.equals(this._float, formatTest._float) &&
             Objects.equals(this._double, formatTest._double) &&
-            Objects.equals(this.string, formatTest.string) &&
+            Objects.equals(this._string, formatTest._string) &&
             Arrays.equals(this._byte, formatTest._byte) &&
             Objects.equals(this.binary, formatTest.binary) &&
-            Objects.equals(this.date, formatTest.date) &&
-            Objects.equals(this.dateTime, formatTest.dateTime) &&
-            Objects.equals(this.uuid, formatTest.uuid) &&
+            Objects.equals(this._date, formatTest._date) &&
+            Objects.equals(this._dateTime, formatTest._dateTime) &&
+            Objects.equals(this._uuid, formatTest._uuid) &&
             Objects.equals(this.password, formatTest.password) &&
-            Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+            Objects.equals(this._bigDecimal, formatTest._bigDecimal);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+        return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
     }
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class FormatTest {\n");
-        sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+        sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
         sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
         sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
         sb.append("    number: ").append(toIndentedString(number)).append("\n");
         sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
         sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-        sb.append("    string: ").append(toIndentedString(string)).append("\n");
+        sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
         sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
         sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-        sb.append("    date: ").append(toIndentedString(date)).append("\n");
-        sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-        sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+        sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+        sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+        sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
         sb.append("    password: ").append("*").append("\n");
-        sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+        sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index c0290ee40f05..11304050a111 100644
--- a/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java-micronaut-client/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,90 +39,90 @@
 @Introspected
 public class MixedPropertiesAndAdditionalPropertiesClass {
     public static final String JSON_PROPERTY_UUID = "uuid";
-    private UUID uuid;
+    private UUID _uuid;
 
     public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-    private OffsetDateTime dateTime;
+    private OffsetDateTime _dateTime;
 
     public static final String JSON_PROPERTY_MAP = "map";
-    private Map<String, Animal> map = null;
+    private Map<String, Animal> _map = null;
 
     public MixedPropertiesAndAdditionalPropertiesClass() {
     }
-    public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-        this.uuid = uuid;
+    public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+        this._uuid = _uuid;
         return this;
     }
 
     /**
-     * Get uuid
-     * @return uuid
+     * Get _uuid
+     * @return _uuid
      */
     @Nullable
     @JsonProperty(JSON_PROPERTY_UUID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public UUID getUuid() {
-        return uuid;
+        return _uuid;
     }
 
     @JsonProperty(JSON_PROPERTY_UUID)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
+    public void setUuid(UUID _uuid) {
+        this._uuid = _uuid;
     }
 
-    public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
+    public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+        this._dateTime = _dateTime;
         return this;
     }
 
     /**
-     * Get dateTime
-     * @return dateTime
+     * Get _dateTime
+     * @return _dateTime
      */
     @Nullable
     @JsonProperty(JSON_PROPERTY_DATE_TIME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX")
     public OffsetDateTime getDateTime() {
-        return dateTime;
+        return _dateTime;
     }
 
     @JsonProperty(JSON_PROPERTY_DATE_TIME)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSXXXX")
-    public void setDateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
+    public void setDateTime(OffsetDateTime _dateTime) {
+        this._dateTime = _dateTime;
     }
 
-    public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-        this.map = map;
+    public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+        this._map = _map;
         return this;
     }
 
-    public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-        if (this.map == null) {
-            this.map = new HashMap<>();
+    public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+        if (this._map == null) {
+            this._map = new HashMap<>();
         }
-        this.map.put(key, mapItem);
+        this._map.put(key, _mapItem);
         return this;
   }
 
     /**
-     * Get map
-     * @return map
+     * Get _map
+     * @return _map
      */
     @Nullable
     @JsonProperty(JSON_PROPERTY_MAP)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
     public Map<String, Animal> getMap() {
-        return map;
+        return _map;
     }
 
     @JsonProperty(JSON_PROPERTY_MAP)
     @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-    public void setMap(Map<String, Animal> map) {
-        this.map = map;
+    public void setMap(Map<String, Animal> _map) {
+        this._map = _map;
     }
 
     @Override
@@ -134,23 +134,23 @@ public boolean equals(Object o) {
             return false;
         }
         MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-        return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-            Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-            Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+        return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+            Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+            Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
     }
 
     @Override
     public int hashCode() {
-        return Objects.hash(uuid, dateTime, map);
+        return Objects.hash(_uuid, _dateTime, _map);
     }
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-        sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-        sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-        sb.append("    map: ").append(toIndentedString(map)).append("\n");
+        sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+        sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+        sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/apache-httpclient/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/apache-httpclient/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/apache-httpclient/docs/FormatTest.md b/samples/client/petstore/java/apache-httpclient/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/FormatTest.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/apache-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/apache-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/apache-httpclient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/apache-httpclient/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/apache-httpclient/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/apache-httpclient/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java
index 23684a5ffefb..74b5ae950838 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -990,20 +990,20 @@ public Client testClientModel(Client client, Map<String, String> additionalHeade
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-    this.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, Collections.emptyMap());
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+    this.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, Collections.emptyMap());
   }
 
 
@@ -1014,20 +1014,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @param additionalHeaders additionalHeaders for this call
    * @throws ApiException if fails to make API call
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Map<String, String> additionalHeaders) throws ApiException {
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Map<String, String> additionalHeaders) throws ApiException {
     Object localVarPostBody = null;
     
     // verify the required parameter 'number' is set
@@ -1065,8 +1065,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
     localVarHeaderParams.putAll(additionalHeaders);
 
     
-    if (integer != null)
-      localVarFormParams.put("integer", integer);
+    if (_integer != null)
+      localVarFormParams.put("integer", _integer);
 if (int32 != null)
       localVarFormParams.put("int32", int32);
 if (int64 != null)
@@ -1077,18 +1077,18 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
       localVarFormParams.put("float", _float);
 if (_double != null)
       localVarFormParams.put("double", _double);
-if (string != null)
-      localVarFormParams.put("string", string);
+if (_string != null)
+      localVarFormParams.put("string", _string);
 if (patternWithoutDelimiter != null)
       localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
 if (_byte != null)
       localVarFormParams.put("byte", _byte);
 if (binary != null)
       localVarFormParams.put("binary", binary);
-if (date != null)
-      localVarFormParams.put("date", date);
-if (dateTime != null)
-      localVarFormParams.put("dateTime", dateTime);
+if (_date != null)
+      localVarFormParams.put("date", _date);
+if (_dateTime != null)
+      localVarFormParams.put("dateTime", _dateTime);
 if (password != null)
       localVarFormParams.put("password", password);
 if (paramCallback != null)
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 8e7eacb02aa0..69720002ad8d 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -37,34 +37,34 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -76,19 +76,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java
index d36ce911c5b4..29d5c6cb73cb 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -56,7 +56,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -77,7 +77,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -86,13 +86,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -106,31 +106,31 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -291,29 +291,29 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -366,79 +366,79 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -525,19 +525,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -545,26 +545,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 2d60b5704095..ca6a7e6283d4 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -42,98 +42,98 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -145,23 +145,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 802af367cc9d..b9e11e2257cf 100644
--- a/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/apache-httpclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -43,7 +43,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -57,29 +57,29 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -180,7 +180,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -188,14 +188,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
index 6f78f956efb8..33230f1c43ca 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -311,14 +311,14 @@ public TestBodyWithQueryParamsQueryParams query(final String value) {
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    */
@@ -327,7 +327,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) {
     "Content-Type: application/x-www-form-urlencoded",
     "Accept: application/json",
   })
-  void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback);
+  void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer _integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String _string, @Param("binary") File binary, @Param("date") LocalDate _date, @Param("dateTime") OffsetDateTime _dateTime, @Param("password") String password, @Param("callback") String paramCallback);
 
   /**
    * Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
@@ -337,14 +337,14 @@ public TestBodyWithQueryParamsQueryParams query(final String value) {
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    */
@@ -353,7 +353,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) {
     "Content-Type: application/x-www-form-urlencoded",
     "Accept: application/json",
   })
-  ApiResponse<Void> testEndpointParametersWithHttpInfo(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback);
+  ApiResponse<Void> testEndpointParametersWithHttpInfo(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer _integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String _string, @Param("binary") File binary, @Param("date") LocalDate _date, @Param("dateTime") OffsetDateTime _dateTime, @Param("password") String password, @Param("callback") String paramCallback);
 
 
 
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
index 1d182c30d78a..293294386cd3 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -52,7 +52,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -70,7 +70,7 @@ public class FormatTest {
   private Double _double;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -79,48 +79,48 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -262,29 +262,29 @@ public void setDouble(Double _double) {
   }
 
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -340,81 +340,81 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -444,29 +444,29 @@ public void setPassword(String password) {
   }
 
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -479,45 +479,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 1eb78737b5d5..64a67fef3f61 100644
--- a/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -40,100 +40,100 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -146,23 +146,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
index c0f7cd6f9403..3a12e73bf1ab 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -512,14 +512,14 @@ public TestBodyWithQueryParamsQueryParams query(final String value) {
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    */
@@ -528,7 +528,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) {
     "Content-Type: application/x-www-form-urlencoded",
     "Accept: application/json",
   })
-  void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback);
+  void testEndpointParameters(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer _integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String _string, @Param("binary") File binary, @Param("date") LocalDate _date, @Param("dateTime") OffsetDateTime _dateTime, @Param("password") String password, @Param("callback") String paramCallback);
 
   /**
    * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
@@ -538,14 +538,14 @@ public TestBodyWithQueryParamsQueryParams query(final String value) {
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    */
@@ -554,7 +554,7 @@ public TestBodyWithQueryParamsQueryParams query(final String value) {
     "Content-Type: application/x-www-form-urlencoded",
     "Accept: application/json",
   })
-  ApiResponse<Void> testEndpointParametersWithHttpInfo(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String string, @Param("binary") File binary, @Param("date") LocalDate date, @Param("dateTime") OffsetDateTime dateTime, @Param("password") String password, @Param("callback") String paramCallback);
+  ApiResponse<Void> testEndpointParametersWithHttpInfo(@Param("number") BigDecimal number, @Param("double") Double _double, @Param("pattern_without_delimiter") String patternWithoutDelimiter, @Param("byte") byte[] _byte, @Param("integer") Integer _integer, @Param("int32") Integer int32, @Param("int64") Long int64, @Param("float") Float _float, @Param("string") String _string, @Param("binary") File binary, @Param("date") LocalDate _date, @Param("dateTime") OffsetDateTime _dateTime, @Param("password") String password, @Param("callback") String paramCallback);
 
 
 
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 11866ac661f4..a2244fd6de50 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -34,34 +34,34 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -74,19 +74,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
index f08e91ffe628..c98efae9b30c 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -53,7 +53,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -74,7 +74,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -83,13 +83,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -103,31 +103,31 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -295,29 +295,29 @@ public void setDecimal(BigDecimal decimal) {
   }
 
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -373,81 +373,81 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -538,19 +538,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -558,26 +558,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index bfd499a32b3f..f91e0b9e579c 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,100 +39,100 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -145,23 +145,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index fd788ba25409..f70fe399c1a4 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -40,7 +40,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -181,7 +181,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -189,14 +189,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/google-api-client/docs/FakeApi.md b/samples/client/petstore/java/google-api-client/docs/FakeApi.md
index 627366e41db3..e8088cb9be26 100644
--- a/samples/client/petstore/java/google-api-client/docs/FakeApi.md
+++ b/samples/client/petstore/java/google-api-client/docs/FakeApi.md
@@ -548,7 +548,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -580,18 +580,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -612,14 +612,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/google-api-client/docs/FormatTest.md b/samples/client/petstore/java/google-api-client/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/google-api-client/docs/FormatTest.md
+++ b/samples/client/petstore/java/google-api-client/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/google-api-client/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
index 619fe1effa4c..a5a500ac500c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -757,20 +757,20 @@ public HttpResponse testClientModelForHttpResponse(Client body, Map<String, Obje
     * @param _double None
     * @param patternWithoutDelimiter None
     * @param _byte None
-    * @param integer None
+    * @param _integer None
     * @param int32 None
     * @param int64 None
     * @param _float None
-    * @param string None
+    * @param _string None
     * @param binary None
-    * @param date None
-    * @param dateTime None
+    * @param _date None
+    * @param _dateTime None
     * @param password None
     * @param paramCallback None
     * @throws IOException if an error occurs while attempting to invoke the API
     **/
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws IOException {
-        testEndpointParametersForHttpResponse(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws IOException {
+        testEndpointParametersForHttpResponse(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
   /**
@@ -789,7 +789,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
         testEndpointParametersForHttpResponse(number, _double, patternWithoutDelimiter, _byte, params);
     }
 
-    public HttpResponse testEndpointParametersForHttpResponse(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws IOException {
+    public HttpResponse testEndpointParametersForHttpResponse(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws IOException {
         // verify the required parameter 'number' is set
         if (number == null) {
             throw new IllegalArgumentException("Missing the required parameter 'number' when calling testEndpointParameters");
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
index 982956c60650..feef8fe2e2fe 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -51,7 +51,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -69,7 +69,7 @@ public class FormatTest {
   private Double _double;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -78,48 +78,48 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -255,29 +255,29 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -330,79 +330,79 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -430,29 +430,29 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -464,45 +464,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index bdeb14838ba5..7dda6d2e6b8d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,98 +39,98 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -142,23 +142,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md
index d21432dbf3e4..62d1027300a1 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FakeApi.md
@@ -541,7 +541,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -580,18 +580,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        LocalDateTime dateTime = new LocalDateTime(); // LocalDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        LocalDateTime _dateTime = new LocalDateTime(); // LocalDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -612,14 +612,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **LocalDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **LocalDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md
index 5c36e3616e7d..b312d2eefa05 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **LocalDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **LocalDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index d8ba815078e3..bc785b9c5a31 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **LocalDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **LocalDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java
index c49af5d12355..6d6e814bfca6 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -373,14 +373,14 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiEx
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
@@ -391,8 +391,8 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiEx
        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, LocalDateTime dateTime, String password, String paramCallback) throws ApiException {
-    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, LocalDateTime _dateTime, String password, String paramCallback) throws ApiException {
+    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
   }
 
   /**
@@ -402,14 +402,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return ApiResponse&lt;Void&gt;
@@ -421,7 +421,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
    */
-  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, LocalDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, LocalDateTime _dateTime, String password, String paramCallback) throws ApiException {
     // Check required parameters
     if (number == null) {
       throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
@@ -438,8 +438,8 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
 
     // Form parameters
     Map<String, Object> localVarFormParams = new LinkedHashMap<>();
-    if (integer != null) {
-      localVarFormParams.put("integer", integer);
+    if (_integer != null) {
+      localVarFormParams.put("integer", _integer);
     }
     if (int32 != null) {
       localVarFormParams.put("int32", int32);
@@ -452,19 +452,19 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
       localVarFormParams.put("float", _float);
     }
     localVarFormParams.put("double", _double);
-    if (string != null) {
-      localVarFormParams.put("string", string);
+    if (_string != null) {
+      localVarFormParams.put("string", _string);
     }
     localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
     localVarFormParams.put("byte", _byte);
     if (binary != null) {
       localVarFormParams.put("binary", binary);
     }
-    if (date != null) {
-      localVarFormParams.put("date", date);
+    if (_date != null) {
+      localVarFormParams.put("date", _date);
     }
-    if (dateTime != null) {
-      localVarFormParams.put("dateTime", dateTime);
+    if (_dateTime != null) {
+      localVarFormParams.put("dateTime", _dateTime);
     }
     if (password != null) {
       localVarFormParams.put("password", password);
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java
index 5f1c645585eb..0b253cd00065 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -54,7 +54,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -72,7 +72,7 @@ public class FormatTest {
   private Double _double;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -81,47 +81,47 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private LocalDateTime dateTime;
+  private LocalDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() { 
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -258,28 +258,28 @@ public void setDouble(Double _double) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -333,78 +333,78 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public LocalDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -433,28 +433,28 @@ public void setPassword(String password) {
   }
 
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -470,45 +470,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 026e40a84163..147590bb1f20 100644
--- a/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -42,97 +42,97 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private LocalDateTime dateTime;
+  private LocalDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() { 
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public LocalDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -148,23 +148,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md b/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md
index 84167f65462a..ec43ec6cabed 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/FakeApi.md
@@ -541,7 +541,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -580,18 +580,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -612,14 +612,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md b/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
index e4228cf75150..83d42b387a07 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -373,14 +373,14 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiEx
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
@@ -391,8 +391,8 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client body) throws ApiEx
        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
   }
 
   /**
@@ -402,14 +402,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return ApiResponse&lt;Void&gt;
@@ -421,7 +421,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
    */
-  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
     // Check required parameters
     if (number == null) {
       throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
@@ -438,8 +438,8 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
 
     // Form parameters
     Map<String, Object> localVarFormParams = new LinkedHashMap<>();
-    if (integer != null) {
-      localVarFormParams.put("integer", integer);
+    if (_integer != null) {
+      localVarFormParams.put("integer", _integer);
     }
     if (int32 != null) {
       localVarFormParams.put("int32", int32);
@@ -452,19 +452,19 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
       localVarFormParams.put("float", _float);
     }
     localVarFormParams.put("double", _double);
-    if (string != null) {
-      localVarFormParams.put("string", string);
+    if (_string != null) {
+      localVarFormParams.put("string", _string);
     }
     localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
     localVarFormParams.put("byte", _byte);
     if (binary != null) {
       localVarFormParams.put("binary", binary);
     }
-    if (date != null) {
-      localVarFormParams.put("date", date);
+    if (_date != null) {
+      localVarFormParams.put("date", _date);
     }
-    if (dateTime != null) {
-      localVarFormParams.put("dateTime", dateTime);
+    if (_dateTime != null) {
+      localVarFormParams.put("dateTime", _dateTime);
     }
     if (password != null) {
       localVarFormParams.put("password", password);
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
index bc3e557e062e..b96c5a12e754 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -54,7 +54,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -72,7 +72,7 @@ public class FormatTest {
   private Double _double;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -81,47 +81,47 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() { 
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -258,28 +258,28 @@ public void setDouble(Double _double) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -333,78 +333,78 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -433,28 +433,28 @@ public void setPassword(String password) {
   }
 
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -470,45 +470,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c60134dd799..dd4e43e0281f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -42,97 +42,97 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() { 
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -148,23 +148,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey3/docs/FakeApi.md b/samples/client/petstore/java/jersey3/docs/FakeApi.md
index 7d45cd6a51b8..60c4c3dd416e 100644
--- a/samples/client/petstore/java/jersey3/docs/FakeApi.md
+++ b/samples/client/petstore/java/jersey3/docs/FakeApi.md
@@ -726,7 +726,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -766,18 +766,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -798,14 +798,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/jersey3/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/jersey3/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/jersey3/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/jersey3/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/jersey3/docs/FormatTest.md b/samples/client/petstore/java/jersey3/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/jersey3/docs/FormatTest.md
+++ b/samples/client/petstore/java/jersey3/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/jersey3/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/jersey3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/jersey3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/jersey3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/jersey3/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/jersey3/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/jersey3/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/jersey3/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java
index 2368a00d7bc2..b51937ab531c 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -480,14 +480,14 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client client) throws Api
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+   * @param _date None (optional)
+   * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
@@ -498,8 +498,8 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client client) throws Api
        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
   }
 
   /**
@@ -509,14 +509,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+   * @param _date None (optional)
+   * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return ApiResponse&lt;Void&gt;
@@ -528,7 +528,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
    */
-  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
     // Check required parameters
     if (number == null) {
       throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
@@ -545,8 +545,8 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
 
     // Form parameters
     Map<String, Object> localVarFormParams = new LinkedHashMap<>();
-    if (integer != null) {
-      localVarFormParams.put("integer", integer);
+    if (_integer != null) {
+      localVarFormParams.put("integer", _integer);
     }
     if (int32 != null) {
       localVarFormParams.put("int32", int32);
@@ -559,19 +559,19 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
       localVarFormParams.put("float", _float);
     }
     localVarFormParams.put("double", _double);
-    if (string != null) {
-      localVarFormParams.put("string", string);
+    if (_string != null) {
+      localVarFormParams.put("string", _string);
     }
     localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
     localVarFormParams.put("byte", _byte);
     if (binary != null) {
       localVarFormParams.put("binary", binary);
     }
-    if (date != null) {
-      localVarFormParams.put("date", date);
+    if (_date != null) {
+      localVarFormParams.put("date", _date);
     }
-    if (dateTime != null) {
-      localVarFormParams.put("dateTime", dateTime);
+    if (_dateTime != null) {
+      localVarFormParams.put("dateTime", _dateTime);
     }
     if (password != null) {
       localVarFormParams.put("password", password);
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index f785a43e16f3..06d25bad7580 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -39,19 +39,19 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() { 
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -60,14 +60,14 @@ public FooGetDefaultResponse string(Foo string) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -83,19 +83,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java
index 85b7bfd72d81..8642ad7cdd6f 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -58,7 +58,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -79,7 +79,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -88,13 +88,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -108,16 +108,16 @@ public class FormatTest {
   public FormatTest() { 
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @jakarta.annotation.Nullable
  @Min(10) @Max(100)
@@ -125,14 +125,14 @@ public FormatTest integer(Integer integer) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -303,14 +303,14 @@ public void setDecimal(BigDecimal decimal) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")
@@ -318,14 +318,14 @@ public FormatTest string(String string) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -383,14 +383,14 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @jakarta.annotation.Nonnull
   @NotNull
@@ -400,25 +400,25 @@ public FormatTest date(LocalDate date) {
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -427,25 +427,25 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -454,14 +454,14 @@ public FormatTest uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -556,19 +556,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -576,26 +576,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 62faa6faf3cb..4dcd384cd710 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -44,25 +44,25 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() { 
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -71,25 +71,25 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -98,33 +98,33 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -133,14 +133,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -156,23 +156,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 8d001d9050ea..929aa99ac173 100644
--- a/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/jersey3/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -44,7 +44,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   @Deprecated
@@ -61,14 +61,14 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() { 
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
 
@@ -76,14 +76,14 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -199,7 +199,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -207,14 +207,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/native-async/docs/FakeApi.md b/samples/client/petstore/java/native-async/docs/FakeApi.md
index e10d657aaa82..4d7946930db9 100644
--- a/samples/client/petstore/java/native-async/docs/FakeApi.md
+++ b/samples/client/petstore/java/native-async/docs/FakeApi.md
@@ -1715,7 +1715,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> CompletableFuture<Void> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> CompletableFuture<Void> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1748,18 +1748,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            CompletableFuture<Void> result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            CompletableFuture<Void> result = apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1780,14 +1780,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
@@ -1813,7 +1813,7 @@ CompletableFuture<void> (empty response body)
 
 ## testEndpointParametersWithHttpInfo
 
-> CompletableFuture<ApiResponse<Void>> testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> CompletableFuture<ApiResponse<Void>> testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1847,18 +1847,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            CompletableFuture<ApiResponse<Void>> response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            CompletableFuture<ApiResponse<Void>> response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
             System.out.println("Status code: " + response.get().getStatusCode());
             System.out.println("Response headers: " + response.get().getHeaders());
         } catch (InterruptedException | ExecutionException e) {
@@ -1888,14 +1888,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/native-async/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/native-async/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/native-async/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/native-async/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/native-async/docs/FormatTest.md b/samples/client/petstore/java/native-async/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/native-async/docs/FormatTest.md
+++ b/samples/client/petstore/java/native-async/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/native-async/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/native-async/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/native-async/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/native-async/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/native-async/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
index a1d0bc66ed3f..f026d38d20dd 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1201,22 +1201,22 @@ private HttpRequest.Builder testClientModelRequestBuilder(Client client) throws
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+   * @param _date None (optional)
+   * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return CompletableFuture&lt;Void&gt;
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public CompletableFuture<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
     try {
-      HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+      HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
       return memberVarHttpClient.sendAsync(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
@@ -1238,22 +1238,22 @@ public CompletableFuture<Void> testEndpointParameters(BigDecimal number, Double
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+   * @param _date None (optional)
+   * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return CompletableFuture&lt;ApiResponse&lt;Void&gt;&gt;
    * @throws ApiException if fails to make API call
    */
-  public CompletableFuture<ApiResponse<Void>> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public CompletableFuture<ApiResponse<Void>> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
     try {
-      HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+      HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
       return memberVarHttpClient.sendAsync(
           localVarRequestBuilder.build(),
           HttpResponse.BodyHandlers.ofString()).thenComposeAsync(localVarResponse -> {
@@ -1274,7 +1274,7 @@ public CompletableFuture<ApiResponse<Void>> testEndpointParametersWithHttpInfo(B
     }
   }
 
-  private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
     // verify the required parameter 'number' is set
     if (number == null) {
       throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
@@ -1301,8 +1301,8 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb
     localVarRequestBuilder.header("Accept", "application/json");
 
     List<NameValuePair> formValues = new ArrayList<>();
-    if (integer != null) {
-        formValues.add(new BasicNameValuePair("integer", integer.toString()));
+    if (_integer != null) {
+        formValues.add(new BasicNameValuePair("integer", _integer.toString()));
     }
     if (int32 != null) {
         formValues.add(new BasicNameValuePair("int32", int32.toString()));
@@ -1319,8 +1319,8 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb
     if (_double != null) {
         formValues.add(new BasicNameValuePair("double", _double.toString()));
     }
-    if (string != null) {
-        formValues.add(new BasicNameValuePair("string", string.toString()));
+    if (_string != null) {
+        formValues.add(new BasicNameValuePair("string", _string.toString()));
     }
     if (patternWithoutDelimiter != null) {
         formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString()));
@@ -1331,11 +1331,11 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb
     if (binary != null) {
         formValues.add(new BasicNameValuePair("binary", binary.toString()));
     }
-    if (date != null) {
-        formValues.add(new BasicNameValuePair("date", date.toString()));
+    if (_date != null) {
+        formValues.add(new BasicNameValuePair("date", _date.toString()));
     }
-    if (dateTime != null) {
-        formValues.add(new BasicNameValuePair("dateTime", dateTime.toString()));
+    if (_dateTime != null) {
+        formValues.add(new BasicNameValuePair("dateTime", _dateTime.toString()));
     }
     if (password != null) {
         formValues.add(new BasicNameValuePair("password", password.toString()));
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 5bdd37e51f57..303ba833b8c6 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -39,32 +39,32 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() { 
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -80,19 +80,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
index d7ebbce524a9..6926747d874b 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -58,7 +58,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -79,7 +79,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -88,13 +88,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -108,29 +108,29 @@ public class FormatTest {
   public FormatTest() { 
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -286,27 +286,27 @@ public void setDecimal(BigDecimal decimal) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -358,75 +358,75 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -514,19 +514,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -534,26 +534,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 8517bcc60427..6fec58bc894c 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -45,94 +45,94 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() { 
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -148,23 +148,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index b76ff02ff973..b3cb1d8de43d 100644
--- a/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/native-async/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -45,7 +45,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -59,27 +59,27 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() { 
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -181,7 +181,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -189,14 +189,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/native/docs/FakeApi.md b/samples/client/petstore/java/native/docs/FakeApi.md
index f9dd65ba4ec9..4e727c34491f 100644
--- a/samples/client/petstore/java/native/docs/FakeApi.md
+++ b/samples/client/petstore/java/native/docs/FakeApi.md
@@ -1607,7 +1607,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> void testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1639,18 +1639,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -1671,14 +1671,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
@@ -1704,7 +1704,7 @@ null (empty response body)
 
 ## testEndpointParametersWithHttpInfo
 
-> ApiResponse<Void> testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> ApiResponse<Void> testEndpointParameters testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -1737,18 +1737,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            ApiResponse<Void> response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            ApiResponse<Void> response = apiInstance.testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
             System.out.println("Status code: " + response.getStatusCode());
             System.out.println("Response headers: " + response.getHeaders());
         } catch (ApiException e) {
@@ -1771,14 +1771,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/native/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/native/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/native/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/native/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/native/docs/FormatTest.md b/samples/client/petstore/java/native/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/native/docs/FormatTest.md
+++ b/samples/client/petstore/java/native/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/native/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/native/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/native/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/native/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
index 569d74f8752f..954dabd4de20 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1002,20 +1002,20 @@ private HttpRequest.Builder testClientModelRequestBuilder(Client client) throws
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+   * @param _date None (optional)
+   * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
   }
 
   /**
@@ -1025,21 +1025,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+   * @param _date None (optional)
+   * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return ApiResponse&lt;Void&gt;
    * @throws ApiException if fails to make API call
    */
-  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-    HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+    HttpRequest.Builder localVarRequestBuilder = testEndpointParametersRequestBuilder(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     try {
       HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
           localVarRequestBuilder.build(),
@@ -1072,7 +1072,7 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
     }
   }
 
-  private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
     // verify the required parameter 'number' is set
     if (number == null) {
       throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
@@ -1099,8 +1099,8 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb
     localVarRequestBuilder.header("Accept", "application/json");
 
     List<NameValuePair> formValues = new ArrayList<>();
-    if (integer != null) {
-        formValues.add(new BasicNameValuePair("integer", integer.toString()));
+    if (_integer != null) {
+        formValues.add(new BasicNameValuePair("integer", _integer.toString()));
     }
     if (int32 != null) {
         formValues.add(new BasicNameValuePair("int32", int32.toString()));
@@ -1117,8 +1117,8 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb
     if (_double != null) {
         formValues.add(new BasicNameValuePair("double", _double.toString()));
     }
-    if (string != null) {
-        formValues.add(new BasicNameValuePair("string", string.toString()));
+    if (_string != null) {
+        formValues.add(new BasicNameValuePair("string", _string.toString()));
     }
     if (patternWithoutDelimiter != null) {
         formValues.add(new BasicNameValuePair("pattern_without_delimiter", patternWithoutDelimiter.toString()));
@@ -1129,11 +1129,11 @@ private HttpRequest.Builder testEndpointParametersRequestBuilder(BigDecimal numb
     if (binary != null) {
         formValues.add(new BasicNameValuePair("binary", binary.toString()));
     }
-    if (date != null) {
-        formValues.add(new BasicNameValuePair("date", date.toString()));
+    if (_date != null) {
+        formValues.add(new BasicNameValuePair("date", _date.toString()));
     }
-    if (dateTime != null) {
-        formValues.add(new BasicNameValuePair("dateTime", dateTime.toString()));
+    if (_dateTime != null) {
+        formValues.add(new BasicNameValuePair("dateTime", _dateTime.toString()));
     }
     if (password != null) {
         formValues.add(new BasicNameValuePair("password", password.toString()));
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index b15bb8d96122..e4f007aa3021 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -39,32 +39,32 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() { 
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -80,19 +80,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -160,8 +160,8 @@ protected Builder(FooGetDefaultResponse instance) {
       this.instance = instance;
     }
 
-    public FooGetDefaultResponse.Builder string(Foo string) {
-      this.instance.string = string;
+    public FooGetDefaultResponse.Builder _string(Foo _string) {
+      this.instance._string = _string;
       return this;
     }
 
@@ -198,7 +198,7 @@ public static FooGetDefaultResponse.Builder builder() {
   */
   public FooGetDefaultResponse.Builder toBuilder() {
     return new FooGetDefaultResponse.Builder()
-      .string(getString());
+      ._string(getString());
   }
 
 }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
index d373a15b18aa..e45dcf44edc2 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -58,7 +58,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -79,7 +79,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -88,13 +88,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -108,29 +108,29 @@ public class FormatTest {
   public FormatTest() { 
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -286,27 +286,27 @@ public void setDecimal(BigDecimal decimal) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -358,75 +358,75 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -514,19 +514,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -534,26 +534,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
@@ -699,8 +699,8 @@ protected Builder(FormatTest instance) {
       this.instance = instance;
     }
 
-    public FormatTest.Builder integer(Integer integer) {
-      this.instance.integer = integer;
+    public FormatTest.Builder _integer(Integer _integer) {
+      this.instance._integer = _integer;
       return this;
     }
     public FormatTest.Builder int32(Integer int32) {
@@ -727,8 +727,8 @@ public FormatTest.Builder decimal(BigDecimal decimal) {
       this.instance.decimal = decimal;
       return this;
     }
-    public FormatTest.Builder string(String string) {
-      this.instance.string = string;
+    public FormatTest.Builder _string(String _string) {
+      this.instance._string = _string;
       return this;
     }
     public FormatTest.Builder _byte(byte[] _byte) {
@@ -739,16 +739,16 @@ public FormatTest.Builder binary(File binary) {
       this.instance.binary = binary;
       return this;
     }
-    public FormatTest.Builder date(LocalDate date) {
-      this.instance.date = date;
+    public FormatTest.Builder _date(LocalDate _date) {
+      this.instance._date = _date;
       return this;
     }
-    public FormatTest.Builder dateTime(OffsetDateTime dateTime) {
-      this.instance.dateTime = dateTime;
+    public FormatTest.Builder _dateTime(OffsetDateTime _dateTime) {
+      this.instance._dateTime = _dateTime;
       return this;
     }
-    public FormatTest.Builder uuid(UUID uuid) {
-      this.instance.uuid = uuid;
+    public FormatTest.Builder _uuid(UUID _uuid) {
+      this.instance._uuid = _uuid;
       return this;
     }
     public FormatTest.Builder password(String password) {
@@ -797,19 +797,19 @@ public static FormatTest.Builder builder() {
   */
   public FormatTest.Builder toBuilder() {
     return new FormatTest.Builder()
-      .integer(getInteger())
+      ._integer(getInteger())
       .int32(getInt32())
       .int64(getInt64())
       .number(getNumber())
       ._float(getFloat())
       ._double(getDouble())
       .decimal(getDecimal())
-      .string(getString())
+      ._string(getString())
       ._byte(getByte())
       .binary(getBinary())
-      .date(getDate())
-      .dateTime(getDateTime())
-      .uuid(getUuid())
+      ._date(getDate())
+      ._dateTime(getDateTime())
+      ._uuid(getUuid())
       .password(getPassword())
       .patternWithDigits(getPatternWithDigits())
       .patternWithDigitsAndDelimiter(getPatternWithDigitsAndDelimiter());
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a1e808e486a8..eae97184e3b2 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -45,94 +45,94 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() { 
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -148,23 +148,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -247,16 +247,16 @@ protected Builder(MixedPropertiesAndAdditionalPropertiesClass instance) {
       this.instance = instance;
     }
 
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder uuid(UUID uuid) {
-      this.instance.uuid = uuid;
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _uuid(UUID _uuid) {
+      this.instance._uuid = _uuid;
       return this;
     }
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder dateTime(OffsetDateTime dateTime) {
-      this.instance.dateTime = dateTime;
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _dateTime(OffsetDateTime _dateTime) {
+      this.instance._dateTime = _dateTime;
       return this;
     }
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder map(Map<String, Animal> map) {
-      this.instance.map = map;
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _map(Map<String, Animal> _map) {
+      this.instance._map = _map;
       return this;
     }
 
@@ -293,9 +293,9 @@ public static MixedPropertiesAndAdditionalPropertiesClass.Builder builder() {
   */
   public MixedPropertiesAndAdditionalPropertiesClass.Builder toBuilder() {
     return new MixedPropertiesAndAdditionalPropertiesClass.Builder()
-      .uuid(getUuid())
-      .dateTime(getDateTime())
-      .map(getMap());
+      ._uuid(getUuid())
+      ._dateTime(getDateTime())
+      ._map(getMap());
   }
 
 }
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 30052aee4b94..5b74b4342aff 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -45,7 +45,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -59,27 +59,27 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() { 
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -181,7 +181,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -189,14 +189,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
@@ -286,8 +286,8 @@ protected Builder(ObjectWithDeprecatedFields instance) {
       this.instance = instance;
     }
 
-    public ObjectWithDeprecatedFields.Builder uuid(String uuid) {
-      this.instance.uuid = uuid;
+    public ObjectWithDeprecatedFields.Builder _uuid(String _uuid) {
+      this.instance._uuid = _uuid;
       return this;
     }
     public ObjectWithDeprecatedFields.Builder id(BigDecimal id) {
@@ -336,7 +336,7 @@ public static ObjectWithDeprecatedFields.Builder builder() {
   */
   public ObjectWithDeprecatedFields.Builder toBuilder() {
     return new ObjectWithDeprecatedFields.Builder()
-      .uuid(getUuid())
+      ._uuid(getUuid())
       .id(getId())
       .deprecatedRef(getDeprecatedRef())
       .bars(getBars());
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md
index 98f0b0098b8b..0d96b99298be 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FakeApi.md
@@ -515,7 +515,7 @@ No authorization required
 
 <a id="testEndpointParameters"></a>
 # **testEndpointParameters**
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -546,18 +546,18 @@ public class Example {
     Double _double = 3.4D; // Double | None
     String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
     byte[] _byte = null; // byte[] | None
-    Integer integer = 56; // Integer | None
+    Integer _integer = 56; // Integer | None
     Integer int32 = 56; // Integer | None
     Long int64 = 56L; // Long | None
     Float _float = 3.4F; // Float | None
-    String string = "string_example"; // String | None
+    String _string = "_string_example"; // String | None
     File binary = new File("/path/to/file"); // File | None
-    LocalDate date = LocalDate.now(); // LocalDate | None
-    OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+    LocalDate _date = LocalDate.now(); // LocalDate | None
+    OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
     String password = "password_example"; // String | None
     String paramCallback = "paramCallback_example"; // String | None
     try {
-      apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+      apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     } catch (ApiException e) {
       System.err.println("Exception when calling FakeApi#testEndpointParameters");
       System.err.println("Status code: " + e.getCode());
@@ -577,14 +577,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java
index e036975291ef..5a6eeeb11758 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1113,14 +1113,14 @@ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback<Client>
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @param _callback Callback for upload/download progress
@@ -1133,7 +1133,7 @@ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback<Client>
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
+    public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -1164,8 +1164,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
         Map<String, String> localVarCookieParams = new HashMap<String, String>();
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-        if (integer != null) {
-            localVarFormParams.put("integer", integer);
+        if (_integer != null) {
+            localVarFormParams.put("integer", _integer);
         }
 
         if (int32 != null) {
@@ -1188,8 +1188,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
             localVarFormParams.put("double", _double);
         }
 
-        if (string != null) {
-            localVarFormParams.put("string", string);
+        if (_string != null) {
+            localVarFormParams.put("string", _string);
         }
 
         if (patternWithoutDelimiter != null) {
@@ -1204,12 +1204,12 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
             localVarFormParams.put("binary", binary);
         }
 
-        if (date != null) {
-            localVarFormParams.put("date", date);
+        if (_date != null) {
+            localVarFormParams.put("date", _date);
         }
 
-        if (dateTime != null) {
-            localVarFormParams.put("dateTime", dateTime);
+        if (_dateTime != null) {
+            localVarFormParams.put("dateTime", _dateTime);
         }
 
         if (password != null) {
@@ -1242,7 +1242,7 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
+    private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'number' is set
         if (number == null) {
             throw new ApiException("Missing the required parameter 'number' when calling testEndpointParameters(Async)");
@@ -1263,7 +1263,7 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
             throw new ApiException("Missing the required parameter '_byte' when calling testEndpointParameters(Async)");
         }
 
-        return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback);
+        return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback);
 
     }
 
@@ -1274,14 +1274,14 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -1292,8 +1292,8 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
     /**
@@ -1303,14 +1303,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return ApiResponse&lt;Void&gt;
@@ -1322,8 +1322,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null);
+    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null);
         return localVarApiClient.execute(localVarCall);
     }
 
@@ -1334,14 +1334,14 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @param _callback The callback to be executed when the API call finishes
@@ -1354,9 +1354,9 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback<Void> _callback) throws ApiException {
+    public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback<Void> _callback) throws ApiException {
 
-        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback);
+        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback);
         localVarApiClient.executeAsync(localVarCall, _callback);
         return localVarCall;
     }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java
index d1042d844f30..17ece42b1b24 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -58,7 +58,7 @@
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String SERIALIZED_NAME_INT32 = "int32";
   @SerializedName(SERIALIZED_NAME_INT32)
@@ -82,7 +82,7 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_STRING = "string";
   @SerializedName(SERIALIZED_NAME_STRING)
-  private String string;
+  private String _string;
 
   public static final String SERIALIZED_NAME_BYTE = "byte";
   @SerializedName(SERIALIZED_NAME_BYTE)
@@ -94,15 +94,15 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_PASSWORD = "password";
   @SerializedName(SERIALIZED_NAME_PASSWORD)
@@ -110,29 +110,29 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
   @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -239,22 +239,22 @@ public void setDouble(Double _double) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -296,60 +296,60 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -372,22 +372,22 @@ public void setPassword(String password) {
   }
 
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -401,45 +401,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 619caaf67a45..851f5d588ffb 100644
--- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -58,81 +58,81 @@
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_MAP = "map";
   @SerializedName(SERIALIZED_NAME_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -146,23 +146,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md
index 98f0b0098b8b..0d96b99298be 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FakeApi.md
@@ -515,7 +515,7 @@ No authorization required
 
 <a id="testEndpointParameters"></a>
 # **testEndpointParameters**
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -546,18 +546,18 @@ public class Example {
     Double _double = 3.4D; // Double | None
     String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
     byte[] _byte = null; // byte[] | None
-    Integer integer = 56; // Integer | None
+    Integer _integer = 56; // Integer | None
     Integer int32 = 56; // Integer | None
     Long int64 = 56L; // Long | None
     Float _float = 3.4F; // Float | None
-    String string = "string_example"; // String | None
+    String _string = "_string_example"; // String | None
     File binary = new File("/path/to/file"); // File | None
-    LocalDate date = LocalDate.now(); // LocalDate | None
-    OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+    LocalDate _date = LocalDate.now(); // LocalDate | None
+    OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
     String password = "password_example"; // String | None
     String paramCallback = "paramCallback_example"; // String | None
     try {
-      apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+      apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     } catch (ApiException e) {
       System.err.println("Exception when calling FakeApi#testEndpointParameters");
       System.err.println("Status code: " + e.getCode());
@@ -577,14 +577,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
index 453c512d6107..4dc8d8b029cf 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 ## Implemented Interfaces
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index 67a556da124d..ca9423c420c4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 ## Implemented Interfaces
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java
index c4f7380e9b8a..d9dd0f5bd864 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1049,14 +1049,14 @@ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback<Client>
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @param _callback Callback for upload/download progress
@@ -1069,7 +1069,7 @@ public okhttp3.Call testClientModelAsync(Client body, final ApiCallback<Client>
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
+    public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -1094,8 +1094,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
         Map<String, String> localVarCookieParams = new HashMap<String, String>();
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-        if (integer != null) {
-            localVarFormParams.put("integer", integer);
+        if (_integer != null) {
+            localVarFormParams.put("integer", _integer);
         }
 
         if (int32 != null) {
@@ -1118,8 +1118,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
             localVarFormParams.put("double", _double);
         }
 
-        if (string != null) {
-            localVarFormParams.put("string", string);
+        if (_string != null) {
+            localVarFormParams.put("string", _string);
         }
 
         if (patternWithoutDelimiter != null) {
@@ -1134,12 +1134,12 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
             localVarFormParams.put("binary", binary);
         }
 
-        if (date != null) {
-            localVarFormParams.put("date", date);
+        if (_date != null) {
+            localVarFormParams.put("date", _date);
         }
 
-        if (dateTime != null) {
-            localVarFormParams.put("dateTime", dateTime);
+        if (_dateTime != null) {
+            localVarFormParams.put("dateTime", _dateTime);
         }
 
         if (password != null) {
@@ -1170,7 +1170,7 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
+    private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'number' is set
         if (number == null) {
             throw new ApiException("Missing the required parameter 'number' when calling testEndpointParameters(Async)");
@@ -1191,7 +1191,7 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
             throw new ApiException("Missing the required parameter '_byte' when calling testEndpointParameters(Async)");
         }
 
-        return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback);
+        return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback);
 
     }
 
@@ -1202,14 +1202,14 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -1220,8 +1220,8 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
     /**
@@ -1231,14 +1231,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return ApiResponse&lt;Void&gt;
@@ -1250,8 +1250,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null);
+    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null);
         return localVarApiClient.execute(localVarCall);
     }
 
@@ -1262,14 +1262,14 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @param _callback The callback to be executed when the API call finishes
@@ -1282,9 +1282,9 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback<Void> _callback) throws ApiException {
+    public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback<Void> _callback) throws ApiException {
 
-        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback);
+        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback);
         localVarApiClient.executeAsync(localVarCall, _callback);
         return localVarCall;
     }
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
index a2039b14a9c2..fbedfbb3916e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -60,7 +60,7 @@
 public class FormatTest implements Parcelable {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String SERIALIZED_NAME_INT32 = "int32";
   @SerializedName(SERIALIZED_NAME_INT32)
@@ -84,7 +84,7 @@ public class FormatTest implements Parcelable {
 
   public static final String SERIALIZED_NAME_STRING = "string";
   @SerializedName(SERIALIZED_NAME_STRING)
-  private String string;
+  private String _string;
 
   public static final String SERIALIZED_NAME_BYTE = "byte";
   @SerializedName(SERIALIZED_NAME_BYTE)
@@ -96,15 +96,15 @@ public class FormatTest implements Parcelable {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_PASSWORD = "password";
   @SerializedName(SERIALIZED_NAME_PASSWORD)
@@ -112,29 +112,29 @@ public class FormatTest implements Parcelable {
 
   public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
   @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -241,22 +241,22 @@ public void setDouble(Double _double) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -298,60 +298,60 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -374,22 +374,22 @@ public void setPassword(String password) {
   }
 
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -403,45 +403,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -459,37 +459,37 @@ private String toIndentedString(Object o) {
 
 
   public void writeToParcel(Parcel out, int flags) {
-    out.writeValue(integer);
+    out.writeValue(_integer);
     out.writeValue(int32);
     out.writeValue(int64);
     out.writeValue(number);
     out.writeValue(_float);
     out.writeValue(_double);
-    out.writeValue(string);
+    out.writeValue(_string);
     out.writeValue(_byte);
     out.writeValue(binary);
-    out.writeValue(date);
-    out.writeValue(dateTime);
-    out.writeValue(uuid);
+    out.writeValue(_date);
+    out.writeValue(_dateTime);
+    out.writeValue(_uuid);
     out.writeValue(password);
-    out.writeValue(bigDecimal);
+    out.writeValue(_bigDecimal);
   }
 
   FormatTest(Parcel in) {
-    integer = (Integer)in.readValue(null);
+    _integer = (Integer)in.readValue(null);
     int32 = (Integer)in.readValue(null);
     int64 = (Long)in.readValue(null);
     number = (BigDecimal)in.readValue(BigDecimal.class.getClassLoader());
     _float = (Float)in.readValue(null);
     _double = (Double)in.readValue(null);
-    string = (String)in.readValue(null);
+    _string = (String)in.readValue(null);
     _byte = (byte[])in.readValue(null);
     binary = (File)in.readValue(File.class.getClassLoader());
-    date = (LocalDate)in.readValue(LocalDate.class.getClassLoader());
-    dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader());
-    uuid = (UUID)in.readValue(UUID.class.getClassLoader());
+    _date = (LocalDate)in.readValue(LocalDate.class.getClassLoader());
+    _dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader());
+    _uuid = (UUID)in.readValue(UUID.class.getClassLoader());
     password = (String)in.readValue(null);
-    bigDecimal = (BigDecimal)in.readValue(BigDecimal.class.getClassLoader());
+    _bigDecimal = (BigDecimal)in.readValue(BigDecimal.class.getClassLoader());
   }
 
   public int describeContents() {
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 46e27fa87758..ba5123d4f594 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -60,81 +60,81 @@
 public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_MAP = "map";
   @SerializedName(SERIALIZED_NAME_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -148,23 +148,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -182,15 +182,15 @@ private String toIndentedString(Object o) {
 
 
   public void writeToParcel(Parcel out, int flags) {
-    out.writeValue(uuid);
-    out.writeValue(dateTime);
-    out.writeValue(map);
+    out.writeValue(_uuid);
+    out.writeValue(_dateTime);
+    out.writeValue(_map);
   }
 
   MixedPropertiesAndAdditionalPropertiesClass(Parcel in) {
-    uuid = (UUID)in.readValue(UUID.class.getClassLoader());
-    dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader());
-    map = (Map<String, Animal>)in.readValue(Animal.class.getClassLoader());
+    _uuid = (UUID)in.readValue(UUID.class.getClassLoader());
+    _dateTime = (OffsetDateTime)in.readValue(OffsetDateTime.class.getClassLoader());
+    _map = (Map<String, Animal>)in.readValue(Animal.class.getClassLoader());
   }
 
   public int describeContents() {
diff --git a/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md
index d21e29ab0926..327530243b58 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/AnotherFakeApi.md
@@ -74,7 +74,7 @@ No authorization required
 
 <a id="getParameterArrayNumber"></a>
 # **getParameterArrayNumber**
-> getParameterArrayNumber(array)
+> getParameterArrayNumber(_array)
 
 parameter array number default value
 
@@ -93,9 +93,9 @@ public class Example {
     defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
 
     AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
-    List<Integer> array = Arrays.asList(); // List<Integer> | array integer
+    List<Integer> _array = Arrays.asList(); // List<Integer> | array integer
     try {
-      apiInstance.getParameterArrayNumber(array);
+      apiInstance.getParameterArrayNumber(_array);
     } catch (ApiException e) {
       System.err.println("Exception when calling AnotherFakeApi#getParameterArrayNumber");
       System.err.println("Status code: " + e.getCode());
@@ -111,7 +111,7 @@ public class Example {
 
 | Name | Type | Description  | Notes |
 |------------- | ------------- | ------------- | -------------|
-| **array** | [**List&lt;Integer&gt;**](Integer.md)| array integer | |
+| **_array** | [**List&lt;Integer&gt;**](Integer.md)| array integer | |
 
 ### Return type
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
index 18f99688c925..2bbe222a1049 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FakeApi.md
@@ -826,7 +826,7 @@ No authorization required
 
 <a id="testEndpointParameters"></a>
 # **testEndpointParameters**
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -857,18 +857,18 @@ public class Example {
     Double _double = 3.4D; // Double | None
     String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
     byte[] _byte = null; // byte[] | None
-    Integer integer = 56; // Integer | None
+    Integer _integer = 56; // Integer | None
     Integer int32 = 56; // Integer | None
     Long int64 = 56L; // Long | None
     Float _float = 3.4F; // Float | None
-    String string = "string_example"; // String | None
+    String _string = "_string_example"; // String | None
     File binary = new File("/path/to/file"); // File | None
-    LocalDate date = LocalDate.now(); // LocalDate | None
-    OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
+    LocalDate _date = LocalDate.now(); // LocalDate | None
+    OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
     String password = "password_example"; // String | None
     String paramCallback = "paramCallback_example"; // String | None
     try {
-      apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+      apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     } catch (ApiException e) {
       System.err.println("Exception when calling FakeApi#testEndpointParameters");
       System.err.println("Status code: " + e.getCode());
@@ -888,14 +888,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/okhttp-gson/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md b/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
index 71790022c16d..19a7adb36882 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**uuidWithDefault** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
diff --git a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/okhttp-gson/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/okhttp-gson/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/okhttp-gson/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/okhttp-gson/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index a58d4bf127b5..9a1003aae51f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -198,7 +198,7 @@ public okhttp3.Call call123testSpecialTagsAsync(Client client, final ApiCallback
     }
     /**
      * Build call for getParameterArrayNumber
-     * @param array array integer (required)
+     * @param _array array integer (required)
      * @param _callback Callback for upload/download progress
      * @return Call to execute
      * @throws ApiException If fail to serialize the request body object
@@ -208,7 +208,7 @@ public okhttp3.Call call123testSpecialTagsAsync(Client client, final ApiCallback
         <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call getParameterArrayNumberCall(List<Integer> array, final ApiCallback _callback) throws ApiException {
+    public okhttp3.Call getParameterArrayNumberCall(List<Integer> _array, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -233,8 +233,8 @@ public okhttp3.Call getParameterArrayNumberCall(List<Integer> array, final ApiCa
         Map<String, String> localVarCookieParams = new HashMap<String, String>();
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-        if (array != null) {
-            localVarHeaderParams.put("array", localVarApiClient.parameterToString(array));
+        if (_array != null) {
+            localVarHeaderParams.put("array", localVarApiClient.parameterToString(_array));
         }
 
         final String[] localVarAccepts = {
@@ -256,20 +256,20 @@ public okhttp3.Call getParameterArrayNumberCall(List<Integer> array, final ApiCa
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call getParameterArrayNumberValidateBeforeCall(List<Integer> array, final ApiCallback _callback) throws ApiException {
-        // verify the required parameter 'array' is set
-        if (array == null) {
-            throw new ApiException("Missing the required parameter 'array' when calling getParameterArrayNumber(Async)");
+    private okhttp3.Call getParameterArrayNumberValidateBeforeCall(List<Integer> _array, final ApiCallback _callback) throws ApiException {
+        // verify the required parameter '_array' is set
+        if (_array == null) {
+            throw new ApiException("Missing the required parameter '_array' when calling getParameterArrayNumber(Async)");
         }
 
-        return getParameterArrayNumberCall(array, _callback);
+        return getParameterArrayNumberCall(_array, _callback);
 
     }
 
     /**
      * parameter array number default value
      * 
-     * @param array array integer (required)
+     * @param _array array integer (required)
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
      <table summary="Response Details" border="1">
@@ -277,14 +277,14 @@ private okhttp3.Call getParameterArrayNumberValidateBeforeCall(List<Integer> arr
         <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
      </table>
      */
-    public void getParameterArrayNumber(List<Integer> array) throws ApiException {
-        getParameterArrayNumberWithHttpInfo(array);
+    public void getParameterArrayNumber(List<Integer> _array) throws ApiException {
+        getParameterArrayNumberWithHttpInfo(_array);
     }
 
     /**
      * parameter array number default value
      * 
-     * @param array array integer (required)
+     * @param _array array integer (required)
      * @return ApiResponse&lt;Void&gt;
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
      * @http.response.details
@@ -293,15 +293,15 @@ public void getParameterArrayNumber(List<Integer> array) throws ApiException {
         <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
      </table>
      */
-    public ApiResponse<Void> getParameterArrayNumberWithHttpInfo(List<Integer> array) throws ApiException {
-        okhttp3.Call localVarCall = getParameterArrayNumberValidateBeforeCall(array, null);
+    public ApiResponse<Void> getParameterArrayNumberWithHttpInfo(List<Integer> _array) throws ApiException {
+        okhttp3.Call localVarCall = getParameterArrayNumberValidateBeforeCall(_array, null);
         return localVarApiClient.execute(localVarCall);
     }
 
     /**
      * parameter array number default value (asynchronously)
      * 
-     * @param array array integer (required)
+     * @param _array array integer (required)
      * @param _callback The callback to be executed when the API call finishes
      * @return The request call
      * @throws ApiException If fail to process the API call, e.g. serializing the request body object
@@ -311,9 +311,9 @@ public ApiResponse<Void> getParameterArrayNumberWithHttpInfo(List<Integer> array
         <tr><td> 200 </td><td> OK </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call getParameterArrayNumberAsync(List<Integer> array, final ApiCallback<Void> _callback) throws ApiException {
+    public okhttp3.Call getParameterArrayNumberAsync(List<Integer> _array, final ApiCallback<Void> _callback) throws ApiException {
 
-        okhttp3.Call localVarCall = getParameterArrayNumberValidateBeforeCall(array, _callback);
+        okhttp3.Call localVarCall = getParameterArrayNumberValidateBeforeCall(_array, _callback);
         localVarApiClient.executeAsync(localVarCall, _callback);
         return localVarCall;
     }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
index 664a08c41d6f..aa9832db6e05 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -1678,14 +1678,14 @@ public okhttp3.Call testClientModelAsync(Client client, final ApiCallback<Client
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+     * @param _date None (optional)
+     * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @param _callback Callback for upload/download progress
@@ -1698,7 +1698,7 @@ public okhttp3.Call testClientModelAsync(Client client, final ApiCallback<Client
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
+    public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
         String basePath = null;
         // Operation Servers
         String[] localBasePaths = new String[] {  };
@@ -1723,8 +1723,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
         Map<String, String> localVarCookieParams = new HashMap<String, String>();
         Map<String, Object> localVarFormParams = new HashMap<String, Object>();
 
-        if (integer != null) {
-            localVarFormParams.put("integer", integer);
+        if (_integer != null) {
+            localVarFormParams.put("integer", _integer);
         }
 
         if (int32 != null) {
@@ -1747,8 +1747,8 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
             localVarFormParams.put("double", _double);
         }
 
-        if (string != null) {
-            localVarFormParams.put("string", string);
+        if (_string != null) {
+            localVarFormParams.put("string", _string);
         }
 
         if (patternWithoutDelimiter != null) {
@@ -1763,12 +1763,12 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
             localVarFormParams.put("binary", binary);
         }
 
-        if (date != null) {
-            localVarFormParams.put("date", date);
+        if (_date != null) {
+            localVarFormParams.put("date", _date);
         }
 
-        if (dateTime != null) {
-            localVarFormParams.put("dateTime", dateTime);
+        if (_dateTime != null) {
+            localVarFormParams.put("dateTime", _dateTime);
         }
 
         if (password != null) {
@@ -1799,7 +1799,7 @@ public okhttp3.Call testEndpointParametersCall(BigDecimal number, Double _double
     }
 
     @SuppressWarnings("rawtypes")
-    private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
+    private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback _callback) throws ApiException {
         // verify the required parameter 'number' is set
         if (number == null) {
             throw new ApiException("Missing the required parameter 'number' when calling testEndpointParameters(Async)");
@@ -1820,7 +1820,7 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
             throw new ApiException("Missing the required parameter '_byte' when calling testEndpointParameters(Async)");
         }
 
-        return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback);
+        return testEndpointParametersCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback);
 
     }
 
@@ -1831,14 +1831,14 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+     * @param _date None (optional)
+     * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @throws ApiException If fail to call the API, e.g. server error or cannot deserialize the response body
@@ -1849,8 +1849,8 @@ private okhttp3.Call testEndpointParametersValidateBeforeCall(BigDecimal number,
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
     /**
@@ -1860,14 +1860,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+     * @param _date None (optional)
+     * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return ApiResponse&lt;Void&gt;
@@ -1879,8 +1879,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null);
+    public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null);
         return localVarApiClient.execute(localVarCall);
     }
 
@@ -1891,14 +1891,14 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+     * @param _date None (optional)
+     * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @param _callback The callback to be executed when the API call finishes
@@ -1911,9 +1911,9 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
         <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
      */
-    public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, final ApiCallback<Void> _callback) throws ApiException {
+    public okhttp3.Call testEndpointParametersAsync(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, final ApiCallback<Void> _callback) throws ApiException {
 
-        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, _callback);
+        okhttp3.Call localVarCall = testEndpointParametersValidateBeforeCall(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, _callback);
         localVarApiClient.executeAsync(localVarCall, _callback);
         return localVarCall;
     }
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 20e5032be7ce..25bb82bbf20f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -54,27 +54,27 @@
 public class FooGetDefaultResponse {
   public static final String SERIALIZED_NAME_STRING = "string";
   @SerializedName(SERIALIZED_NAME_STRING)
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   public Foo getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   /**
@@ -132,20 +132,20 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string)&&
+    return Objects.equals(this._string, fooGetDefaultResponse._string)&&
         Objects.equals(this.additionalProperties, fooGetDefaultResponse.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string, additionalProperties);
+    return Objects.hash(_string, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
index ec4dad1f8d2e..966f818203ea 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -58,7 +58,7 @@
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String SERIALIZED_NAME_INT32 = "int32";
   @SerializedName(SERIALIZED_NAME_INT32)
@@ -86,7 +86,7 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_STRING = "string";
   @SerializedName(SERIALIZED_NAME_STRING)
-  private String string;
+  private String _string;
 
   public static final String SERIALIZED_NAME_BYTE = "byte";
   @SerializedName(SERIALIZED_NAME_BYTE)
@@ -98,15 +98,15 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_UUID_WITH_DEFAULT = "uuid_with_default";
   @SerializedName(SERIALIZED_NAME_UUID_WITH_DEFAULT)
@@ -127,24 +127,24 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -270,22 +270,22 @@ public void setDecimal(BigDecimal decimal) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -327,60 +327,60 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -514,19 +514,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.uuidWithDefault, formatTest.uuidWithDefault) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
@@ -536,26 +536,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, uuidWithDefault, password, patternWithDigits, patternWithDigitsAndDelimiter, additionalProperties);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, uuidWithDefault, password, patternWithDigits, patternWithDigitsAndDelimiter, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    uuidWithDefault: ").append(toIndentedString(uuidWithDefault)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 493fe4c09899..729276dd68b3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -58,81 +58,81 @@
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_MAP = "map";
   @SerializedName(SERIALIZED_NAME_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   /**
@@ -190,24 +190,24 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map)&&
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map)&&
         Objects.equals(this.additionalProperties, mixedPropertiesAndAdditionalPropertiesClass.additionalProperties);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map, additionalProperties);
+    return Objects.hash(_uuid, _dateTime, _map, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
     sb.append("}");
     return sb.toString();
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 46f891173650..61c2dfe2cac0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -57,7 +57,7 @@
 public class ObjectWithDeprecatedFields {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private String uuid;
+  private String _uuid;
 
   public static final String SERIALIZED_NAME_ID = "id";
   @Deprecated
@@ -77,22 +77,22 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -227,7 +227,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars)&&
@@ -236,14 +236,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars, additionalProperties);
+    return Objects.hash(_uuid, id, deprecatedRef, bars, additionalProperties);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/FakeApi.md b/samples/client/petstore/java/rest-assured-jackson/docs/FakeApi.md
index 969883dc5140..388bb5bb6809 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/FakeApi.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/FakeApi.md
@@ -354,7 +354,7 @@ No authorization required
 
 <a id="testEndpointParameters"></a>
 # **testEndpointParameters**
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -386,14 +386,14 @@ api.testEndpointParameters()
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md b/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/rest-assured-jackson/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
index 0d263b24a10a..e0b75556fee3 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -713,14 +713,14 @@ public TestClientModelOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustom
      * @see #_doubleForm None (required)
      * @see #patternWithoutDelimiterForm None (required)
      * @see #_byteForm None (required)
-     * @see #integerForm None (optional)
+     * @see #_integerForm None (optional)
      * @see #int32Form None (optional)
      * @see #int64Form None (optional)
      * @see #_floatForm None (optional)
-     * @see #stringForm None (optional)
+     * @see #_stringForm None (optional)
      * @see #binaryMultiPart None (optional)
-     * @see #dateForm None (optional)
-     * @see #dateTimeForm None (optional)
+     * @see #_dateForm None (optional)
+     * @see #_dateTimeForm None (optional)
      * @see #passwordForm None (optional)
      * @see #paramCallbackForm None (optional)
      */
@@ -750,14 +750,14 @@ public <T> T execute(Function<Response, T> handler) {
             return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
-         public static final String INTEGER_FORM = "integer";
+         public static final String _INTEGER_FORM = "integer";
 
          /**
-         * @param integer (Integer) None (optional)
+         * @param _integer (Integer) None (optional)
          * @return operation
          */
-         public TestEndpointParametersOper integerForm(Object... integer) {
-            reqSpec.addFormParam(INTEGER_FORM, integer);
+         public TestEndpointParametersOper _integerForm(Object... _integer) {
+            reqSpec.addFormParam(_INTEGER_FORM, _integer);
             return this;
          }
 
@@ -816,14 +816,14 @@ public TestEndpointParametersOper _doubleForm(Object... _double) {
             return this;
          }
 
-         public static final String STRING_FORM = "string";
+         public static final String _STRING_FORM = "string";
 
          /**
-         * @param string (String) None (optional)
+         * @param _string (String) None (optional)
          * @return operation
          */
-         public TestEndpointParametersOper stringForm(Object... string) {
-            reqSpec.addFormParam(STRING_FORM, string);
+         public TestEndpointParametersOper _stringForm(Object... _string) {
+            reqSpec.addFormParam(_STRING_FORM, _string);
             return this;
          }
 
@@ -849,25 +849,25 @@ public TestEndpointParametersOper _byteForm(Object... _byte) {
             return this;
          }
 
-         public static final String DATE_FORM = "date";
+         public static final String _DATE_FORM = "date";
 
          /**
-         * @param date (LocalDate) None (optional)
+         * @param _date (LocalDate) None (optional)
          * @return operation
          */
-         public TestEndpointParametersOper dateForm(Object... date) {
-            reqSpec.addFormParam(DATE_FORM, date);
+         public TestEndpointParametersOper _dateForm(Object... _date) {
+            reqSpec.addFormParam(_DATE_FORM, _date);
             return this;
          }
 
-         public static final String DATE_TIME_FORM = "dateTime";
+         public static final String _DATE_TIME_FORM = "dateTime";
 
          /**
-         * @param dateTime (OffsetDateTime) None (optional)
+         * @param _dateTime (OffsetDateTime) None (optional)
          * @return operation
          */
-         public TestEndpointParametersOper dateTimeForm(Object... dateTime) {
-            reqSpec.addFormParam(DATE_TIME_FORM, dateTime);
+         public TestEndpointParametersOper _dateTimeForm(Object... _dateTime) {
+            reqSpec.addFormParam(_DATE_TIME_FORM, _dateTime);
             return this;
          }
 
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
index c6775d338df9..211d40646b04 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -54,7 +54,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -72,7 +72,7 @@ public class FormatTest {
   private Double _double;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -81,34 +81,34 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
  @Min(10) @Max(100)
@@ -116,14 +116,14 @@ public FormatTest integer(Integer integer) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -266,15 +266,15 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")
@@ -282,14 +282,14 @@ public FormatTest string(String string) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -346,15 +346,15 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @NotNull
@@ -364,25 +364,25 @@ public FormatTest date(LocalDate date) {
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @Valid
@@ -391,25 +391,25 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @Valid
@@ -418,14 +418,14 @@ public FormatTest uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -455,15 +455,15 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   @Valid
@@ -472,14 +472,14 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -491,45 +491,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 7f2df1916aff..df44f82f4e46 100644
--- a/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured-jackson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -42,26 +42,26 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @Valid
@@ -70,25 +70,25 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @Valid
@@ -97,33 +97,33 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @Valid
@@ -132,14 +132,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -151,23 +151,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/rest-assured/docs/FakeApi.md b/samples/client/petstore/java/rest-assured/docs/FakeApi.md
index 969883dc5140..388bb5bb6809 100644
--- a/samples/client/petstore/java/rest-assured/docs/FakeApi.md
+++ b/samples/client/petstore/java/rest-assured/docs/FakeApi.md
@@ -354,7 +354,7 @@ No authorization required
 
 <a id="testEndpointParameters"></a>
 # **testEndpointParameters**
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -386,14 +386,14 @@ api.testEndpointParameters()
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/rest-assured/docs/FormatTest.md b/samples/client/petstore/java/rest-assured/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/rest-assured/docs/FormatTest.md
+++ b/samples/client/petstore/java/rest-assured/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/rest-assured/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
index 500e45c7a32f..d48c8a192da1 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -714,14 +714,14 @@ public TestClientModelOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustom
      * @see #_doubleForm None (required)
      * @see #patternWithoutDelimiterForm None (required)
      * @see #_byteForm None (required)
-     * @see #integerForm None (optional)
+     * @see #_integerForm None (optional)
      * @see #int32Form None (optional)
      * @see #int64Form None (optional)
      * @see #_floatForm None (optional)
-     * @see #stringForm None (optional)
+     * @see #_stringForm None (optional)
      * @see #binaryMultiPart None (optional)
-     * @see #dateForm None (optional)
-     * @see #dateTimeForm None (optional)
+     * @see #_dateForm None (optional)
+     * @see #_dateTimeForm None (optional)
      * @see #passwordForm None (optional)
      * @see #paramCallbackForm None (optional)
      */
@@ -751,14 +751,14 @@ public <T> T execute(Function<Response, T> handler) {
             return handler.apply(RestAssured.given().spec(reqSpec.build()).expect().spec(respSpec.build()).when().request(REQ_METHOD, REQ_URI));
         }
 
-         public static final String INTEGER_FORM = "integer";
+         public static final String _INTEGER_FORM = "integer";
 
          /**
-         * @param integer (Integer) None (optional)
+         * @param _integer (Integer) None (optional)
          * @return operation
          */
-         public TestEndpointParametersOper integerForm(Object... integer) {
-            reqSpec.addFormParam(INTEGER_FORM, integer);
+         public TestEndpointParametersOper _integerForm(Object... _integer) {
+            reqSpec.addFormParam(_INTEGER_FORM, _integer);
             return this;
          }
 
@@ -817,14 +817,14 @@ public TestEndpointParametersOper _doubleForm(Object... _double) {
             return this;
          }
 
-         public static final String STRING_FORM = "string";
+         public static final String _STRING_FORM = "string";
 
          /**
-         * @param string (String) None (optional)
+         * @param _string (String) None (optional)
          * @return operation
          */
-         public TestEndpointParametersOper stringForm(Object... string) {
-            reqSpec.addFormParam(STRING_FORM, string);
+         public TestEndpointParametersOper _stringForm(Object... _string) {
+            reqSpec.addFormParam(_STRING_FORM, _string);
             return this;
          }
 
@@ -850,25 +850,25 @@ public TestEndpointParametersOper _byteForm(Object... _byte) {
             return this;
          }
 
-         public static final String DATE_FORM = "date";
+         public static final String _DATE_FORM = "date";
 
          /**
-         * @param date (LocalDate) None (optional)
+         * @param _date (LocalDate) None (optional)
          * @return operation
          */
-         public TestEndpointParametersOper dateForm(Object... date) {
-            reqSpec.addFormParam(DATE_FORM, date);
+         public TestEndpointParametersOper _dateForm(Object... _date) {
+            reqSpec.addFormParam(_DATE_FORM, _date);
             return this;
          }
 
-         public static final String DATE_TIME_FORM = "dateTime";
+         public static final String _DATE_TIME_FORM = "dateTime";
 
          /**
-         * @param dateTime (OffsetDateTime) None (optional)
+         * @param _dateTime (OffsetDateTime) None (optional)
          * @return operation
          */
-         public TestEndpointParametersOper dateTimeForm(Object... dateTime) {
-            reqSpec.addFormParam(DATE_TIME_FORM, dateTime);
+         public TestEndpointParametersOper _dateTimeForm(Object... _dateTime) {
+            reqSpec.addFormParam(_DATE_TIME_FORM, _dateTime);
             return this;
          }
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
index c02078c47bbf..4c1a55d151b6 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -37,7 +37,7 @@
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String SERIALIZED_NAME_INT32 = "int32";
   @SerializedName(SERIALIZED_NAME_INT32)
@@ -61,7 +61,7 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_STRING = "string";
   @SerializedName(SERIALIZED_NAME_STRING)
-  private String string;
+  private String _string;
 
   public static final String SERIALIZED_NAME_BYTE = "byte";
   @SerializedName(SERIALIZED_NAME_BYTE)
@@ -73,15 +73,15 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_PASSWORD = "password";
   @SerializedName(SERIALIZED_NAME_PASSWORD)
@@ -89,33 +89,33 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
   @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
  @Min(10) @Max(100)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -238,26 +238,26 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -306,15 +306,15 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @NotNull
@@ -322,58 +322,58 @@ public FormatTest date(LocalDate date) {
 
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @Valid
 
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @Valid
 
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -399,27 +399,27 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   @Valid
 
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -431,45 +431,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 00cadb44f0ab..5dba7116c1ab 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -37,94 +37,94 @@
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_MAP = "map";
   @SerializedName(SERIALIZED_NAME_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @Valid
 
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @Valid
 
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @Valid
 
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -136,23 +136,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md b/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/restclient-swagger2/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/FormatTest.md b/samples/client/petstore/java/restclient-swagger2/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/FormatTest.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/restclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/restclient-swagger2/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/restclient-swagger2/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/restclient-swagger2/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/restclient-swagger2/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
index 8263a5bb8722..2f84f376bdac 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -991,19 +991,19 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws RestCl
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientResponseException {
+    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientResponseException {
         Object postBody = null;
         // verify the required parameter 'number' is set
         if (number == null) {
@@ -1029,8 +1029,8 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
         final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<>();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<>();
 
-        if (integer != null)
-            formParams.add("integer", integer);
+        if (_integer != null)
+            formParams.add("integer", _integer);
         if (int32 != null)
             formParams.add("int32", int32);
         if (int64 != null)
@@ -1041,18 +1041,18 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
             formParams.add("float", _float);
         if (_double != null)
             formParams.add("double", _double);
-        if (string != null)
-            formParams.add("string", string);
+        if (_string != null)
+            formParams.add("string", _string);
         if (patternWithoutDelimiter != null)
             formParams.add("pattern_without_delimiter", patternWithoutDelimiter);
         if (_byte != null)
             formParams.add("byte", _byte);
         if (binary != null)
             formParams.add("binary", new FileSystemResource(binary));
-        if (date != null)
-            formParams.add("date", date);
-        if (dateTime != null)
-            formParams.add("dateTime", dateTime);
+        if (_date != null)
+            formParams.add("date", _date);
+        if (_dateTime != null)
+            formParams.add("dateTime", _dateTime);
         if (password != null)
             formParams.add("password", password);
         if (paramCallback != null)
@@ -1080,21 +1080,21 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientResponseException {
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).body(localVarReturnType);
+        testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).body(localVarReturnType);
     }
 
     /**
@@ -1106,21 +1106,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientResponseException {
+    public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType);
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).toEntity(localVarReturnType);
     }
 
     /**
@@ -1132,21 +1132,21 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @return ResponseSpec
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientResponseException {
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientResponseException {
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 4b68c7841897..f0cd6db22395 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -35,20 +35,20 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -56,14 +56,14 @@ public FooGetDefaultResponse string(Foo string) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -75,19 +75,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
index 7b599e689162..1c0c4efd1382 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -54,7 +54,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -75,7 +75,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -84,13 +84,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -104,17 +104,17 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -122,14 +122,14 @@ public FormatTest integer(Integer integer) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -296,15 +296,15 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -312,14 +312,14 @@ public FormatTest string(String string) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -374,15 +374,15 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @jakarta.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
@@ -390,25 +390,25 @@ public FormatTest date(LocalDate date) {
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -416,25 +416,25 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -442,14 +442,14 @@ public FormatTest uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -539,19 +539,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -559,26 +559,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 17daccfa1d22..265f4714a6d4 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -40,26 +40,26 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map;
+  private Map<String, Animal> _map;
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -67,25 +67,25 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -93,33 +93,33 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -127,14 +127,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -146,23 +146,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 2062d63268a7..caa06d39a49e 100644
--- a/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/restclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -41,7 +41,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -55,15 +55,15 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -71,14 +71,14 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -182,7 +182,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -190,14 +190,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/restclient/docs/FakeApi.md b/samples/client/petstore/java/restclient/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/restclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/restclient/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/restclient/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/restclient/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/restclient/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/restclient/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/restclient/docs/FormatTest.md b/samples/client/petstore/java/restclient/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/restclient/docs/FormatTest.md
+++ b/samples/client/petstore/java/restclient/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/restclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/restclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/restclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/restclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/restclient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/restclient/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/restclient/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/restclient/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java
index 8263a5bb8722..2f84f376bdac 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -991,19 +991,19 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws RestCl
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientResponseException {
+    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientResponseException {
         Object postBody = null;
         // verify the required parameter 'number' is set
         if (number == null) {
@@ -1029,8 +1029,8 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
         final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<>();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<>();
 
-        if (integer != null)
-            formParams.add("integer", integer);
+        if (_integer != null)
+            formParams.add("integer", _integer);
         if (int32 != null)
             formParams.add("int32", int32);
         if (int64 != null)
@@ -1041,18 +1041,18 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
             formParams.add("float", _float);
         if (_double != null)
             formParams.add("double", _double);
-        if (string != null)
-            formParams.add("string", string);
+        if (_string != null)
+            formParams.add("string", _string);
         if (patternWithoutDelimiter != null)
             formParams.add("pattern_without_delimiter", patternWithoutDelimiter);
         if (_byte != null)
             formParams.add("byte", _byte);
         if (binary != null)
             formParams.add("binary", new FileSystemResource(binary));
-        if (date != null)
-            formParams.add("date", date);
-        if (dateTime != null)
-            formParams.add("dateTime", dateTime);
+        if (_date != null)
+            formParams.add("date", _date);
+        if (_dateTime != null)
+            formParams.add("dateTime", _dateTime);
         if (password != null)
             formParams.add("password", password);
         if (paramCallback != null)
@@ -1080,21 +1080,21 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientResponseException {
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).body(localVarReturnType);
+        testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).body(localVarReturnType);
     }
 
     /**
@@ -1106,21 +1106,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientResponseException {
+    public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<>() {};
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType);
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).toEntity(localVarReturnType);
     }
 
     /**
@@ -1132,21 +1132,21 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @return ResponseSpec
      * @throws RestClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientResponseException {
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientResponseException {
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index d7c27a6d2f5f..cd38e48064dd 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -34,34 +34,34 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -73,19 +73,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FormatTest.java
index 27131652b54f..5d1c17a58cc2 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -53,7 +53,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -74,7 +74,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -83,13 +83,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -103,31 +103,31 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -288,29 +288,29 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -363,79 +363,79 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -522,19 +522,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -542,26 +542,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b8f8dc8bc5cb..3b598e077552 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,98 +39,98 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map;
+  private Map<String, Animal> _map;
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -142,23 +142,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 96d8c6f6eaf6..480f5ed077f4 100644
--- a/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/restclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -40,7 +40,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -177,7 +177,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -185,14 +185,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/resteasy/docs/FakeApi.md b/samples/client/petstore/java/resteasy/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/resteasy/docs/FakeApi.md
+++ b/samples/client/petstore/java/resteasy/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/resteasy/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/resteasy/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/resteasy/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/resteasy/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/resteasy/docs/FormatTest.md b/samples/client/petstore/java/resteasy/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/resteasy/docs/FormatTest.md
+++ b/samples/client/petstore/java/resteasy/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resteasy/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/resteasy/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/resteasy/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/resteasy/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/resteasy/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
index 17ca563c2938..73bf4ee0ff2e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -589,19 +589,19 @@ public Client testClientModel(Client client) throws ApiException {
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
     Object localVarPostBody = null;
     
     // verify the required parameter 'number' is set
@@ -636,8 +636,8 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
 
     
     
-    if (integer != null)
-      localVarFormParams.put("integer", integer);
+    if (_integer != null)
+      localVarFormParams.put("integer", _integer);
 if (int32 != null)
       localVarFormParams.put("int32", int32);
 if (int64 != null)
@@ -648,18 +648,18 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
       localVarFormParams.put("float", _float);
 if (_double != null)
       localVarFormParams.put("double", _double);
-if (string != null)
-      localVarFormParams.put("string", string);
+if (_string != null)
+      localVarFormParams.put("string", _string);
 if (patternWithoutDelimiter != null)
       localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
 if (_byte != null)
       localVarFormParams.put("byte", _byte);
 if (binary != null)
       localVarFormParams.put("binary", binary);
-if (date != null)
-      localVarFormParams.put("date", date);
-if (dateTime != null)
-      localVarFormParams.put("dateTime", dateTime);
+if (_date != null)
+      localVarFormParams.put("date", _date);
+if (_dateTime != null)
+      localVarFormParams.put("dateTime", _dateTime);
 if (password != null)
       localVarFormParams.put("password", password);
 if (paramCallback != null)
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 74255e7d06ca..d28cef633125 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -34,34 +34,34 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -73,19 +73,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
index ea573d38f890..96a6887dbda2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -53,7 +53,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -74,7 +74,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -83,13 +83,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -103,31 +103,31 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -288,29 +288,29 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -363,79 +363,79 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -522,19 +522,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -542,26 +542,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index bdeb14838ba5..7dda6d2e6b8d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,98 +39,98 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -142,23 +142,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 5cea8942cd2c..b1316e262776 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -40,7 +40,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -177,7 +177,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -185,14 +185,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/resttemplate-withXml/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md b/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/resttemplate-withXml/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/resttemplate-withXml/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/resttemplate-withXml/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
index 87f30d814f8a..4777679d5b90 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -651,20 +651,20 @@ public ResponseEntity<Client> testClientModelWithHttpInfo(Client client) throws
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @throws RestClientException if an error occurs while attempting to invoke the API
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException {
-        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientException {
+        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
     /**
@@ -676,20 +676,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return ResponseEntity&lt;Void&gt;
      * @throws RestClientException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException {
+    public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'number' is set
@@ -718,8 +718,8 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
         final MultiValueMap<String, String> localVarCookieParams = new LinkedMultiValueMap<String, String>();
         final MultiValueMap<String, Object> localVarFormParams = new LinkedMultiValueMap<String, Object>();
 
-        if (integer != null)
-            localVarFormParams.add("integer", integer);
+        if (_integer != null)
+            localVarFormParams.add("integer", _integer);
         if (int32 != null)
             localVarFormParams.add("int32", int32);
         if (int64 != null)
@@ -730,18 +730,18 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
             localVarFormParams.add("float", _float);
         if (_double != null)
             localVarFormParams.add("double", _double);
-        if (string != null)
-            localVarFormParams.add("string", string);
+        if (_string != null)
+            localVarFormParams.add("string", _string);
         if (patternWithoutDelimiter != null)
             localVarFormParams.add("pattern_without_delimiter", patternWithoutDelimiter);
         if (_byte != null)
             localVarFormParams.add("byte", _byte);
         if (binary != null)
             localVarFormParams.add("binary", new FileSystemResource(binary));
-        if (date != null)
-            localVarFormParams.add("date", date);
-        if (dateTime != null)
-            localVarFormParams.add("dateTime", dateTime);
+        if (_date != null)
+            localVarFormParams.add("date", _date);
+        if (_dateTime != null)
+            localVarFormParams.add("dateTime", _dateTime);
         if (password != null)
             localVarFormParams.add("password", password);
         if (paramCallback != null)
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index d3e1d994f43e..ff7f45492bb2 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -42,20 +42,20 @@
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
   @XmlElement(name = "string")
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
@@ -63,15 +63,15 @@ public FooGetDefaultResponse string(Foo string) {
   @JacksonXmlProperty(localName = "string")
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "string")
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -83,19 +83,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
index 1eb6a28292ef..3e3214c22698 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -61,7 +61,7 @@
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @XmlElement(name = "integer")
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   @XmlElement(name = "int32")
@@ -89,7 +89,7 @@ public class FormatTest {
 
   public static final String JSON_PROPERTY_STRING = "string";
   @XmlElement(name = "string")
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   @XmlElement(name = "byte")
@@ -101,16 +101,16 @@ public class FormatTest {
 
   public static final String JSON_PROPERTY_DATE = "date";
   @XmlElement(name = "date")
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @XmlElement(name = "dateTime")
   @XmlJavaTypeAdapter(OffsetDateTimeXmlAdapter.class)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
   @XmlElement(name = "uuid")
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   @XmlElement(name = "password")
@@ -127,17 +127,17 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
@@ -145,15 +145,15 @@ public FormatTest integer(Integer integer) {
   @JacksonXmlProperty(localName = "integer")
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "integer")
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -326,15 +326,15 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
@@ -342,15 +342,15 @@ public FormatTest string(String string) {
   @JacksonXmlProperty(localName = "string")
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "string")
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -407,15 +407,15 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
@@ -423,26 +423,26 @@ public FormatTest date(LocalDate date) {
   @JacksonXmlProperty(localName = "date")
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
   @JacksonXmlProperty(localName = "date")
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
@@ -450,26 +450,26 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   @JacksonXmlProperty(localName = "dateTime")
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "dateTime")
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -477,15 +477,15 @@ public FormatTest uuid(UUID uuid) {
   @JacksonXmlProperty(localName = "uuid")
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -578,19 +578,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -598,26 +598,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6cc79d770e99..eb695e88aa98 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -47,29 +47,29 @@
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @XmlElement(name = "uuid")
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @XmlElement(name = "dateTime")
   @XmlJavaTypeAdapter(OffsetDateTimeXmlAdapter.class)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
   @XmlElement(name = "map")
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -77,26 +77,26 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @JacksonXmlProperty(localName = "uuid")
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
@@ -104,34 +104,34 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   @JacksonXmlProperty(localName = "dateTime")
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "dateTime")
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
@@ -140,7 +140,7 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   @JacksonXmlElementWrapper(useWrapping = false)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
@@ -148,8 +148,8 @@ public Map<String, Animal> getMap() {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "map")
   @JacksonXmlElementWrapper(useWrapping = false)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -161,23 +161,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index fa2d6ebb56d0..7e07f5d1dc01 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -48,7 +48,7 @@
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @XmlElement(name = "uuid")
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   @XmlElement(name = "id")
@@ -65,15 +65,15 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
@@ -81,15 +81,15 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
   @JacksonXmlProperty(localName = "uuid")
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
   @JacksonXmlProperty(localName = "uuid")
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -198,7 +198,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -206,14 +206,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/resttemplate/docs/FakeApi.md b/samples/client/petstore/java/resttemplate/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/resttemplate/docs/FakeApi.md
+++ b/samples/client/petstore/java/resttemplate/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/resttemplate/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/resttemplate/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/resttemplate/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/resttemplate/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/resttemplate/docs/FormatTest.md b/samples/client/petstore/java/resttemplate/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/resttemplate/docs/FormatTest.md
+++ b/samples/client/petstore/java/resttemplate/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/resttemplate/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/resttemplate/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/resttemplate/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/resttemplate/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/resttemplate/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
index 87f30d814f8a..4777679d5b90 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -651,20 +651,20 @@ public ResponseEntity<Client> testClientModelWithHttpInfo(Client client) throws
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @throws RestClientException if an error occurs while attempting to invoke the API
      */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException {
-        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientException {
+        testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
     /**
@@ -676,20 +676,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return ResponseEntity&lt;Void&gt;
      * @throws RestClientException if an error occurs while attempting to invoke the API
      */
-    public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws RestClientException {
+    public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws RestClientException {
         Object localVarPostBody = null;
         
         // verify the required parameter 'number' is set
@@ -718,8 +718,8 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
         final MultiValueMap<String, String> localVarCookieParams = new LinkedMultiValueMap<String, String>();
         final MultiValueMap<String, Object> localVarFormParams = new LinkedMultiValueMap<String, Object>();
 
-        if (integer != null)
-            localVarFormParams.add("integer", integer);
+        if (_integer != null)
+            localVarFormParams.add("integer", _integer);
         if (int32 != null)
             localVarFormParams.add("int32", int32);
         if (int64 != null)
@@ -730,18 +730,18 @@ public ResponseEntity<Void> testEndpointParametersWithHttpInfo(BigDecimal number
             localVarFormParams.add("float", _float);
         if (_double != null)
             localVarFormParams.add("double", _double);
-        if (string != null)
-            localVarFormParams.add("string", string);
+        if (_string != null)
+            localVarFormParams.add("string", _string);
         if (patternWithoutDelimiter != null)
             localVarFormParams.add("pattern_without_delimiter", patternWithoutDelimiter);
         if (_byte != null)
             localVarFormParams.add("byte", _byte);
         if (binary != null)
             localVarFormParams.add("binary", new FileSystemResource(binary));
-        if (date != null)
-            localVarFormParams.add("date", date);
-        if (dateTime != null)
-            localVarFormParams.add("dateTime", dateTime);
+        if (_date != null)
+            localVarFormParams.add("date", _date);
+        if (_dateTime != null)
+            localVarFormParams.add("dateTime", _dateTime);
         if (password != null)
             localVarFormParams.add("password", password);
         if (paramCallback != null)
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index a636f728d275..362ebc5a2e9f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -34,7 +34,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
@@ -42,33 +42,33 @@ public FooGetDefaultResponse() {
   /**
    * Constructor with all args parameters
    */
-  public FooGetDefaultResponse(@JsonProperty(JSON_PROPERTY_STRING) Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse(@JsonProperty(JSON_PROPERTY_STRING) Foo _string) {
+    this._string = _string;
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -80,19 +80,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -120,8 +120,8 @@ protected Builder(FooGetDefaultResponse instance) {
       this.instance = instance;
     }
 
-    public FooGetDefaultResponse.Builder string(Foo string) {
-      this.instance.string = string;
+    public FooGetDefaultResponse.Builder _string(Foo _string) {
+      this.instance._string = _string;
       return this;
     }
 
@@ -158,7 +158,7 @@ public static FooGetDefaultResponse.Builder builder() {
   */
   public FooGetDefaultResponse.Builder toBuilder() {
     return new FooGetDefaultResponse.Builder()
-      .string(getString());
+      ._string(getString());
   }
 
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
index 001c3c1049fc..0d4bd30d73b2 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -53,7 +53,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -74,7 +74,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -83,13 +83,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -106,50 +106,50 @@ public FormatTest() {
   /**
    * Constructor with all args parameters
    */
-  public FormatTest(@JsonProperty(JSON_PROPERTY_INTEGER) Integer integer, @JsonProperty(JSON_PROPERTY_INT32) Integer int32, @JsonProperty(JSON_PROPERTY_INT64) Long int64, @JsonProperty(JSON_PROPERTY_NUMBER) BigDecimal number, @JsonProperty(JSON_PROPERTY_FLOAT) Float _float, @JsonProperty(JSON_PROPERTY_DOUBLE) Double _double, @JsonProperty(JSON_PROPERTY_DECIMAL) BigDecimal decimal, @JsonProperty(JSON_PROPERTY_STRING) String string, @JsonProperty(JSON_PROPERTY_BYTE) byte[] _byte, @JsonProperty(JSON_PROPERTY_BINARY) File binary, @JsonProperty(JSON_PROPERTY_DATE) LocalDate date, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_UUID) UUID uuid, @JsonProperty(JSON_PROPERTY_PASSWORD) String password, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS) String patternWithDigits, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER) String patternWithDigitsAndDelimiter) {
-    this.integer = integer;
+  public FormatTest(@JsonProperty(JSON_PROPERTY_INTEGER) Integer _integer, @JsonProperty(JSON_PROPERTY_INT32) Integer int32, @JsonProperty(JSON_PROPERTY_INT64) Long int64, @JsonProperty(JSON_PROPERTY_NUMBER) BigDecimal number, @JsonProperty(JSON_PROPERTY_FLOAT) Float _float, @JsonProperty(JSON_PROPERTY_DOUBLE) Double _double, @JsonProperty(JSON_PROPERTY_DECIMAL) BigDecimal decimal, @JsonProperty(JSON_PROPERTY_STRING) String _string, @JsonProperty(JSON_PROPERTY_BYTE) byte[] _byte, @JsonProperty(JSON_PROPERTY_BINARY) File binary, @JsonProperty(JSON_PROPERTY_DATE) LocalDate _date, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime _dateTime, @JsonProperty(JSON_PROPERTY_UUID) UUID _uuid, @JsonProperty(JSON_PROPERTY_PASSWORD) String password, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS) String patternWithDigits, @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER) String patternWithDigitsAndDelimiter) {
+    this._integer = _integer;
     this.int32 = int32;
     this.int64 = int64;
     this.number = number;
     this._float = _float;
     this._double = _double;
     this.decimal = decimal;
-    this.string = string;
+    this._string = _string;
     this._byte = _byte;
     this.binary = binary;
-    this.date = date;
-    this.dateTime = dateTime;
-    this.uuid = uuid;
+    this._date = _date;
+    this._dateTime = _dateTime;
+    this._uuid = _uuid;
     this.password = password;
     this.patternWithDigits = patternWithDigits;
     this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -310,29 +310,29 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -385,79 +385,79 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -544,19 +544,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -564,26 +564,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
@@ -614,8 +614,8 @@ protected Builder(FormatTest instance) {
       this.instance = instance;
     }
 
-    public FormatTest.Builder integer(Integer integer) {
-      this.instance.integer = integer;
+    public FormatTest.Builder _integer(Integer _integer) {
+      this.instance._integer = _integer;
       return this;
     }
     public FormatTest.Builder int32(Integer int32) {
@@ -642,8 +642,8 @@ public FormatTest.Builder decimal(BigDecimal decimal) {
       this.instance.decimal = decimal;
       return this;
     }
-    public FormatTest.Builder string(String string) {
-      this.instance.string = string;
+    public FormatTest.Builder _string(String _string) {
+      this.instance._string = _string;
       return this;
     }
     public FormatTest.Builder _byte(byte[] _byte) {
@@ -654,16 +654,16 @@ public FormatTest.Builder binary(File binary) {
       this.instance.binary = binary;
       return this;
     }
-    public FormatTest.Builder date(LocalDate date) {
-      this.instance.date = date;
+    public FormatTest.Builder _date(LocalDate _date) {
+      this.instance._date = _date;
       return this;
     }
-    public FormatTest.Builder dateTime(OffsetDateTime dateTime) {
-      this.instance.dateTime = dateTime;
+    public FormatTest.Builder _dateTime(OffsetDateTime _dateTime) {
+      this.instance._dateTime = _dateTime;
       return this;
     }
-    public FormatTest.Builder uuid(UUID uuid) {
-      this.instance.uuid = uuid;
+    public FormatTest.Builder _uuid(UUID _uuid) {
+      this.instance._uuid = _uuid;
       return this;
     }
     public FormatTest.Builder password(String password) {
@@ -712,19 +712,19 @@ public static FormatTest.Builder builder() {
   */
   public FormatTest.Builder toBuilder() {
     return new FormatTest.Builder()
-      .integer(getInteger())
+      ._integer(getInteger())
       .int32(getInt32())
       .int64(getInt64())
       .number(getNumber())
       ._float(getFloat())
       ._double(getDouble())
       .decimal(getDecimal())
-      .string(getString())
+      ._string(getString())
       ._byte(getByte())
       .binary(getBinary())
-      .date(getDate())
-      .dateTime(getDateTime())
-      .uuid(getUuid())
+      ._date(getDate())
+      ._dateTime(getDateTime())
+      ._uuid(getUuid())
       .password(getPassword())
       .patternWithDigits(getPatternWithDigits())
       .patternWithDigitsAndDelimiter(getPatternWithDigitsAndDelimiter());
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 236eaad2a3bb..f75bf1593162 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,13 +39,13 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map;
+  private Map<String, Animal> _map;
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
@@ -53,93 +53,93 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
   /**
    * Constructor with all args parameters
    */
-  public MixedPropertiesAndAdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_UUID) UUID uuid, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime dateTime, @JsonProperty(JSON_PROPERTY_MAP) Map<String, Animal> map) {
-    this.uuid = uuid;
-    this.dateTime = dateTime;
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass(@JsonProperty(JSON_PROPERTY_UUID) UUID _uuid, @JsonProperty(JSON_PROPERTY_DATE_TIME) OffsetDateTime _dateTime, @JsonProperty(JSON_PROPERTY_MAP) Map<String, Animal> _map) {
+    this._uuid = _uuid;
+    this._dateTime = _dateTime;
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -151,23 +151,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -195,16 +195,16 @@ protected Builder(MixedPropertiesAndAdditionalPropertiesClass instance) {
       this.instance = instance;
     }
 
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder uuid(UUID uuid) {
-      this.instance.uuid = uuid;
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _uuid(UUID _uuid) {
+      this.instance._uuid = _uuid;
       return this;
     }
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder dateTime(OffsetDateTime dateTime) {
-      this.instance.dateTime = dateTime;
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _dateTime(OffsetDateTime _dateTime) {
+      this.instance._dateTime = _dateTime;
       return this;
     }
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder map(Map<String, Animal> map) {
-      this.instance.map = map;
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _map(Map<String, Animal> _map) {
+      this.instance._map = _map;
       return this;
     }
 
@@ -241,9 +241,9 @@ public static MixedPropertiesAndAdditionalPropertiesClass.Builder builder() {
   */
   public MixedPropertiesAndAdditionalPropertiesClass.Builder toBuilder() {
     return new MixedPropertiesAndAdditionalPropertiesClass.Builder()
-      .uuid(getUuid())
-      .dateTime(getDateTime())
-      .map(getMap());
+      ._uuid(getUuid())
+      ._dateTime(getDateTime())
+      ._map(getMap());
   }
 
 
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index bdc2bb036979..278635ce2dce 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -40,7 +40,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -57,36 +57,36 @@ public ObjectWithDeprecatedFields() {
   /**
    * Constructor with all args parameters
    */
-  public ObjectWithDeprecatedFields(@JsonProperty(JSON_PROPERTY_UUID) String uuid, @JsonProperty(JSON_PROPERTY_ID) BigDecimal id, @JsonProperty(JSON_PROPERTY_DEPRECATED_REF) DeprecatedObject deprecatedRef, @JsonProperty(JSON_PROPERTY_BARS) List<String> bars) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields(@JsonProperty(JSON_PROPERTY_UUID) String _uuid, @JsonProperty(JSON_PROPERTY_ID) BigDecimal id, @JsonProperty(JSON_PROPERTY_DEPRECATED_REF) DeprecatedObject deprecatedRef, @JsonProperty(JSON_PROPERTY_BARS) List<String> bars) {
+    this._uuid = _uuid;
     this.id = id;
     this.deprecatedRef = deprecatedRef;
     this.bars = bars;
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -187,7 +187,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -195,14 +195,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
@@ -233,8 +233,8 @@ protected Builder(ObjectWithDeprecatedFields instance) {
       this.instance = instance;
     }
 
-    public ObjectWithDeprecatedFields.Builder uuid(String uuid) {
-      this.instance.uuid = uuid;
+    public ObjectWithDeprecatedFields.Builder _uuid(String _uuid) {
+      this.instance._uuid = _uuid;
       return this;
     }
     public ObjectWithDeprecatedFields.Builder id(BigDecimal id) {
@@ -283,7 +283,7 @@ public static ObjectWithDeprecatedFields.Builder builder() {
   */
   public ObjectWithDeprecatedFields.Builder toBuilder() {
     return new ObjectWithDeprecatedFields.Builder()
-      .uuid(getUuid())
+      ._uuid(getUuid())
       .id(getId())
       .deprecatedRef(getDeprecatedRef())
       .bars(getBars());
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md b/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
index 5722d2acb576..36ce94a6faea 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/FakeApi.md
@@ -548,7 +548,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -580,18 +580,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -612,14 +612,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md b/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2-play26/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java
index 43c1db6acd00..ec4a489cda57 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -139,14 +139,14 @@ CompletionStage<Response<Client>> testClientModel(
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return Call&lt;Void&gt;
@@ -154,7 +154,7 @@ CompletionStage<Response<Client>> testClientModel(
   @retrofit2.http.FormUrlEncoded
   @POST("fake")
   CompletionStage<Response<Void>> testEndpointParameters(
-    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
+    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer _integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String _string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate _date, @retrofit2.http.Field("dateTime") OffsetDateTime _dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
   );
 
   /**
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
index 6feda4d6754f..ddcbcd2eb88e 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -53,7 +53,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -71,7 +71,7 @@ public class FormatTest {
   private Double _double;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -80,34 +80,34 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @jakarta.annotation.Nullable
  @Min(10) @Max(100)
@@ -115,14 +115,14 @@ public FormatTest integer(Integer integer) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -265,15 +265,15 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")
@@ -281,14 +281,14 @@ public FormatTest string(String string) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -345,15 +345,15 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @jakarta.annotation.Nonnull
   @NotNull
@@ -363,25 +363,25 @@ public FormatTest date(LocalDate date) {
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -390,25 +390,25 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -417,14 +417,14 @@ public FormatTest uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -454,15 +454,15 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -471,14 +471,14 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -490,45 +490,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0f6372fa054d..a3446bd903ea 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -41,26 +41,26 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -69,25 +69,25 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -96,33 +96,33 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @jakarta.annotation.Nullable
   @Valid
@@ -131,14 +131,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -150,23 +150,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
index 5722d2acb576..36ce94a6faea 100644
--- a/samples/client/petstore/java/retrofit2/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2/docs/FakeApi.md
@@ -548,7 +548,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -580,18 +580,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -612,14 +612,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/retrofit2/docs/FormatTest.md b/samples/client/petstore/java/retrofit2/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/retrofit2/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java
index e00e4eb6812e..c36a9a65fae6 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -134,14 +134,14 @@ Call<Client> testClientModel(
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return Call&lt;Void&gt;
@@ -149,7 +149,7 @@ Call<Client> testClientModel(
   @retrofit2.http.FormUrlEncoded
   @POST("fake")
   Call<Void> testEndpointParameters(
-    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
+    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer _integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String _string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate _date, @retrofit2.http.Field("dateTime") OffsetDateTime _dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
   );
 
   /**
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
index 6f0ea252db10..9425868142f1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -34,7 +34,7 @@
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String SERIALIZED_NAME_INT32 = "int32";
   @SerializedName(SERIALIZED_NAME_INT32)
@@ -58,7 +58,7 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_STRING = "string";
   @SerializedName(SERIALIZED_NAME_STRING)
-  private String string;
+  private String _string;
 
   public static final String SERIALIZED_NAME_BYTE = "byte";
   @SerializedName(SERIALIZED_NAME_BYTE)
@@ -70,15 +70,15 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_PASSWORD = "password";
   @SerializedName(SERIALIZED_NAME_PASSWORD)
@@ -86,32 +86,32 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
   @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -227,25 +227,25 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -290,67 +290,67 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -374,25 +374,25 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -404,45 +404,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a643e958a3b1..bcee72d74dd1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -34,88 +34,88 @@
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_MAP = "map";
   @SerializedName(SERIALIZED_NAME_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -127,23 +127,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
index 5722d2acb576..36ce94a6faea 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/FakeApi.md
@@ -548,7 +548,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -580,18 +580,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -612,14 +612,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java
index 6347d08144f2..bb2356896a10 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -135,14 +135,14 @@ Observable<Client> testClientModel(
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return Completable
@@ -150,7 +150,7 @@ Observable<Client> testClientModel(
   @retrofit2.http.FormUrlEncoded
   @POST("fake")
   Completable testEndpointParameters(
-    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
+    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer _integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String _string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate _date, @retrofit2.http.Field("dateTime") OffsetDateTime _dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
   );
 
   /**
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
index 6f0ea252db10..9425868142f1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -34,7 +34,7 @@
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String SERIALIZED_NAME_INT32 = "int32";
   @SerializedName(SERIALIZED_NAME_INT32)
@@ -58,7 +58,7 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_STRING = "string";
   @SerializedName(SERIALIZED_NAME_STRING)
-  private String string;
+  private String _string;
 
   public static final String SERIALIZED_NAME_BYTE = "byte";
   @SerializedName(SERIALIZED_NAME_BYTE)
@@ -70,15 +70,15 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_PASSWORD = "password";
   @SerializedName(SERIALIZED_NAME_PASSWORD)
@@ -86,32 +86,32 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
   @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -227,25 +227,25 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -290,67 +290,67 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -374,25 +374,25 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -404,45 +404,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a643e958a3b1..bcee72d74dd1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -34,88 +34,88 @@
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_MAP = "map";
   @SerializedName(SERIALIZED_NAME_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -127,23 +127,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
index 5722d2acb576..36ce94a6faea 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/FakeApi.md
@@ -548,7 +548,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -580,18 +580,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -612,14 +612,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md b/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md
index 9c68c3080e13..7e401945c3bc 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/retrofit2rx3/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java
index 0cabd8162440..bca2081af477 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -135,14 +135,14 @@ Observable<Client> testClientModel(
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional)
+   * @param _date None (optional)
+   * @param _dateTime None (optional)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return Completable
@@ -150,7 +150,7 @@ Observable<Client> testClientModel(
   @retrofit2.http.FormUrlEncoded
   @POST("fake")
   Completable testEndpointParameters(
-    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate date, @retrofit2.http.Field("dateTime") OffsetDateTime dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
+    @retrofit2.http.Field("number") BigDecimal number, @retrofit2.http.Field("double") Double _double, @retrofit2.http.Field("pattern_without_delimiter") String patternWithoutDelimiter, @retrofit2.http.Field("byte") byte[] _byte, @retrofit2.http.Field("integer") Integer _integer, @retrofit2.http.Field("int32") Integer int32, @retrofit2.http.Field("int64") Long int64, @retrofit2.http.Field("float") Float _float, @retrofit2.http.Field("string") String _string, @retrofit2.http.Field("binary") MultipartBody.Part binary, @retrofit2.http.Field("date") LocalDate _date, @retrofit2.http.Field("dateTime") OffsetDateTime _dateTime, @retrofit2.http.Field("password") String password, @retrofit2.http.Field("callback") String paramCallback
   );
 
   /**
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java
index 6f0ea252db10..9425868142f1 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -34,7 +34,7 @@
 public class FormatTest {
   public static final String SERIALIZED_NAME_INTEGER = "integer";
   @SerializedName(SERIALIZED_NAME_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String SERIALIZED_NAME_INT32 = "int32";
   @SerializedName(SERIALIZED_NAME_INT32)
@@ -58,7 +58,7 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_STRING = "string";
   @SerializedName(SERIALIZED_NAME_STRING)
-  private String string;
+  private String _string;
 
   public static final String SERIALIZED_NAME_BYTE = "byte";
   @SerializedName(SERIALIZED_NAME_BYTE)
@@ -70,15 +70,15 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_DATE = "date";
   @SerializedName(SERIALIZED_NAME_DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_PASSWORD = "password";
   @SerializedName(SERIALIZED_NAME_PASSWORD)
@@ -86,32 +86,32 @@ public class FormatTest {
 
   public static final String SERIALIZED_NAME_BIG_DECIMAL = "BigDecimal";
   @SerializedName(SERIALIZED_NAME_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -227,25 +227,25 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -290,67 +290,67 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -374,25 +374,25 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -404,45 +404,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a643e958a3b1..bcee72d74dd1 100644
--- a/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx3/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -34,88 +34,88 @@
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String SERIALIZED_NAME_UUID = "uuid";
   @SerializedName(SERIALIZED_NAME_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String SERIALIZED_NAME_DATE_TIME = "dateTime";
   @SerializedName(SERIALIZED_NAME_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String SERIALIZED_NAME_MAP = "map";
   @SerializedName(SERIALIZED_NAME_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -127,23 +127,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md b/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
index efb255c14f26..a1c99f071dce 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/FakeApi.md
@@ -548,7 +548,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters  假端點  偽のエンドポイント  가짜 엔드 포인트
 
@@ -580,18 +580,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         AsyncFile binary = new AsyncFile(); // AsyncFile | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -612,14 +612,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **AsyncFile**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md b/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md
index dd441705a182..586bac60b79e 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/FormatTest.md
@@ -7,20 +7,20 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **AsyncFile** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
-|**bigDecimal** | **BigDecimal** |  |  [optional] |
+|**_bigDecimal** | **BigDecimal** |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/vertx-no-nullable/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
index 2a30781bdad8..767e2c21d745 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -50,9 +50,9 @@ public interface FakeApi {
 
     void testClientModel(Client body, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Client>> handler);
 
-    void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> handler);
+    void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> handler);
 
-    void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
+    void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
 
     void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString, Handler<AsyncResult<Void>> handler);
 
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApiImpl.java
index 972e2605650c..d4839d47b6e2 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApiImpl.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/FakeApiImpl.java
@@ -424,20 +424,20 @@ public void testClientModel(Client body, ApiClient.AuthInfo authInfo, Handler<As
         * @param _double None (required)
         * @param patternWithoutDelimiter None (required)
         * @param _byte None (required)
-        * @param integer None (optional)
+        * @param _integer None (optional)
         * @param int32 None (optional)
         * @param int64 None (optional)
         * @param _float None (optional)
-        * @param string None (optional)
+        * @param _string None (optional)
         * @param binary None (optional)
-        * @param date None (optional)
-        * @param dateTime None (optional)
+        * @param _date None (optional)
+        * @param _dateTime None (optional)
         * @param password None (optional)
         * @param paramCallback None (optional)
     * @param resultHandler Asynchronous result handler
     */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> resultHandler) {
-        testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null, resultHandler);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> resultHandler) {
+        testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null, resultHandler);
     }
 
     /**
@@ -447,20 +447,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @param authInfo per call authentication override.
     * @param resultHandler Asynchronous result handler
     */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
         Object localVarBody = null;
         
         // verify the required parameter 'number' is set
@@ -502,18 +502,18 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
         // form params
         // TODO: sending files within multipart/form-data is not supported yet (because of vertx web-client)
         Map<String, Object> localVarFormParams = new HashMap<>();
-        if (integer != null) localVarFormParams.put("integer", integer);
+        if (_integer != null) localVarFormParams.put("integer", _integer);
 if (int32 != null) localVarFormParams.put("int32", int32);
 if (int64 != null) localVarFormParams.put("int64", int64);
 if (number != null) localVarFormParams.put("number", number);
 if (_float != null) localVarFormParams.put("float", _float);
 if (_double != null) localVarFormParams.put("double", _double);
-if (string != null) localVarFormParams.put("string", string);
+if (_string != null) localVarFormParams.put("string", _string);
 if (patternWithoutDelimiter != null) localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
 if (_byte != null) localVarFormParams.put("byte", _byte);
 if (binary != null) localVarFormParams.put("binary", binary);
-if (date != null) localVarFormParams.put("date", date);
-if (dateTime != null) localVarFormParams.put("dateTime", dateTime);
+if (_date != null) localVarFormParams.put("date", _date);
+if (_dateTime != null) localVarFormParams.put("dateTime", _dateTime);
 if (password != null) localVarFormParams.put("password", password);
 if (paramCallback != null) localVarFormParams.put("callback", paramCallback);
 
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
index 0dabf7155eec..6829a5b5aa46 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
@@ -401,20 +401,20 @@ public Single<Client> rxTestClientModel(Client body, ApiClient.AuthInfo authInfo
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @param resultHandler Asynchronous result handler
     */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> resultHandler) {
-        delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, resultHandler);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> resultHandler) {
+        delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, resultHandler);
     }
 
     /**
@@ -424,21 +424,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @param authInfo call specific auth overrides
     * @param resultHandler Asynchronous result handler
     */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
-        delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, authInfo, resultHandler);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
+        delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, authInfo, resultHandler);
     }
 
     /**
@@ -448,21 +448,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @return Asynchronous result handler (RxJava Single)
     */
-    public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) {
+    public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) {
         return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut ->
-            delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, fut)
+            delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, fut)
         ));
     }
 
@@ -473,22 +473,22 @@ public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double,
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @param authInfo call specific auth overrides
     * @return Asynchronous result handler (RxJava Single)
     */
-    public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo) {
+    public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo) {
         return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut ->
-            delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, authInfo, fut)
+            delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, authInfo, fut)
         ));
     }
     /**
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
index 1bb8b1607708..06acadfcff4a 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -51,7 +51,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -69,7 +69,7 @@ public class FormatTest {
   private Double _double;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -78,48 +78,48 @@ public class FormatTest {
   private AsyncFile binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -255,29 +255,29 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -330,79 +330,79 @@ public void setBinary(AsyncFile binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -430,29 +430,29 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
     
-    this.bigDecimal = bigDecimal;
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
 
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -464,45 +464,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index bdeb14838ba5..7dda6d2e6b8d 100644
--- a/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx-no-nullable/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,98 +39,98 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -142,23 +142,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/vertx/docs/FakeApi.md b/samples/client/petstore/java/vertx/docs/FakeApi.md
index 22cff7dd2e8a..c288e67db735 100644
--- a/samples/client/petstore/java/vertx/docs/FakeApi.md
+++ b/samples/client/petstore/java/vertx/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         AsyncFile binary = new AsyncFile(); // AsyncFile | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **AsyncFile**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/vertx/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/vertx/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/vertx/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/vertx/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/vertx/docs/FormatTest.md b/samples/client/petstore/java/vertx/docs/FormatTest.md
index 42278d0f3953..5ecc750ef4e3 100644
--- a/samples/client/petstore/java/vertx/docs/FormatTest.md
+++ b/samples/client/petstore/java/vertx/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **AsyncFile** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/vertx/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/vertx/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/vertx/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/vertx/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/vertx/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java
index 38e08fe4b8c2..e23e2f669778 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -76,9 +76,9 @@ public interface FakeApi {
 
     void testClientModel(Client client, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Client>> handler);
 
-    void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> handler);
+    void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> handler);
 
-    void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
+    void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> handler);
 
     void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<EnumClass> enumQueryModelArray, List<String> enumFormStringArray, String enumFormString, Handler<AsyncResult<Void>> handler);
 
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
index b275e073e3a4..705240792721 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/FakeApiImpl.java
@@ -661,20 +661,20 @@ public void testClientModel(Client client, ApiClient.AuthInfo authInfo, Handler<
         * @param _double None (required)
         * @param patternWithoutDelimiter None (required)
         * @param _byte None (required)
-        * @param integer None (optional)
+        * @param _integer None (optional)
         * @param int32 None (optional)
         * @param int64 None (optional)
         * @param _float None (optional)
-        * @param string None (optional)
+        * @param _string None (optional)
         * @param binary None (optional)
-        * @param date None (optional)
-        * @param dateTime None (optional)
+        * @param _date None (optional)
+        * @param _dateTime None (optional)
         * @param password None (optional)
         * @param paramCallback None (optional)
     * @param resultHandler Asynchronous result handler
     */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> resultHandler) {
-        testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, null, resultHandler);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> resultHandler) {
+        testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, null, resultHandler);
     }
 
     /**
@@ -684,20 +684,20 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @param authInfo per call authentication override.
     * @param resultHandler Asynchronous result handler
     */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
         Object localVarBody = null;
         
         // verify the required parameter 'number' is set
@@ -739,18 +739,18 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
         // form params
         // TODO: sending files within multipart/form-data is not supported yet (because of vertx web-client)
         Map<String, Object> localVarFormParams = new HashMap<>();
-        if (integer != null) localVarFormParams.put("integer", integer);
+        if (_integer != null) localVarFormParams.put("integer", _integer);
 if (int32 != null) localVarFormParams.put("int32", int32);
 if (int64 != null) localVarFormParams.put("int64", int64);
 if (number != null) localVarFormParams.put("number", number);
 if (_float != null) localVarFormParams.put("float", _float);
 if (_double != null) localVarFormParams.put("double", _double);
-if (string != null) localVarFormParams.put("string", string);
+if (_string != null) localVarFormParams.put("string", _string);
 if (patternWithoutDelimiter != null) localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
 if (_byte != null) localVarFormParams.put("byte", _byte);
 if (binary != null) localVarFormParams.put("binary", binary);
-if (date != null) localVarFormParams.put("date", date);
-if (dateTime != null) localVarFormParams.put("dateTime", dateTime);
+if (_date != null) localVarFormParams.put("date", _date);
+if (_dateTime != null) localVarFormParams.put("dateTime", _dateTime);
 if (password != null) localVarFormParams.put("password", password);
 if (paramCallback != null) localVarFormParams.put("callback", paramCallback);
 
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
index 149c22d12e6c..bab91931a92b 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/api/rxjava/FakeApi.java
@@ -632,20 +632,20 @@ public Single<Client> rxTestClientModel(Client client, ApiClient.AuthInfo authIn
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @param resultHandler Asynchronous result handler
     */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> resultHandler) {
-        delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, resultHandler);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, Handler<AsyncResult<Void>> resultHandler) {
+        delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, resultHandler);
     }
 
     /**
@@ -655,21 +655,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @param authInfo call specific auth overrides
     * @param resultHandler Asynchronous result handler
     */
-    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
-        delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, authInfo, resultHandler);
+    public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo, Handler<AsyncResult<Void>> resultHandler) {
+        delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, authInfo, resultHandler);
     }
 
     /**
@@ -679,21 +679,21 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @return Asynchronous result handler (RxJava Single)
     */
-    public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) {
+    public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) {
         return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut ->
-            delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, fut)
+            delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, fut)
         ));
     }
 
@@ -704,22 +704,22 @@ public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double,
     * @param _double None (required)
     * @param patternWithoutDelimiter None (required)
     * @param _byte None (required)
-    * @param integer None (optional)
+    * @param _integer None (optional)
     * @param int32 None (optional)
     * @param int64 None (optional)
     * @param _float None (optional)
-    * @param string None (optional)
+    * @param _string None (optional)
     * @param binary None (optional)
-    * @param date None (optional)
-    * @param dateTime None (optional)
+    * @param _date None (optional)
+    * @param _dateTime None (optional)
     * @param password None (optional)
     * @param paramCallback None (optional)
     * @param authInfo call specific auth overrides
     * @return Asynchronous result handler (RxJava Single)
     */
-    public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, AsyncFile binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo) {
+    public Single<Void> rxTestEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, AsyncFile binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, ApiClient.AuthInfo authInfo) {
         return Single.create(new io.vertx.rx.java.SingleOnSubscribeAdapter<>(fut ->
-            delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, authInfo, fut)
+            delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, authInfo, fut)
         ));
     }
     /**
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 74255e7d06ca..d28cef633125 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -34,34 +34,34 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -73,19 +73,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
index 2843379f51a8..480abc23fb4e 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -53,7 +53,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -74,7 +74,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -83,13 +83,13 @@ public class FormatTest {
   private AsyncFile binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -103,31 +103,31 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -288,29 +288,29 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -363,79 +363,79 @@ public void setBinary(AsyncFile binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -522,19 +522,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -542,26 +542,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index bdeb14838ba5..7dda6d2e6b8d 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,98 +39,98 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -142,23 +142,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 5cea8942cd2c..b1316e262776 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -40,7 +40,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -177,7 +177,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -185,14 +185,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md b/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/webclient-jakarta/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/FormatTest.md b/samples/client/petstore/java/webclient-jakarta/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/FormatTest.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/webclient-jakarta/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/webclient-jakarta/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/webclient-jakarta/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/webclient-jakarta/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/webclient-jakarta/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java
index 19618d101c75..830148be65e8 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -993,19 +993,19 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws WebCli
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         Object postBody = null;
         // verify the required parameter 'number' is set
         if (number == null) {
@@ -1031,8 +1031,8 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
         final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
 
-        if (integer != null)
-            formParams.add("integer", integer);
+        if (_integer != null)
+            formParams.add("integer", _integer);
         if (int32 != null)
             formParams.add("int32", int32);
         if (int64 != null)
@@ -1043,18 +1043,18 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
             formParams.add("float", _float);
         if (_double != null)
             formParams.add("double", _double);
-        if (string != null)
-            formParams.add("string", string);
+        if (_string != null)
+            formParams.add("string", _string);
         if (patternWithoutDelimiter != null)
             formParams.add("pattern_without_delimiter", patternWithoutDelimiter);
         if (_byte != null)
             formParams.add("byte", _byte);
         if (binary != null)
             formParams.add("binary", new FileSystemResource(binary));
-        if (date != null)
-            formParams.add("date", date);
-        if (dateTime != null)
-            formParams.add("dateTime", dateTime);
+        if (_date != null)
+            formParams.add("date", _date);
+        if (_dateTime != null)
+            formParams.add("dateTime", _dateTime);
         if (password != null)
             formParams.add("password", password);
         if (paramCallback != null)
@@ -1082,21 +1082,21 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).bodyToMono(localVarReturnType);
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).bodyToMono(localVarReturnType);
     }
 
     /**
@@ -1108,21 +1108,21 @@ public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, Stri
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType);
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).toEntity(localVarReturnType);
     }
 
     /**
@@ -1134,21 +1134,21 @@ public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @return ResponseSpec
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index d7c27a6d2f5f..cd38e48064dd 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -34,34 +34,34 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -73,19 +73,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java
index 27131652b54f..5d1c17a58cc2 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -53,7 +53,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -74,7 +74,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -83,13 +83,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -103,31 +103,31 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -288,29 +288,29 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -363,79 +363,79 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @jakarta.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -522,19 +522,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -542,26 +542,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b2322bc755d5..1a9adff27b7f 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,98 +39,98 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -142,23 +142,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 8842de2742bd..b81ce0126d00 100644
--- a/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/webclient-jakarta/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -40,7 +40,7 @@
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @jakarta.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -177,7 +177,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -185,14 +185,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md b/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/webclient-swagger2/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/FormatTest.md b/samples/client/petstore/java/webclient-swagger2/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/FormatTest.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/webclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/webclient-swagger2/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/webclient-swagger2/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/webclient-swagger2/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/webclient-swagger2/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
index f06f880ad414..d6377950a0af 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -993,19 +993,19 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws WebCli
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         Object postBody = null;
         // verify the required parameter 'number' is set
         if (number == null) {
@@ -1031,8 +1031,8 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
         final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
 
-        if (integer != null)
-            formParams.add("integer", integer);
+        if (_integer != null)
+            formParams.add("integer", _integer);
         if (int32 != null)
             formParams.add("int32", int32);
         if (int64 != null)
@@ -1043,18 +1043,18 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
             formParams.add("float", _float);
         if (_double != null)
             formParams.add("double", _double);
-        if (string != null)
-            formParams.add("string", string);
+        if (_string != null)
+            formParams.add("string", _string);
         if (patternWithoutDelimiter != null)
             formParams.add("pattern_without_delimiter", patternWithoutDelimiter);
         if (_byte != null)
             formParams.add("byte", _byte);
         if (binary != null)
             formParams.add("binary", new FileSystemResource(binary));
-        if (date != null)
-            formParams.add("date", date);
-        if (dateTime != null)
-            formParams.add("dateTime", dateTime);
+        if (_date != null)
+            formParams.add("date", _date);
+        if (_dateTime != null)
+            formParams.add("dateTime", _dateTime);
         if (password != null)
             formParams.add("password", password);
         if (paramCallback != null)
@@ -1082,21 +1082,21 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).bodyToMono(localVarReturnType);
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).bodyToMono(localVarReturnType);
     }
 
     /**
@@ -1108,21 +1108,21 @@ public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, Stri
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType);
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).toEntity(localVarReturnType);
     }
 
     /**
@@ -1134,21 +1134,21 @@ public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @return ResponseSpec
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 13ce0f7aa71b..82524b047146 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -35,20 +35,20 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -56,14 +56,14 @@ public FooGetDefaultResponse string(Foo string) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -75,19 +75,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
index ce6bfd1af327..c6c3a90c9875 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -54,7 +54,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -75,7 +75,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -84,13 +84,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -104,17 +104,17 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -122,14 +122,14 @@ public FormatTest integer(Integer integer) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -296,15 +296,15 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -312,14 +312,14 @@ public FormatTest string(String string) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -374,15 +374,15 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "")
@@ -390,25 +390,25 @@ public FormatTest date(LocalDate date) {
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -416,25 +416,25 @@ public FormatTest dateTime(OffsetDateTime dateTime) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -442,14 +442,14 @@ public FormatTest uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -539,19 +539,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -559,26 +559,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index c39b1493b2af..c815e289c86b 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -40,26 +40,26 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map;
+  private Map<String, Animal> _map;
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -67,25 +67,25 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -93,33 +93,33 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateT
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -127,14 +127,14 @@ public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -146,23 +146,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 65af6d6ab55b..a362650b314b 100644
--- a/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/webclient-swagger2/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -41,7 +41,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -55,15 +55,15 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @Schema(requiredMode = Schema.RequiredMode.NOT_REQUIRED, description = "")
@@ -71,14 +71,14 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -182,7 +182,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -190,14 +190,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/java/webclient/docs/FakeApi.md b/samples/client/petstore/java/webclient/docs/FakeApi.md
index 37a949ea0508..115454734fcd 100644
--- a/samples/client/petstore/java/webclient/docs/FakeApi.md
+++ b/samples/client/petstore/java/webclient/docs/FakeApi.md
@@ -878,7 +878,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -910,18 +910,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.now(); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.now(); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -942,14 +942,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/client/petstore/java/webclient/docs/FooGetDefaultResponse.md b/samples/client/petstore/java/webclient/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/client/petstore/java/webclient/docs/FooGetDefaultResponse.md
+++ b/samples/client/petstore/java/webclient/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/webclient/docs/FormatTest.md b/samples/client/petstore/java/webclient/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/client/petstore/java/webclient/docs/FormatTest.md
+++ b/samples/client/petstore/java/webclient/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/java/webclient/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/client/petstore/java/webclient/docs/ObjectWithDeprecatedFields.md b/samples/client/petstore/java/webclient/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/client/petstore/java/webclient/docs/ObjectWithDeprecatedFields.md
+++ b/samples/client/petstore/java/webclient/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
index f06f880ad414..d6377950a0af 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -993,19 +993,19 @@ public ResponseSpec testClientModelWithResponseSpec(Client client) throws WebCli
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         Object postBody = null;
         // verify the required parameter 'number' is set
         if (number == null) {
@@ -1031,8 +1031,8 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
         final MultiValueMap<String, String> cookieParams = new LinkedMultiValueMap<String, String>();
         final MultiValueMap<String, Object> formParams = new LinkedMultiValueMap<String, Object>();
 
-        if (integer != null)
-            formParams.add("integer", integer);
+        if (_integer != null)
+            formParams.add("integer", _integer);
         if (int32 != null)
             formParams.add("int32", int32);
         if (int64 != null)
@@ -1043,18 +1043,18 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
             formParams.add("float", _float);
         if (_double != null)
             formParams.add("double", _double);
-        if (string != null)
-            formParams.add("string", string);
+        if (_string != null)
+            formParams.add("string", _string);
         if (patternWithoutDelimiter != null)
             formParams.add("pattern_without_delimiter", patternWithoutDelimiter);
         if (_byte != null)
             formParams.add("byte", _byte);
         if (binary != null)
             formParams.add("binary", new FileSystemResource(binary));
-        if (date != null)
-            formParams.add("date", date);
-        if (dateTime != null)
-            formParams.add("dateTime", dateTime);
+        if (_date != null)
+            formParams.add("date", _date);
+        if (_dateTime != null)
+            formParams.add("dateTime", _dateTime);
         if (password != null)
             formParams.add("password", password);
         if (paramCallback != null)
@@ -1082,21 +1082,21 @@ private ResponseSpec testEndpointParametersRequestCreation(BigDecimal number, Do
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).bodyToMono(localVarReturnType);
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).bodyToMono(localVarReturnType);
     }
 
     /**
@@ -1108,21 +1108,21 @@ public Mono<Void> testEndpointParameters(BigDecimal number, Double _double, Stri
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
+    public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
         ParameterizedTypeReference<Void> localVarReturnType = new ParameterizedTypeReference<Void>() {};
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback).toEntity(localVarReturnType);
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback).toEntity(localVarReturnType);
     }
 
     /**
@@ -1134,21 +1134,21 @@ public Mono<ResponseEntity<Void>> testEndpointParametersWithHttpInfo(BigDecimal
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @return ResponseSpec
      * @throws WebClientResponseException if an error occurs while attempting to invoke the API
      */
-    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws WebClientResponseException {
-        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public ResponseSpec testEndpointParametersWithResponseSpec(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws WebClientResponseException {
+        return testEndpointParametersRequestCreation(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
     /**
      * To test enum parameters
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index 74255e7d06ca..d28cef633125 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -34,34 +34,34 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() {
   }
 
-  public FooGetDefaultResponse string(Foo string) {
+  public FooGetDefaultResponse _string(Foo _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
   @Override
@@ -73,19 +73,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
index ea573d38f890..96a6887dbda2 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -53,7 +53,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -74,7 +74,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -83,13 +83,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -103,31 +103,31 @@ public class FormatTest {
   public FormatTest() {
   }
 
-  public FormatTest integer(Integer integer) {
+  public FormatTest _integer(Integer _integer) {
     
-    this.integer = integer;
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -288,29 +288,29 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
+  public FormatTest _string(String _string) {
     
-    this.string = string;
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -363,79 +363,79 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
+  public FormatTest _date(LocalDate _date) {
     
-    this.date = date;
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
+  public FormatTest _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -522,19 +522,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -542,26 +542,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ec3b5b5f6455..2591edc7de8a 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,98 +39,98 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map;
+  private Map<String, Animal> _map;
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
     
-    this.dateTime = dateTime;
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
     
-    this.map = map;
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -142,23 +142,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index a4966004050c..5f00a176b6b3 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -40,7 +40,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   private BigDecimal id;
@@ -54,29 +54,29 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() {
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
     
-    this.uuid = uuid;
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -177,7 +177,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -185,14 +185,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
index 99eda092664e..57a66063bfec 100644
--- a/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
+++ b/samples/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
@@ -32,8 +32,8 @@ public interface DefaultApi {
     /**
      * GET /thingy/{date}
      *
-     * @param date A date path parameter (required)
-     * @param dateTime A date-time query parameter (required)
+     * @param _date A date path parameter (required)
+     * @param _dateTime A date-time query parameter (required)
      * @param xOrderDate A date header parameter (required)
      * @param loginDate A date cookie parameter (optional, default to 1975-01-01)
      * @return OK (status code 200)
@@ -52,8 +52,8 @@ public interface DefaultApi {
     )
     
     ResponseEntity<Void> get(
-        @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "A date path parameter", required = true, defaultValue = "1972-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @NotNull @ApiParam(value = "A date-time query parameter", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @NotNull @ApiParam(value = "A date header parameter", required = true, defaultValue = "1974-01-01") @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate,
         @ApiParam(value = "A date cookie parameter", defaultValue = "1975-01-01") @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate
     );
@@ -63,7 +63,7 @@ ResponseEntity<Void> get(
      * POST /thingy/{date}
      * update with form data
      *
-     * @param date A date path parameter (required)
+     * @param _date A date path parameter (required)
      * @param visitDate Updated last visit timestamp (optional, default to 1971-12-19T03:39:57-08:00)
      * @return Invalid input (status code 405)
      */
@@ -82,7 +82,7 @@ ResponseEntity<Void> get(
     )
     
     ResponseEntity<Void> updatePetWithForm(
-        @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
+        @ApiParam(value = "A date path parameter", required = true, defaultValue = "1970-01-01") @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
         @ApiParam(value = "Updated last visit timestamp", defaultValue = "1971-12-19T03:39:57-08:00") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
     );
 
diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java
index 8937270db5f2..90ca251df791 100644
--- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/api/FakeApi.java
@@ -187,14 +187,14 @@ Mono<ResponseEntity<Client>> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -211,14 +211,14 @@ Mono<ResponseEntity<Void>> testEndpointParameters(
          @RequestPart(value = "double", required = true) Double _double,
          @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
          @RequestPart(value = "byte", required = true) byte[] _byte,
-         @RequestPart(value = "integer", required = false) Integer integer,
+         @RequestPart(value = "integer", required = false) Integer _integer,
          @RequestPart(value = "int32", required = false) Integer int32,
          @RequestPart(value = "int64", required = false) Long int64,
          @RequestPart(value = "float", required = false) Float _float,
-         @RequestPart(value = "string", required = false) String string,
+         @RequestPart(value = "string", required = false) String _string,
          @RequestPart(value = "binary", required = false) Flux<Part> binary,
-         @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-         @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+         @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+         @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
          @RequestPart(value = "password", required = false) String password,
          @RequestPart(value = "callback", required = false) String paramCallback
     );
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 2455625157d8..f97cf5efdf3c 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,7 +27,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -39,23 +39,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -64,32 +64,32 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -195,23 +195,23 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -252,61 +252,61 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -328,23 +328,23 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -356,45 +356,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 9856d8d91407..d63c9182b606 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,77 +25,77 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -107,23 +107,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java
index 7bd845066082..e1cb4608d5e2 100644
--- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/api/FakeApi.java
@@ -183,14 +183,14 @@ ResponseEntity<ClientDto> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -207,14 +207,14 @@ ResponseEntity<Void> testEndpointParameters(
          @RequestParam(value = "double", required = true) Double _double,
          @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
          @RequestParam(value = "byte", required = true) byte[] _byte,
-         @RequestParam(value = "integer", required = false) Integer integer,
+         @RequestParam(value = "integer", required = false) Integer _integer,
          @RequestParam(value = "int32", required = false) Integer int32,
          @RequestParam(value = "int64", required = false) Long int64,
          @RequestParam(value = "float", required = false) Float _float,
-         @RequestParam(value = "string", required = false) String string,
+         @RequestParam(value = "string", required = false) String _string,
          @RequestPart(value = "binary", required = false) MultipartFile binary,
-         @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-         @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+         @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+         @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
          @RequestParam(value = "password", required = false) String password,
          @RequestParam(value = "callback", required = false) String paramCallback
     );
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 aa06a4d65953..09246027841f 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,7 +27,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTestDto {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -39,47 +39,47 @@ public class FormatTestDto {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTestDto() {
     super();
   }
 
-  public FormatTestDto integer(Integer integer) {
-    this.integer = integer;
+  public FormatTestDto _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTestDto int32(Integer int32) {
@@ -185,23 +185,23 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTestDto string(String string) {
-    this.string = string;
+  public FormatTestDto _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTestDto _byte(byte[] _byte) {
@@ -242,61 +242,61 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTestDto date(LocalDate date) {
-    this.date = date;
+  public FormatTestDto _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTestDto dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTestDto _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTestDto uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTestDto _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTestDto password(String password) {
@@ -318,23 +318,23 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTestDto bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTestDto _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -346,45 +346,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTestDto formatTest = (FormatTestDto) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTestDto {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 928f11033e9f..a8347e1e9386 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,77 +27,77 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClassDto {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   
-  private Map<String, AnimalDto> map = new HashMap<>();
+  private Map<String, AnimalDto> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClassDto _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClassDto _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto map(Map<String, AnimalDto> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClassDto _map(Map<String, AnimalDto> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, AnimalDto mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, AnimalDto _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   
   @JsonProperty("map")
   public Map<String, AnimalDto> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, AnimalDto> map) {
-    this.map = map;
+  public void setMap(Map<String, AnimalDto> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -109,23 +109,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClassDto mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClassDto) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClassDto {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md
index 3816afc1ce7c..b039d51de3dd 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FakeApi.md
@@ -726,7 +726,7 @@ No authorization required
 
 ## testEndpointParameters
 
-> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback)
 
 Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
 
@@ -766,18 +766,18 @@ public class Example {
         Double _double = 3.4D; // Double | None
         String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
         byte[] _byte = null; // byte[] | None
-        Integer integer = 56; // Integer | None
+        Integer _integer = 56; // Integer | None
         Integer int32 = 56; // Integer | None
         Long int64 = 56L; // Long | None
         Float _float = 3.4F; // Float | None
-        String string = "string_example"; // String | None
+        String _string = "_string_example"; // String | None
         File binary = new File("/path/to/file"); // File | None
-        LocalDate date = LocalDate.now(); // LocalDate | None
-        OffsetDateTime dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
+        LocalDate _date = LocalDate.now(); // LocalDate | None
+        OffsetDateTime _dateTime = OffsetDateTime.parse("2010-02-01T10:20:10.111110+01:00"); // OffsetDateTime | None
         String password = "password_example"; // String | None
         String paramCallback = "paramCallback_example"; // String | None
         try {
-            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         } catch (ApiException e) {
             System.err.println("Exception when calling FakeApi#testEndpointParameters");
             System.err.println("Status code: " + e.getCode());
@@ -798,14 +798,14 @@ public class Example {
 | **_double** | **Double**| None | |
 | **patternWithoutDelimiter** | **String**| None | |
 | **_byte** | **byte[]**| None | |
-| **integer** | **Integer**| None | [optional] |
+| **_integer** | **Integer**| None | [optional] |
 | **int32** | **Integer**| None | [optional] |
 | **int64** | **Long**| None | [optional] |
 | **_float** | **Float**| None | [optional] |
-| **string** | **String**| None | [optional] |
+| **_string** | **String**| None | [optional] |
 | **binary** | **File**| None | [optional] |
-| **date** | **LocalDate**| None | [optional] |
-| **dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
+| **_date** | **LocalDate**| None | [optional] |
+| **_dateTime** | **OffsetDateTime**| None | [optional] [default to 2010-02-01T10:20:10.111110+01:00] |
 | **password** | **String**| None | [optional] |
 | **paramCallback** | **String**| None | [optional] |
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FooGetDefaultResponse.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FooGetDefaultResponse.md
index ff3d7a3a56c3..7fcb7b5e5427 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FooGetDefaultResponse.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FooGetDefaultResponse.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**string** | [**Foo**](Foo.md) |  |  [optional] |
+|**_string** | [**Foo**](Foo.md) |  |  [optional] |
 
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md
index 01b8c777ae06..e56dd0d80db9 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/FormatTest.md
@@ -7,19 +7,19 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**integer** | **Integer** |  |  [optional] |
+|**_integer** | **Integer** |  |  [optional] |
 |**int32** | **Integer** |  |  [optional] |
 |**int64** | **Long** |  |  [optional] |
 |**number** | **BigDecimal** |  |  |
 |**_float** | **Float** |  |  [optional] |
 |**_double** | **Double** |  |  [optional] |
 |**decimal** | **BigDecimal** |  |  [optional] |
-|**string** | **String** |  |  [optional] |
+|**_string** | **String** |  |  [optional] |
 |**_byte** | **byte[]** |  |  |
 |**binary** | **File** |  |  [optional] |
-|**date** | **LocalDate** |  |  |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**uuid** | **UUID** |  |  [optional] |
+|**_date** | **LocalDate** |  |  |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
 |**password** | **String** |  |  |
 |**patternWithDigits** | **String** | A string that is a 10 digit number. Can have leading zeros. |  [optional] |
 |**patternWithDigitsAndDelimiter** | **String** | A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01. |  [optional] |
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a5ddf0faa6a9..66aea39f7c68 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -7,9 +7,9 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **UUID** |  |  [optional] |
-|**dateTime** | **OffsetDateTime** |  |  [optional] |
-|**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
+|**_uuid** | **UUID** |  |  [optional] |
+|**_dateTime** | **OffsetDateTime** |  |  [optional] |
+|**_map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional] |
 
 
 
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ObjectWithDeprecatedFields.md b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ObjectWithDeprecatedFields.md
index f1cf571f4c09..803ee7845f7a 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/docs/ObjectWithDeprecatedFields.md
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/docs/ObjectWithDeprecatedFields.md
@@ -7,7 +7,7 @@
 
 | Name | Type | Description | Notes |
 |------------ | ------------- | ------------- | -------------|
-|**uuid** | **String** |  |  [optional] |
+|**_uuid** | **String** |  |  [optional] |
 |**id** | **BigDecimal** |  |  [optional] |
 |**deprecatedRef** | [**DeprecatedObject**](DeprecatedObject.md) |  |  [optional] |
 |**bars** | **List&lt;String&gt;** |  |  [optional] |
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
index d8abb66f301a..3e284267dd76 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -477,14 +477,14 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client client) throws Api
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+   * @param _date None (optional)
+   * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @throws ApiException if fails to make API call
@@ -495,8 +495,8 @@ public ApiResponse<Client> testClientModelWithHttpInfo(Client client) throws Api
        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
    */
-  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
-    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
+    testEndpointParametersWithHttpInfo(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
   }
 
   /**
@@ -506,14 +506,14 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
    * @param _double None (required)
    * @param patternWithoutDelimiter None (required)
    * @param _byte None (required)
-   * @param integer None (optional)
+   * @param _integer None (optional)
    * @param int32 None (optional)
    * @param int64 None (optional)
    * @param _float None (optional)
-   * @param string None (optional)
+   * @param _string None (optional)
    * @param binary None (optional)
-   * @param date None (optional)
-   * @param dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
+   * @param _date None (optional)
+   * @param _dateTime None (optional, default to 2010-02-01T10:20:10.111110+01:00)
    * @param password None (optional)
    * @param paramCallback None (optional)
    * @return ApiResponse&lt;Void&gt;
@@ -525,7 +525,7 @@ public void testEndpointParameters(BigDecimal number, Double _double, String pat
        <tr><td> 404 </td><td> User not found </td><td>  -  </td></tr>
      </table>
    */
-  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+  public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, File binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws ApiException {
     // Check required parameters
     if (number == null) {
       throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
@@ -542,8 +542,8 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
 
     // Form parameters
     Map<String, Object> localVarFormParams = new LinkedHashMap<>();
-    if (integer != null) {
-      localVarFormParams.put("integer", integer);
+    if (_integer != null) {
+      localVarFormParams.put("integer", _integer);
     }
     if (int32 != null) {
       localVarFormParams.put("int32", int32);
@@ -556,19 +556,19 @@ public ApiResponse<Void> testEndpointParametersWithHttpInfo(BigDecimal number, D
       localVarFormParams.put("float", _float);
     }
     localVarFormParams.put("double", _double);
-    if (string != null) {
-      localVarFormParams.put("string", string);
+    if (_string != null) {
+      localVarFormParams.put("string", _string);
     }
     localVarFormParams.put("pattern_without_delimiter", patternWithoutDelimiter);
     localVarFormParams.put("byte", _byte);
     if (binary != null) {
       localVarFormParams.put("binary", binary);
     }
-    if (date != null) {
-      localVarFormParams.put("date", date);
+    if (_date != null) {
+      localVarFormParams.put("date", _date);
     }
-    if (dateTime != null) {
-      localVarFormParams.put("dateTime", dateTime);
+    if (_dateTime != null) {
+      localVarFormParams.put("dateTime", _dateTime);
     }
     if (password != null) {
       localVarFormParams.put("password", password);
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
index a3dbaa3a0783..11635a2416ce 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FooGetDefaultResponse.java
@@ -37,33 +37,33 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse {
   public static final String JSON_PROPERTY_STRING = "string";
-  private Foo string;
+  private Foo _string;
 
   public FooGetDefaultResponse() { 
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -79,19 +79,19 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
index 4eada6a5847e..49096381b0fd 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -56,7 +56,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
   public static final String JSON_PROPERTY_INTEGER = "integer";
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   private Integer int32;
@@ -77,7 +77,7 @@ public class FormatTest {
   private BigDecimal decimal;
 
   public static final String JSON_PROPERTY_STRING = "string";
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   private byte[] _byte;
@@ -86,13 +86,13 @@ public class FormatTest {
   private File binary;
 
   public static final String JSON_PROPERTY_DATE = "date";
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   private String password;
@@ -106,30 +106,30 @@ public class FormatTest {
   public FormatTest() { 
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
 
   @JsonProperty(JSON_PROPERTY_INTEGER)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
 
@@ -291,28 +291,28 @@ public void setDecimal(BigDecimal decimal) {
   }
 
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getString() {
-    return string;
+    return _string;
   }
 
 
   @JsonProperty(JSON_PROPERTY_STRING)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
 
@@ -366,78 +366,78 @@ public void setBinary(File binary) {
   }
 
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @javax.annotation.Nonnull
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE)
   @JsonInclude(value = JsonInclude.Include.ALWAYS)
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -528,19 +528,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -548,26 +548,26 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9c60134dd799..dd4e43e0281f 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -42,97 +42,97 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() { 
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
 
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
 
   @JsonProperty(JSON_PROPERTY_MAP)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -148,23 +148,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
index 1dea337bfd43..5af2addf2b25 100644
--- a/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
+++ b/samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -42,7 +42,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields {
   public static final String JSON_PROPERTY_UUID = "uuid";
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   @Deprecated
@@ -59,28 +59,28 @@ public class ObjectWithDeprecatedFields {
   public ObjectWithDeprecatedFields() { 
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @javax.annotation.Nullable
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
 
   @JsonProperty(JSON_PROPERTY_UUID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
 
@@ -191,7 +191,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -199,14 +199,14 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
index aa4b91e2f73b..8c4bdf39ad4b 100644
--- a/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-date-time/src/main/java/org/openapitools/api/DefaultApi.java
@@ -42,8 +42,8 @@ public interface DefaultApi {
     /**
      * GET /thingy/{date}
      *
-     * @param date A date path parameter (required)
-     * @param dateTime A date-time query parameter (required)
+     * @param _date A date path parameter (required)
+     * @param _dateTime A date-time query parameter (required)
      * @param xOrderDate A date header parameter (required)
      * @param loginDate A date cookie parameter (optional, default to 1975-01-01)
      * @return OK (status code 200)
@@ -60,8 +60,8 @@ public interface DefaultApi {
     )
     
     ResponseEntity<Void> get(
-        @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @NotNull @Parameter(name = "dateTime", description = "A date-time query parameter", required = true, in = ParameterIn.QUERY) @Valid @RequestParam(value = "dateTime", required = true, defaultValue = "1973-12-19T03:39:57-08:00") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @NotNull @Parameter(name = "X-Order-Date", description = "A date header parameter", required = true, in = ParameterIn.HEADER) @RequestHeader(value = "X-Order-Date", required = true, defaultValue = "1974-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate xOrderDate,
         @Parameter(name = "loginDate", description = "A date cookie parameter", in = ParameterIn.COOKIE) @CookieValue(name = "loginDate", required = false, defaultValue = "1975-01-01") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate loginDate
     );
@@ -71,7 +71,7 @@ ResponseEntity<Void> get(
      * POST /thingy/{date}
      * update with form data
      *
-     * @param date A date path parameter (required)
+     * @param _date A date path parameter (required)
      * @param visitDate Updated last visit timestamp (optional, default to 1971-12-19T03:39:57-08:00)
      * @return Invalid input (status code 405)
      */
@@ -89,7 +89,7 @@ ResponseEntity<Void> get(
     )
     
     ResponseEntity<Void> updatePetWithForm(
-        @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
+        @Parameter(name = "date", description = "A date path parameter", required = true, in = ParameterIn.PATH) @PathVariable("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
         @Parameter(name = "visitDate", description = "Updated last visit timestamp") @Valid @RequestParam(value = "visitDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime visitDate
     );
 
diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
index 6067edb6d7e8..096d4fbda24d 100644
--- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/api/FakeApi.java
@@ -280,14 +280,14 @@ ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -317,14 +317,14 @@ ResponseEntity<Void> testEndpointParameters(
         @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     );
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 71079c2f3663..d08c0bb1cf05 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,7 +29,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -41,48 +41,48 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -193,24 +193,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -253,64 +253,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -333,24 +333,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -362,45 +362,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 d4ce79069e10..d289ccbf2cf9 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,80 +27,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -112,23 +112,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/openapi3/server/petstore/go/go-petstore/go.sum b/samples/openapi3/server/petstore/go/go-petstore/go.sum
new file mode 100644
index 000000000000..41e78f1d874b
--- /dev/null
+++ b/samples/openapi3/server/petstore/go/go-petstore/go.sum
@@ -0,0 +1 @@
+github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
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 f6395f571db9..096cbe9bd39e 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
@@ -326,14 +326,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -363,18 +363,18 @@ default ResponseEntity<Void> testEndpointParameters(
         @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
-        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
 
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 fd1dac8d97c0..9a514e6f236c 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
@@ -189,14 +189,14 @@ default ResponseEntity<Client> testClientModel(Client client) {
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -207,14 +207,14 @@ default ResponseEntity<Void> testEndpointParameters(BigDecimal number,
         Double _double,
         String patternWithoutDelimiter,
         byte[] _byte,
-        Integer integer,
+        Integer _integer,
         Integer int32,
         Long int64,
         Float _float,
-        String string,
+        String _string,
         MultipartFile binary,
-        LocalDate date,
-        OffsetDateTime dateTime,
+        LocalDate _date,
+        OffsetDateTime _dateTime,
         String password,
         String paramCallback) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
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 49ce891d115a..3e61d44a20b8 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,7 +29,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -41,23 +41,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -66,33 +66,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -203,24 +203,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -343,24 +343,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -372,45 +372,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 d4ce79069e10..d289ccbf2cf9 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,80 +27,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -112,23 +112,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 6c3363bfa528..58081a1689da 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
@@ -366,14 +366,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -403,14 +403,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 49ce891d115a..3e61d44a20b8 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,7 +29,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -41,23 +41,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -66,33 +66,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -203,24 +203,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -343,24 +343,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -372,45 +372,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 d4ce79069e10..d289ccbf2cf9 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,80 +27,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -112,23 +112,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/others/go-server/no-body-path-params/go.sum b/samples/server/others/go-server/no-body-path-params/go.sum
new file mode 100644
index 000000000000..2a61a10c422d
--- /dev/null
+++ b/samples/server/others/go-server/no-body-path-params/go.sum
@@ -0,0 +1 @@
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
diff --git a/samples/server/petstore/go-api-server/go.sum b/samples/server/petstore/go-api-server/go.sum
new file mode 100644
index 000000000000..2a61a10c422d
--- /dev/null
+++ b/samples/server/petstore/go-api-server/go.sum
@@ -0,0 +1 @@
+github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
diff --git a/samples/server/petstore/go-chi-server/go.sum b/samples/server/petstore/go-chi-server/go.sum
new file mode 100644
index 000000000000..41e78f1d874b
--- /dev/null
+++ b/samples/server/petstore/go-chi-server/go.sum
@@ -0,0 +1 @@
+github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
diff --git a/samples/server/petstore/go-echo-server/go.sum b/samples/server/petstore/go-echo-server/go.sum
new file mode 100644
index 000000000000..4fb909f27c7a
--- /dev/null
+++ b/samples/server/petstore/go-echo-server/go.sum
@@ -0,0 +1,30 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/golang-jwt/jwt v3.2.2+incompatible/go.mod h1:8pz2t5EyA70fFQQSrl6XZXzqecmYZeUEB8OUGHkxJ+I=
+github.com/labstack/echo/v4 v4.9.0/go.mod h1:xkCDAdFCIf8jsFQ5NnbK7oqaF/yU1A1X20Ltm0OvSks=
+github.com/labstack/gommon v0.3.1/go.mod h1:uW6kP17uPlLJsD3ijUYn3/M5bAxtlZhMI6m3MFxTMTM=
+github.com/mattn/go-colorable v0.1.11/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4=
+github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc=
+github.com/valyala/fasttemplate v1.2.1/go.mod h1:KHLXt3tVN2HBp8eijSv/kGJopbvo7S+qRAEEKiv+SiQ=
+golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
+golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20211103235746-7861aae1554b/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
+golang.org/x/time v0.0.0-20201208040808-7e3f01d25324/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/samples/server/petstore/go-gin-api-server-interface-only/go.mod b/samples/server/petstore/go-gin-api-server-interface-only/go.mod
index bbdae40128c7..788908e508f4 100644
--- a/samples/server/petstore/go-gin-api-server-interface-only/go.mod
+++ b/samples/server/petstore/go-gin-api-server-interface-only/go.mod
@@ -23,10 +23,10 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/samples/server/petstore/go-gin-api-server-interface-only/go.sum b/samples/server/petstore/go-gin-api-server-interface-only/go.sum
new file mode 100644
index 000000000000..3ffc7127f219
--- /dev/null
+++ b/samples/server/petstore/go-gin-api-server-interface-only/go.sum
@@ -0,0 +1,49 @@
+github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
+github.com/bytedance/sonic v1.9.1/go.mod h1:i736AoUSYt75HyZLoJW9ERYxcy6eaN6h4BZXU064P/U=
+github.com/chenzhuoyu/base64x v0.0.0-20211019084208-fb5309c8db06/go.mod h1:DH46F32mSOjUmXrMHnKwZdA8wcEefY7UVqBKYGjpdQY=
+github.com/chenzhuoyu/base64x v0.0.0-20221115062448-fe3a3abad311/go.mod h1:b583jCggY9gE99b6G5LEC39OIiVsWj+R97kbl5odCEk=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/gabriel-vasile/mimetype v1.4.2/go.mod h1:zApsH/mKG4w07erKIaJPFiX0Tsq9BFQgN3qGY5GnNgA=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.9.1/go.mod h1:hPrL7YrpYKXt5YId3A/Tnip5kqbEAP+KLuI3SUcPTeU=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.14.0/go.mod h1:9iXMNT7sEkjXb0I+enO7QXmzG6QCsPWY4zveKFVRSyU=
+github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.4/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
+github.com/leodido/go-urn v1.2.4/go.mod h1:7ZrI8mTSeBSHl/UaRyKQW1qZeMgak41ANeCNaVckg+4=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/pelletier/go-toml/v2 v2.0.8/go.mod h1:vuYfssBdrU2XDZ9bYydBu6t+6a6PYNcZljzZR9VXg+4=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/ugorji/go/codec v1.2.11/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
+golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/arch v0.3.0/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
+golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
+google.golang.org/protobuf v1.33.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4=
diff --git a/samples/server/petstore/go-gin-api-server/go.mod b/samples/server/petstore/go-gin-api-server/go.mod
index bbdae40128c7..788908e508f4 100644
--- a/samples/server/petstore/go-gin-api-server/go.mod
+++ b/samples/server/petstore/go-gin-api-server/go.mod
@@ -23,10 +23,10 @@ require (
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.11 // indirect
 	golang.org/x/arch v0.3.0 // indirect
-	golang.org/x/crypto v0.9.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/net v0.23.0 // indirect
-	golang.org/x/sys v0.8.0 // indirect
-	golang.org/x/text v0.9.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/samples/server/petstore/go-server-required/go.sum b/samples/server/petstore/go-server-required/go.sum
new file mode 100644
index 000000000000..41e78f1d874b
--- /dev/null
+++ b/samples/server/petstore/go-server-required/go.sum
@@ -0,0 +1 @@
+github.com/go-chi/chi/v5 v5.0.8/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java
index 236977b9464e..f5b1cf76b1bb 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeService.java
@@ -114,7 +114,7 @@ public interface FakeService {
 
     @POST
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@FormParam(value = "number")  BigDecimal number, @FormParam(value = "double")  Double _double, @FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam(value = "byte")  byte[] _byte, @FormParam(value = "integer")  Integer integer, @FormParam(value = "int32")  Integer int32, @FormParam(value = "int64")  Long int64, @FormParam(value = "float")  Float _float, @FormParam(value = "string")  String string,  @FormParam(value = "binary") InputStream binaryInputStream, @FormParam(value = "date")  LocalDate date, @FormParam(value = "dateTime")  OffsetDateTime dateTime, @FormParam(value = "password")  String password, @FormParam(value = "callback")  String paramCallback);
+    void testEndpointParameters(@FormParam(value = "number")  BigDecimal number, @FormParam(value = "double")  Double _double, @FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam(value = "byte")  byte[] _byte, @FormParam(value = "integer")  Integer _integer, @FormParam(value = "int32")  Integer int32, @FormParam(value = "int64")  Long int64, @FormParam(value = "float")  Float _float, @FormParam(value = "string")  String _string,  @FormParam(value = "binary") InputStream binaryInputStream, @FormParam(value = "date")  LocalDate _date, @FormParam(value = "dateTime")  OffsetDateTime _dateTime, @FormParam(value = "password")  String password, @FormParam(value = "callback")  String paramCallback);
 
     @GET
     @Consumes({ "application/x-www-form-urlencoded" })
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
index 09cf90adaba3..d973579b9ddf 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
@@ -144,7 +144,7 @@ public Client testClientModel(@Valid @NotNull Client client) {
 
     @POST
     @Consumes({ "application/x-www-form-urlencoded" })
-    public void testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  OffsetDateTime dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
+    public void testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer _integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate _date,@FormParam(value = "dateTime")  OffsetDateTime _dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
     }
 
     @GET
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
index 2536010aaeb3..f17b8f017a31 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
@@ -25,25 +25,25 @@
 
 public class FooGetDefaultResponse  {
   
-  private Foo string;
+  private Foo _string;
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public Foo getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
@@ -56,7 +56,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/FormatTest.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/FormatTest.java
index c98c85ccbebb..b9df03b367e8 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/FormatTest.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/FormatTest.java
@@ -29,7 +29,7 @@
 
 public class FormatTest  {
   
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -43,17 +43,17 @@ public class FormatTest  {
 
   private BigDecimal decimal;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private File binary;
 
-  private LocalDate date;
+  private LocalDate _date;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
@@ -68,24 +68,24 @@ public class FormatTest  {
   private String patternWithDigitsAndDelimiter;
 
  /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
   **/
  @Min(10) @Max(100)  public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   /**
-    * Set integer
+    * Set _integer
   **/
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -219,22 +219,22 @@ public FormatTest decimal(BigDecimal decimal) {
   }
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
  @Pattern(regexp="/[a-z]/i")  public String getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -280,63 +280,63 @@ public FormatTest binary(File binary) {
   }
 
  /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
   **/
   @NotNull
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   /**
-    * Set date
+    * Set _date
   **/
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -410,19 +410,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 1d04eaf6c945..4a365c34dfe5 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,74 +28,74 @@
 
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
-  private UUID uuid;
+  private UUID _uuid;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private Map<String, Animal> map = null;
+  private Map<String, Animal> _map = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
   **/
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   /**
-    * Set map
+    * Set _map
   **/
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    this.map.put(key, mapItem);
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    this._map.put(key, _mapItem);
     return this;
   }
 
@@ -108,9 +108,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
index dc24a224465a..805ede122212 100644
--- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
+++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
@@ -28,7 +28,7 @@
 
 public class ObjectWithDeprecatedFields  {
   
-  private String uuid;
+  private String _uuid;
 
   private BigDecimal id;
 
@@ -37,22 +37,22 @@ public class ObjectWithDeprecatedFields  {
   private List<String> bars = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -136,7 +136,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
index 40f8d5855417..7eeab22867bf 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
@@ -9,7 +9,7 @@
 
 public class FooGetDefaultResponse   {
 
-    private Foo string;
+    private Foo _string;
 
     /**
      * Default constructor.
@@ -21,26 +21,26 @@ public FooGetDefaultResponse() {
     /**
      * Create FooGetDefaultResponse.
      *
-     * @param string string
+     * @param _string _string
      */
     public FooGetDefaultResponse(
-        Foo string
+        Foo _string
     ) {
-        this.string = string;
+        this._string = _string;
     }
 
 
 
     /**
-     * Get string
-     * @return string
+     * Get _string
+     * @return _string
      */
     public Foo getString() {
-        return string;
+        return _string;
     }
 
-    public void setString(Foo string) {
-        this.string = string;
+    public void setString(Foo _string) {
+        this._string = _string;
     }
 
     /**
@@ -51,7 +51,7 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class FooGetDefaultResponse {\n");
         
-        sb.append("    string: ").append(toIndentedString(string)).append("\n");
+        sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/FormatTest.java b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/FormatTest.java
index 92e3aef3e80d..6c6a3103ea5f 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/FormatTest.java
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/FormatTest.java
@@ -13,19 +13,19 @@
 
 public class FormatTest   {
 
-    private Integer integer;
+    private Integer _integer;
     private Integer int32;
     private Long int64;
     private BigDecimal number;
     private Float _float;
     private Double _double;
     private BigDecimal decimal;
-    private String string;
+    private String _string;
     private byte[] _byte;
     private File binary;
-    private LocalDate date;
-    private OffsetDateTime dateTime;
-    private UUID uuid;
+    private LocalDate _date;
+    private OffsetDateTime _dateTime;
+    private UUID _uuid;
     private String password;
     private String patternWithDigits;
     private String patternWithDigitsAndDelimiter;
@@ -40,54 +40,54 @@ public FormatTest() {
     /**
      * Create FormatTest.
      *
-     * @param integer integer
+     * @param _integer _integer
      * @param int32 int32
      * @param int64 int64
      * @param number number
      * @param _float _float
      * @param _double _double
      * @param decimal decimal
-     * @param string string
+     * @param _string _string
      * @param _byte _byte
      * @param binary binary
-     * @param date date
-     * @param dateTime dateTime
-     * @param uuid uuid
+     * @param _date _date
+     * @param _dateTime _dateTime
+     * @param _uuid _uuid
      * @param password password
      * @param patternWithDigits A string that is a 10 digit number. Can have leading zeros.
      * @param patternWithDigitsAndDelimiter A string starting with &#39;image_&#39; (case insensitive) and one to three digits following i.e. Image_01.
      */
     public FormatTest(
-        Integer integer, 
+        Integer _integer, 
         Integer int32, 
         Long int64, 
         BigDecimal number, 
         Float _float, 
         Double _double, 
         BigDecimal decimal, 
-        String string, 
+        String _string, 
         byte[] _byte, 
         File binary, 
-        LocalDate date, 
-        OffsetDateTime dateTime, 
-        UUID uuid, 
+        LocalDate _date, 
+        OffsetDateTime _dateTime, 
+        UUID _uuid, 
         String password, 
         String patternWithDigits, 
         String patternWithDigitsAndDelimiter
     ) {
-        this.integer = integer;
+        this._integer = _integer;
         this.int32 = int32;
         this.int64 = int64;
         this.number = number;
         this._float = _float;
         this._double = _double;
         this.decimal = decimal;
-        this.string = string;
+        this._string = _string;
         this._byte = _byte;
         this.binary = binary;
-        this.date = date;
-        this.dateTime = dateTime;
-        this.uuid = uuid;
+        this._date = _date;
+        this._dateTime = _dateTime;
+        this._uuid = _uuid;
         this.password = password;
         this.patternWithDigits = patternWithDigits;
         this.patternWithDigitsAndDelimiter = patternWithDigitsAndDelimiter;
@@ -96,17 +96,17 @@ public FormatTest(
 
 
     /**
-     * Get integer
+     * Get _integer
      * minimum: 10
      * maximum: 100
-     * @return integer
+     * @return _integer
      */
     public Integer getInteger() {
-        return integer;
+        return _integer;
     }
 
-    public void setInteger(Integer integer) {
-        this.integer = integer;
+    public void setInteger(Integer _integer) {
+        this._integer = _integer;
     }
 
     /**
@@ -190,15 +190,15 @@ public void setDecimal(BigDecimal decimal) {
     }
 
     /**
-     * Get string
-     * @return string
+     * Get _string
+     * @return _string
      */
     public String getString() {
-        return string;
+        return _string;
     }
 
-    public void setString(String string) {
-        this.string = string;
+    public void setString(String _string) {
+        this._string = _string;
     }
 
     /**
@@ -226,39 +226,39 @@ public void setBinary(File binary) {
     }
 
     /**
-     * Get date
-     * @return date
+     * Get _date
+     * @return _date
      */
     public LocalDate getDate() {
-        return date;
+        return _date;
     }
 
-    public void setDate(LocalDate date) {
-        this.date = date;
+    public void setDate(LocalDate _date) {
+        this._date = _date;
     }
 
     /**
-     * Get dateTime
-     * @return dateTime
+     * Get _dateTime
+     * @return _dateTime
      */
     public OffsetDateTime getDateTime() {
-        return dateTime;
+        return _dateTime;
     }
 
-    public void setDateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
+    public void setDateTime(OffsetDateTime _dateTime) {
+        this._dateTime = _dateTime;
     }
 
     /**
-     * Get uuid
-     * @return uuid
+     * Get _uuid
+     * @return _uuid
      */
     public UUID getUuid() {
-        return uuid;
+        return _uuid;
     }
 
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
+    public void setUuid(UUID _uuid) {
+        this._uuid = _uuid;
     }
 
     /**
@@ -305,19 +305,19 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class FormatTest {\n");
         
-        sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+        sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
         sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
         sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
         sb.append("    number: ").append(toIndentedString(number)).append("\n");
         sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
         sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
         sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-        sb.append("    string: ").append(toIndentedString(string)).append("\n");
+        sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
         sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
         sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-        sb.append("    date: ").append(toIndentedString(date)).append("\n");
-        sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-        sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+        sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+        sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+        sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
         sb.append("    password: ").append("*").append("\n");
         sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
         sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9f2e5dc7bbef..4181f37e0799 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -12,9 +12,9 @@
 
 public class MixedPropertiesAndAdditionalPropertiesClass   {
 
-    private UUID uuid;
-    private OffsetDateTime dateTime;
-    private Map<String, Animal> map = new HashMap<>();
+    private UUID _uuid;
+    private OffsetDateTime _dateTime;
+    private Map<String, Animal> _map = new HashMap<>();
 
     /**
      * Default constructor.
@@ -26,56 +26,56 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
     /**
      * Create MixedPropertiesAndAdditionalPropertiesClass.
      *
-     * @param uuid uuid
-     * @param dateTime dateTime
-     * @param map map
+     * @param _uuid _uuid
+     * @param _dateTime _dateTime
+     * @param _map _map
      */
     public MixedPropertiesAndAdditionalPropertiesClass(
-        UUID uuid, 
-        OffsetDateTime dateTime, 
-        Map<String, Animal> map
+        UUID _uuid, 
+        OffsetDateTime _dateTime, 
+        Map<String, Animal> _map
     ) {
-        this.uuid = uuid;
-        this.dateTime = dateTime;
-        this.map = map;
+        this._uuid = _uuid;
+        this._dateTime = _dateTime;
+        this._map = _map;
     }
 
 
 
     /**
-     * Get uuid
-     * @return uuid
+     * Get _uuid
+     * @return _uuid
      */
     public UUID getUuid() {
-        return uuid;
+        return _uuid;
     }
 
-    public void setUuid(UUID uuid) {
-        this.uuid = uuid;
+    public void setUuid(UUID _uuid) {
+        this._uuid = _uuid;
     }
 
     /**
-     * Get dateTime
-     * @return dateTime
+     * Get _dateTime
+     * @return _dateTime
      */
     public OffsetDateTime getDateTime() {
-        return dateTime;
+        return _dateTime;
     }
 
-    public void setDateTime(OffsetDateTime dateTime) {
-        this.dateTime = dateTime;
+    public void setDateTime(OffsetDateTime _dateTime) {
+        this._dateTime = _dateTime;
     }
 
     /**
-     * Get map
-     * @return map
+     * Get _map
+     * @return _map
      */
     public Map<String, Animal> getMap() {
-        return map;
+        return _map;
     }
 
-    public void setMap(Map<String, Animal> map) {
-        this.map = map;
+    public void setMap(Map<String, Animal> _map) {
+        this._map = _map;
     }
 
     /**
@@ -86,9 +86,9 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
         
-        sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-        sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-        sb.append("    map: ").append(toIndentedString(map)).append("\n");
+        sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+        sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+        sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
         sb.append("}");
         return sb.toString();
     }
diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
index 83bc634c1d6b..3f05f215350e 100644
--- a/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
+++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
@@ -12,7 +12,7 @@
 
 public class ObjectWithDeprecatedFields   {
 
-    private String uuid;
+    private String _uuid;
     private BigDecimal id;
     private DeprecatedObject deprecatedRef;
     private List<String> bars = new ArrayList<>();
@@ -27,18 +27,18 @@ public ObjectWithDeprecatedFields() {
     /**
      * Create ObjectWithDeprecatedFields.
      *
-     * @param uuid uuid
+     * @param _uuid _uuid
      * @param id id
      * @param deprecatedRef deprecatedRef
      * @param bars bars
      */
     public ObjectWithDeprecatedFields(
-        String uuid, 
+        String _uuid, 
         BigDecimal id, 
         DeprecatedObject deprecatedRef, 
         List<String> bars
     ) {
-        this.uuid = uuid;
+        this._uuid = _uuid;
         this.id = id;
         this.deprecatedRef = deprecatedRef;
         this.bars = bars;
@@ -47,15 +47,15 @@ public ObjectWithDeprecatedFields(
 
 
     /**
-     * Get uuid
-     * @return uuid
+     * Get _uuid
+     * @return _uuid
      */
     public String getUuid() {
-        return uuid;
+        return _uuid;
     }
 
-    public void setUuid(String uuid) {
-        this.uuid = uuid;
+    public void setUuid(String _uuid) {
+        this._uuid = _uuid;
     }
 
     /**
@@ -102,7 +102,7 @@ public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append("class ObjectWithDeprecatedFields {\n");
         
-        sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+        sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
         sb.append("    id: ").append(toIndentedString(id)).append("\n");
         sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
         sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java
index 236977b9464e..f5b1cf76b1bb 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeService.java
@@ -114,7 +114,7 @@ public interface FakeService {
 
     @POST
     @Consumes({ "application/x-www-form-urlencoded" })
-    void testEndpointParameters(@FormParam(value = "number")  BigDecimal number, @FormParam(value = "double")  Double _double, @FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam(value = "byte")  byte[] _byte, @FormParam(value = "integer")  Integer integer, @FormParam(value = "int32")  Integer int32, @FormParam(value = "int64")  Long int64, @FormParam(value = "float")  Float _float, @FormParam(value = "string")  String string,  @FormParam(value = "binary") InputStream binaryInputStream, @FormParam(value = "date")  LocalDate date, @FormParam(value = "dateTime")  OffsetDateTime dateTime, @FormParam(value = "password")  String password, @FormParam(value = "callback")  String paramCallback);
+    void testEndpointParameters(@FormParam(value = "number")  BigDecimal number, @FormParam(value = "double")  Double _double, @FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @FormParam(value = "byte")  byte[] _byte, @FormParam(value = "integer")  Integer _integer, @FormParam(value = "int32")  Integer int32, @FormParam(value = "int64")  Long int64, @FormParam(value = "float")  Float _float, @FormParam(value = "string")  String _string,  @FormParam(value = "binary") InputStream binaryInputStream, @FormParam(value = "date")  LocalDate _date, @FormParam(value = "dateTime")  OffsetDateTime _dateTime, @FormParam(value = "password")  String password, @FormParam(value = "callback")  String paramCallback);
 
     @GET
     @Consumes({ "application/x-www-form-urlencoded" })
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
index 09cf90adaba3..d973579b9ddf 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/api/FakeServiceImpl.java
@@ -144,7 +144,7 @@ public Client testClientModel(@Valid @NotNull Client client) {
 
     @POST
     @Consumes({ "application/x-www-form-urlencoded" })
-    public void testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  OffsetDateTime dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
+    public void testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer _integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate _date,@FormParam(value = "dateTime")  OffsetDateTime _dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
     }
 
     @GET
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
index 2536010aaeb3..f17b8f017a31 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/FooGetDefaultResponse.java
@@ -25,25 +25,25 @@
 
 public class FooGetDefaultResponse  {
   
-  private Foo string;
+  private Foo _string;
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public Foo getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
@@ -56,7 +56,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/FormatTest.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/FormatTest.java
index c98c85ccbebb..b9df03b367e8 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/FormatTest.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/FormatTest.java
@@ -29,7 +29,7 @@
 
 public class FormatTest  {
   
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -43,17 +43,17 @@ public class FormatTest  {
 
   private BigDecimal decimal;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private File binary;
 
-  private LocalDate date;
+  private LocalDate _date;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
@@ -68,24 +68,24 @@ public class FormatTest  {
   private String patternWithDigitsAndDelimiter;
 
  /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
   **/
  @Min(10) @Max(100)  public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   /**
-    * Set integer
+    * Set _integer
   **/
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -219,22 +219,22 @@ public FormatTest decimal(BigDecimal decimal) {
   }
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
  @Pattern(regexp="/[a-z]/i")  public String getString() {
-    return string;
+    return _string;
   }
 
   /**
-    * Set string
+    * Set _string
   **/
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -280,63 +280,63 @@ public FormatTest binary(File binary) {
   }
 
  /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
   **/
   @NotNull
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   /**
-    * Set date
+    * Set _date
   **/
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -410,19 +410,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 1d04eaf6c945..4a365c34dfe5 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,74 +28,74 @@
 
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
-  private UUID uuid;
+  private UUID _uuid;
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private Map<String, Animal> map = null;
+  private Map<String, Animal> _map = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   /**
-    * Set dateTime
+    * Set _dateTime
   **/
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
   **/
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   /**
-    * Set map
+    * Set _map
   **/
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    this.map.put(key, mapItem);
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    this._map.put(key, _mapItem);
     return this;
   }
 
@@ -108,9 +108,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
index dc24a224465a..805ede122212 100644
--- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
+++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/java/org/openapitools/server/model/ObjectWithDeprecatedFields.java
@@ -28,7 +28,7 @@
 
 public class ObjectWithDeprecatedFields  {
   
-  private String uuid;
+  private String _uuid;
 
   private BigDecimal id;
 
@@ -37,22 +37,22 @@ public class ObjectWithDeprecatedFields  {
   private List<String> bars = null;
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   /**
-    * Set uuid
+    * Set _uuid
   **/
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -136,7 +136,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
index 4c2346a740a2..7bd6f679aba6 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApi.java
@@ -152,21 +152,21 @@ public Response testEndpointParameters(@ApiParam(value = "None", required=true)
 ,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double
 ,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter
 ,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte
-,@ApiParam(value = "None")  @FormParam("integer")  Integer integer
+,@ApiParam(value = "None")  @FormParam("integer")  Integer _integer
 ,@ApiParam(value = "None")  @FormParam("int32")  Integer int32
 ,@ApiParam(value = "None")  @FormParam("int64")  Long int64
 ,@ApiParam(value = "None")  @FormParam("float")  Float _float
-,@ApiParam(value = "None")  @FormParam("string")  String string
+,@ApiParam(value = "None")  @FormParam("string")  String _string
 ,
             @FormDataParam("binary") InputStream binaryInputStream,
             @FormDataParam("binary") FileInfo binaryDetail
-,@ApiParam(value = "None")  @FormParam("date")  Date date
-,@ApiParam(value = "None")  @FormParam("dateTime")  Date dateTime
+,@ApiParam(value = "None")  @FormParam("date")  Date _date
+,@ApiParam(value = "None")  @FormParam("dateTime")  Date _dateTime
 ,@ApiParam(value = "None")  @FormParam("password")  String password
 ,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback
 )
     throws NotFoundException {
-        return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,integer,int32,int64,_float,string,binaryInputStream, binaryDetail,date,dateTime,password,paramCallback);
+        return delegate.testEndpointParameters(number,_double,patternWithoutDelimiter,_byte,_integer,int32,int64,_float,_string,binaryInputStream, binaryDetail,_date,_dateTime,password,paramCallback);
     }
     @GET
     
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
index 213ce58885d6..4e845956b5db 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -49,14 +49,14 @@ public abstract Response testEndpointParameters(BigDecimal number
  ,Double _double
  ,String patternWithoutDelimiter
  ,byte[] _byte
- ,Integer integer
+ ,Integer _integer
  ,Integer int32
  ,Long int64
  ,Float _float
- ,String string
+ ,String _string
  ,InputStream binaryInputStream, FileInfo binaryDetail
- ,Date date
- ,Date dateTime
+ ,Date _date
+ ,Date _dateTime
  ,String password
  ,String paramCallback
  ) throws NotFoundException;
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java
index 2676ac098425..2f8fbdea8bfb 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest   {
   @JsonProperty("integer")
-  private Integer integer;
+  private Integer _integer;
 
   @JsonProperty("int32")
   private Integer int32;
@@ -35,7 +35,7 @@ public class FormatTest   {
   private Double _double;
 
   @JsonProperty("string")
-  private String string;
+  private String _string;
 
   @JsonProperty("byte")
   private byte[] _byte;
@@ -44,38 +44,38 @@ public class FormatTest   {
   private File binary;
 
   @JsonProperty("date")
-  private Date date;
+  private Date _date;
 
   @JsonProperty("dateTime")
-  private Date dateTime;
+  private Date _dateTime;
 
   @JsonProperty("uuid")
-  private UUID uuid;
+  private UUID _uuid;
 
   @JsonProperty("password")
   private String password;
 
   @JsonProperty("BigDecimal")
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
    /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
   **/
   @ApiModelProperty(value = "")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -176,22 +176,22 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
    /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   @ApiModelProperty(value = "")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -230,58 +230,58 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(Date date) {
-    this.date = date;
+  public FormatTest _date(Date _date) {
+    this._date = _date;
     return this;
   }
 
    /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
   **/
   @ApiModelProperty(required = true, value = "")
   public Date getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(Date date) {
-    this.date = date;
+  public void setDate(Date _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
    /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   @ApiModelProperty(value = "")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
    /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -302,22 +302,22 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
    /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
   **/
   @ApiModelProperty(value = "")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -330,25 +330,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Objects.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -356,20 +356,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 9ae21a8b4ec4..02d4510604e3 100644
--- a/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-msf4j/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -17,74 +17,74 @@
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaMSF4JServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
-  private UUID uuid;
+  private UUID _uuid;
 
   @JsonProperty("dateTime")
-  private Date dateTime;
+  private Date _dateTime;
 
   @JsonProperty("map")
-  private Map<String, Animal> map = null;
+  private Map<String, Animal> _map = null;
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
    /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   @ApiModelProperty(value = "")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
    /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   @ApiModelProperty(value = "")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
    /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
   **/
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -97,14 +97,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -112,9 +112,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index d48e56c60a27..88b89b1903c3 100644
--- a/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/java-msf4j/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -82,14 +82,14 @@ public Response testEndpointParameters(BigDecimal number
 , Double _double
 , String patternWithoutDelimiter
 , byte[] _byte
-, Integer integer
+, Integer _integer
 , Integer int32
 , Long int64
 , Float _float
-, String string
+, String _string
 , InputStream binaryInputStream, FileInfo binaryDetail
-, Date date
-, Date dateTime
+, Date _date
+, Date _dateTime
 , String password
 , String paramCallback
  ) throws NotFoundException {
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java
index 4b4d1681601a..5bbb5df1bde8 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/FormatTest.java
@@ -22,7 +22,7 @@ public class FormatTest   {
   @Min(10)
 @Max(100)
 
-  private Integer integer;
+  private Integer _integer;
 
   @JsonProperty("int32")
   @Min(20)
@@ -57,7 +57,7 @@ public class FormatTest   {
   @JsonProperty("string")
   @Pattern(regexp="/[a-z]/i")
 
-  private String string;
+  private String _string;
 
   @JsonProperty("byte")
   @NotNull
@@ -74,17 +74,17 @@ public class FormatTest   {
   @NotNull
 @Valid
 
-  private LocalDate date;
+  private LocalDate _date;
 
   @JsonProperty("dateTime")
   @Valid
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @JsonProperty("uuid")
   @Valid
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @JsonProperty("password")
   @NotNull
@@ -95,25 +95,25 @@ public class FormatTest   {
   @JsonProperty("BigDecimal")
   @Valid
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
    /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
   **/
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -209,21 +209,21 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
    /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -260,55 +260,55 @@ public void setBinary(InputStream binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
    /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
   **/
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
    /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
    /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -328,21 +328,21 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
    /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
   **/
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -355,25 +355,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(integer, formatTest.integer) &&
+    return Objects.equals(_integer, formatTest._integer) &&
         Objects.equals(int32, formatTest.int32) &&
         Objects.equals(int64, formatTest.int64) &&
         Objects.equals(number, formatTest.number) &&
         Objects.equals(_float, formatTest._float) &&
         Objects.equals(_double, formatTest._double) &&
-        Objects.equals(string, formatTest.string) &&
+        Objects.equals(_string, formatTest._string) &&
         Objects.equals(_byte, formatTest._byte) &&
         Objects.equals(binary, formatTest.binary) &&
-        Objects.equals(date, formatTest.date) &&
-        Objects.equals(dateTime, formatTest.dateTime) &&
-        Objects.equals(uuid, formatTest.uuid) &&
+        Objects.equals(_date, formatTest._date) &&
+        Objects.equals(_dateTime, formatTest._dateTime) &&
+        Objects.equals(_uuid, formatTest._uuid) &&
         Objects.equals(password, formatTest.password) &&
-        Objects.equals(bigDecimal, formatTest.bigDecimal);
+        Objects.equals(_bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @SuppressWarnings("StringBufferReplaceableByString")
@@ -382,20 +382,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java
index 27a49ff2a529..06c58054534c 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/apimodels/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -20,75 +20,75 @@ public class MixedPropertiesAndAdditionalPropertiesClass   {
   @JsonProperty("uuid")
   @Valid
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @JsonProperty("dateTime")
   @Valid
 
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @JsonProperty("map")
   @Valid
 
-  private Map<String, Animal> map = null;
+  private Map<String, Animal> _map = null;
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
    /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
    /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
    /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
   **/
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -101,14 +101,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(_uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(_dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(_map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @SuppressWarnings("StringBufferReplaceableByString")
@@ -117,9 +117,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
index 711fd4e4a513..b7daae217a95 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiController.java
@@ -175,12 +175,12 @@ public Result testClientModel(Http.Request request) throws Exception {
 
     @ApiAction
     public Result testEndpointParameters(Http.Request request) throws Exception {
-        String[] valueinteger = request.body().asMultipartFormData().asFormUrlEncoded().get("integer");
-        Integer integer;
-        if (valueinteger != null) {
-            integer = Integer.parseInt(valueinteger[0]);
+        String[] value_integer = request.body().asMultipartFormData().asFormUrlEncoded().get("integer");
+        Integer _integer;
+        if (value_integer != null) {
+            _integer = Integer.parseInt(value_integer[0]);
         } else {
-            integer = null;
+            _integer = null;
         }
         String[] valueint32 = request.body().asMultipartFormData().asFormUrlEncoded().get("int32");
         Integer int32;
@@ -217,12 +217,12 @@ public Result testEndpointParameters(Http.Request request) throws Exception {
         } else {
             throw new IllegalArgumentException("'double' parameter is required");
         }
-        String[] valuestring = request.body().asMultipartFormData().asFormUrlEncoded().get("string");
-        String string;
-        if (valuestring != null) {
-            string = valuestring[0];
+        String[] value_string = request.body().asMultipartFormData().asFormUrlEncoded().get("string");
+        String _string;
+        if (value_string != null) {
+            _string = value_string[0];
         } else {
-            string = null;
+            _string = null;
         }
         String[] valuepatternWithoutDelimiter = request.body().asMultipartFormData().asFormUrlEncoded().get("pattern_without_delimiter");
         String patternWithoutDelimiter;
@@ -240,19 +240,19 @@ public Result testEndpointParameters(Http.Request request) throws Exception {
         }
         Http.MultipartFormData<TemporaryFile> bodybinary = request.body().asMultipartFormData();
         Http.MultipartFormData.FilePart<TemporaryFile> binary = bodybinary.getFile("binary");
-        String[] valuedate = request.body().asMultipartFormData().asFormUrlEncoded().get("date");
-        LocalDate date;
-        if (valuedate != null) {
-            date = LocalDate.parse(valuedate[0]);
+        String[] value_date = request.body().asMultipartFormData().asFormUrlEncoded().get("date");
+        LocalDate _date;
+        if (value_date != null) {
+            _date = LocalDate.parse(value_date[0]);
         } else {
-            date = null;
+            _date = null;
         }
-        String[] valuedateTime = request.body().asMultipartFormData().asFormUrlEncoded().get("dateTime");
-        OffsetDateTime dateTime;
-        if (valuedateTime != null) {
-            dateTime = OffsetDateTime.parse(valuedateTime[0]);
+        String[] value_dateTime = request.body().asMultipartFormData().asFormUrlEncoded().get("dateTime");
+        OffsetDateTime _dateTime;
+        if (value_dateTime != null) {
+            _dateTime = OffsetDateTime.parse(value_dateTime[0]);
         } else {
-            dateTime = null;
+            _dateTime = null;
         }
         String[] valuepassword = request.body().asMultipartFormData().asFormUrlEncoded().get("password");
         String password;
@@ -268,7 +268,7 @@ public Result testEndpointParameters(Http.Request request) throws Exception {
         } else {
             paramCallback = null;
         }
-        return imp.testEndpointParametersHttp(request, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+        return imp.testEndpointParametersHttp(request, number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
     @ApiAction
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java
index 28d16e266b9a..9aa853d79daf 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImp.java
@@ -68,7 +68,7 @@ public Client testClientModel(Http.Request request, Client body) throws Exceptio
     }
 
     @Override
-    public void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart<TemporaryFile> binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception {
+    public void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, Http.MultipartFormData.FilePart<TemporaryFile> binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws Exception {
         //Do your magic!!!
     }
 
diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java
index 4625cca51f05..17ae6148cb5f 100644
--- a/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java
+++ b/samples/server/petstore/java-play-framework-fake-endpoints/app/controllers/FakeApiControllerImpInterface.java
@@ -125,13 +125,13 @@ public Result testClientModelHttp(Http.Request request, Client body) throws Exce
 
     public abstract Client testClientModel(Http.Request request, Client body) throws Exception;
 
-    public Result testEndpointParametersHttp(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart<TemporaryFile> binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception {
-        testEndpointParameters(request, number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+    public Result testEndpointParametersHttp(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, Http.MultipartFormData.FilePart<TemporaryFile> binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws Exception {
+        testEndpointParameters(request, number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
         return ok();
 
     }
 
-    public abstract void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, Http.MultipartFormData.FilePart<TemporaryFile> binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws Exception;
+    public abstract void testEndpointParameters(Http.Request request, BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, Http.MultipartFormData.FilePart<TemporaryFile> binary, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback) throws Exception;
 
     public Result testEnumParametersHttp(Http.Request request, List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws Exception {
         testEnumParameters(request, enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java
index 121d1e583e9c..7dfc7722fb09 100644
--- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java
+++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java
@@ -433,7 +433,7 @@ public static String testClientModelRequestSample1() {
     }
 
 
-    public static MappingBuilder stubTestEndpointParameters400(@javax.annotation.Nonnull String number, @javax.annotation.Nonnull String _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull String _byte, @javax.annotation.Nullable String integer, @javax.annotation.Nullable String int32, @javax.annotation.Nullable String int64, @javax.annotation.Nullable String _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable String binary, @javax.annotation.Nullable String date, @javax.annotation.Nullable String dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) {
+    public static MappingBuilder stubTestEndpointParameters400(@javax.annotation.Nonnull String number, @javax.annotation.Nonnull String _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull String _byte, @javax.annotation.Nullable String _integer, @javax.annotation.Nullable String int32, @javax.annotation.Nullable String int64, @javax.annotation.Nullable String _float, @javax.annotation.Nullable String _string, @javax.annotation.Nullable String binary, @javax.annotation.Nullable String _date, @javax.annotation.Nullable String _dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) {
         MappingBuilder stub = post(urlPathEqualTo("/fake"))
             .withHeader("Content-Type", havingExactly("application/x-www-form-urlencoded"))
             .withHeader("Authorization", matching(".*"))
@@ -441,8 +441,8 @@ public static MappingBuilder stubTestEndpointParameters400(@javax.annotation.Non
                 .withStatus(400)
             );
 
-        if(integer != null) {
-            stub = stub.withFormParam("integer", havingExactly(integer));
+        if(_integer != null) {
+            stub = stub.withFormParam("integer", havingExactly(_integer));
         }
         if(int32 != null) {
             stub = stub.withFormParam("int32", havingExactly(int32));
@@ -455,19 +455,19 @@ public static MappingBuilder stubTestEndpointParameters400(@javax.annotation.Non
             stub = stub.withFormParam("float", havingExactly(_float));
         }
         stub = stub.withFormParam("double", havingExactly(_double));
-        if(string != null) {
-            stub = stub.withFormParam("string", havingExactly(string));
+        if(_string != null) {
+            stub = stub.withFormParam("string", havingExactly(_string));
         }
         stub = stub.withFormParam("pattern_without_delimiter", havingExactly(patternWithoutDelimiter));
         stub = stub.withFormParam("byte", havingExactly(_byte));
         if(binary != null) {
             stub = stub.withFormParam("binary", havingExactly(binary));
         }
-        if(date != null) {
-            stub = stub.withFormParam("date", havingExactly(date));
+        if(_date != null) {
+            stub = stub.withFormParam("date", havingExactly(_date));
         }
-        if(dateTime != null) {
-            stub = stub.withFormParam("dateTime", havingExactly(dateTime));
+        if(_dateTime != null) {
+            stub = stub.withFormParam("dateTime", havingExactly(_dateTime));
         }
         if(password != null) {
             stub = stub.withFormParam("password", havingExactly(password));
@@ -479,7 +479,7 @@ public static MappingBuilder stubTestEndpointParameters400(@javax.annotation.Non
         return stub;
     }
 
-    public static MappingBuilder stubTestEndpointParameters404(@javax.annotation.Nonnull String number, @javax.annotation.Nonnull String _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull String _byte, @javax.annotation.Nullable String integer, @javax.annotation.Nullable String int32, @javax.annotation.Nullable String int64, @javax.annotation.Nullable String _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable String binary, @javax.annotation.Nullable String date, @javax.annotation.Nullable String dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) {
+    public static MappingBuilder stubTestEndpointParameters404(@javax.annotation.Nonnull String number, @javax.annotation.Nonnull String _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull String _byte, @javax.annotation.Nullable String _integer, @javax.annotation.Nullable String int32, @javax.annotation.Nullable String int64, @javax.annotation.Nullable String _float, @javax.annotation.Nullable String _string, @javax.annotation.Nullable String binary, @javax.annotation.Nullable String _date, @javax.annotation.Nullable String _dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback) {
         MappingBuilder stub = post(urlPathEqualTo("/fake"))
             .withHeader("Content-Type", havingExactly("application/x-www-form-urlencoded"))
             .withHeader("Authorization", matching(".*"))
@@ -487,8 +487,8 @@ public static MappingBuilder stubTestEndpointParameters404(@javax.annotation.Non
                 .withStatus(404)
             );
 
-        if(integer != null) {
-            stub = stub.withFormParam("integer", havingExactly(integer));
+        if(_integer != null) {
+            stub = stub.withFormParam("integer", havingExactly(_integer));
         }
         if(int32 != null) {
             stub = stub.withFormParam("int32", havingExactly(int32));
@@ -501,19 +501,19 @@ public static MappingBuilder stubTestEndpointParameters404(@javax.annotation.Non
             stub = stub.withFormParam("float", havingExactly(_float));
         }
         stub = stub.withFormParam("double", havingExactly(_double));
-        if(string != null) {
-            stub = stub.withFormParam("string", havingExactly(string));
+        if(_string != null) {
+            stub = stub.withFormParam("string", havingExactly(_string));
         }
         stub = stub.withFormParam("pattern_without_delimiter", havingExactly(patternWithoutDelimiter));
         stub = stub.withFormParam("byte", havingExactly(_byte));
         if(binary != null) {
             stub = stub.withFormParam("binary", havingExactly(binary));
         }
-        if(date != null) {
-            stub = stub.withFormParam("date", havingExactly(date));
+        if(_date != null) {
+            stub = stub.withFormParam("date", havingExactly(_date));
         }
-        if(dateTime != null) {
-            stub = stub.withFormParam("dateTime", havingExactly(dateTime));
+        if(_dateTime != null) {
+            stub = stub.withFormParam("dateTime", havingExactly(_dateTime));
         }
         if(password != null) {
             stub = stub.withFormParam("password", havingExactly(password));
@@ -525,7 +525,7 @@ public static MappingBuilder stubTestEndpointParameters404(@javax.annotation.Non
         return stub;
     }
 
-    public static MappingBuilder stubTestEndpointParametersFault(@javax.annotation.Nonnull String number, @javax.annotation.Nonnull String _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull String _byte, @javax.annotation.Nullable String integer, @javax.annotation.Nullable String int32, @javax.annotation.Nullable String int64, @javax.annotation.Nullable String _float, @javax.annotation.Nullable String string, @javax.annotation.Nullable String binary, @javax.annotation.Nullable String date, @javax.annotation.Nullable String dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback, Fault fault) {
+    public static MappingBuilder stubTestEndpointParametersFault(@javax.annotation.Nonnull String number, @javax.annotation.Nonnull String _double, @javax.annotation.Nonnull String patternWithoutDelimiter, @javax.annotation.Nonnull String _byte, @javax.annotation.Nullable String _integer, @javax.annotation.Nullable String int32, @javax.annotation.Nullable String int64, @javax.annotation.Nullable String _float, @javax.annotation.Nullable String _string, @javax.annotation.Nullable String binary, @javax.annotation.Nullable String _date, @javax.annotation.Nullable String _dateTime, @javax.annotation.Nullable String password, @javax.annotation.Nullable String paramCallback, Fault fault) {
         MappingBuilder stub = post(urlPathEqualTo("/fake"))
             .withHeader("Content-Type", havingExactly("application/x-www-form-urlencoded"))
             .withHeader("Authorization", matching(".*"))
@@ -533,8 +533,8 @@ public static MappingBuilder stubTestEndpointParametersFault(@javax.annotation.N
                 .withFault(fault)
             );
 
-        if(integer != null) {
-            stub = stub.withFormParam("integer", havingExactly(integer));
+        if(_integer != null) {
+            stub = stub.withFormParam("integer", havingExactly(_integer));
         }
         if(int32 != null) {
             stub = stub.withFormParam("int32", havingExactly(int32));
@@ -547,19 +547,19 @@ public static MappingBuilder stubTestEndpointParametersFault(@javax.annotation.N
             stub = stub.withFormParam("float", havingExactly(_float));
         }
         stub = stub.withFormParam("double", havingExactly(_double));
-        if(string != null) {
-            stub = stub.withFormParam("string", havingExactly(string));
+        if(_string != null) {
+            stub = stub.withFormParam("string", havingExactly(_string));
         }
         stub = stub.withFormParam("pattern_without_delimiter", havingExactly(patternWithoutDelimiter));
         stub = stub.withFormParam("byte", havingExactly(_byte));
         if(binary != null) {
             stub = stub.withFormParam("binary", havingExactly(binary));
         }
-        if(date != null) {
-            stub = stub.withFormParam("date", havingExactly(date));
+        if(_date != null) {
+            stub = stub.withFormParam("date", havingExactly(_date));
         }
-        if(dateTime != null) {
-            stub = stub.withFormParam("dateTime", havingExactly(dateTime));
+        if(_dateTime != null) {
+            stub = stub.withFormParam("dateTime", havingExactly(_dateTime));
         }
         if(password != null) {
             stub = stub.withFormParam("password", havingExactly(password));
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java
index fc6c48b50d6c..b0a1de5072a0 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/api/FakeApi.java
@@ -128,7 +128,7 @@ public interface FakeApi  {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied"),
         @ApiResponse(code = 404, message = "User not found") })
-    public void testEndpointParameters(@Multipart(value = "number")  BigDecimal number, @Multipart(value = "double")  Double _double, @Multipart(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @Multipart(value = "byte")  byte[] _byte, @Multipart(value = "integer", required = false)  Integer integer, @Multipart(value = "int32", required = false)  Integer int32, @Multipart(value = "int64", required = false)  Long int64, @Multipart(value = "float", required = false)  Float _float, @Multipart(value = "string", required = false)  String string,  @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false)  LocalDate date, @Multipart(value = "dateTime", required = false)  Date dateTime, @Multipart(value = "password", required = false)  String password, @Multipart(value = "callback", required = false)  String paramCallback);
+    public void testEndpointParameters(@Multipart(value = "number")  BigDecimal number, @Multipart(value = "double")  Double _double, @Multipart(value = "pattern_without_delimiter")  String patternWithoutDelimiter, @Multipart(value = "byte")  byte[] _byte, @Multipart(value = "integer", required = false)  Integer _integer, @Multipart(value = "int32", required = false)  Integer int32, @Multipart(value = "int64", required = false)  Long int64, @Multipart(value = "float", required = false)  Float _float, @Multipart(value = "string", required = false)  String _string,  @Multipart(value = "binary" , required = false) Attachment binaryDetail, @Multipart(value = "date", required = false)  LocalDate _date, @Multipart(value = "dateTime", required = false)  Date _dateTime, @Multipart(value = "password", required = false)  String password, @Multipart(value = "callback", required = false)  String paramCallback);
 
     /**
      * To test enum parameters
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
index 976d985f42b9..c8306d9d1076 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/FormatTest.java
@@ -17,7 +17,7 @@
 public class FormatTest  {
   
   @ApiModelProperty(value = "")
-  private Integer integer;
+  private Integer _integer;
 
   @ApiModelProperty(value = "")
   private Integer int32;
@@ -36,7 +36,7 @@ public class FormatTest  {
   private Double _double;
 
   @ApiModelProperty(value = "")
-  private String string;
+  private String _string;
 
   @ApiModelProperty(required = true, value = "")
   private byte[] _byte;
@@ -45,37 +45,37 @@ public class FormatTest  {
   private File binary;
 
   @ApiModelProperty(required = true, value = "")
-  private LocalDate date;
+  private LocalDate _date;
 
   @ApiModelProperty(value = "")
-  private Date dateTime;
+  private Date _dateTime;
 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
-  private UUID uuid;
+  private UUID _uuid;
 
   @ApiModelProperty(required = true, value = "")
   private String password;
 
   @ApiModelProperty(value = "")
   @Valid
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
  /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
   **/
   @JsonProperty("integer")
  @Min(10) @Max(100)  public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -179,20 +179,20 @@ public FormatTest _double(Double _double) {
   }
 
  /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
   **/
   @JsonProperty("string")
  @Pattern(regexp="/[a-z]/i")  public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -234,57 +234,57 @@ public FormatTest binary(File binary) {
   }
 
  /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
   **/
   @JsonProperty("date")
   @NotNull
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -308,20 +308,20 @@ public FormatTest password(String password) {
   }
 
  /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
   **/
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
@@ -334,25 +334,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Objects.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -360,20 +360,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 6b4c41db1c19..05466d3a0e1f 100644
--- a/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-cxf/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -16,70 +16,70 @@
 public class MixedPropertiesAndAdditionalPropertiesClass  {
   
   @ApiModelProperty(value = "")
-  private UUID uuid;
+  private UUID _uuid;
 
   @ApiModelProperty(value = "")
-  private Date dateTime;
+  private Date _dateTime;
 
   @ApiModelProperty(value = "")
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
  /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
   **/
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
  /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
   **/
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
  /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
   **/
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    this.map.put(key, mapItem);
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    this._map.put(key, _mapItem);
     return this;
   }
 
@@ -92,14 +92,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -107,9 +107,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
index ec79a7b0139a..9235d6467837 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApi.java
@@ -171,10 +171,10 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class)
     })
-    public Response testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,@ApiParam(value = "None")  @FormParam("integer")  Integer integer,@ApiParam(value = "None")  @FormParam("int32")  Integer int32,@ApiParam(value = "None")  @FormParam("int64")  Long int64,@ApiParam(value = "None")  @FormParam("float")  Float _float,@ApiParam(value = "None")  @FormParam("string")  String string,
- @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None")  @FormParam("date")  LocalDate date,@ApiParam(value = "None")  @FormParam("dateTime")  OffsetDateTime dateTime,@ApiParam(value = "None")  @FormParam("password")  String password,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback,@Context SecurityContext securityContext)
+    public Response testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,@ApiParam(value = "None")  @FormParam("integer")  Integer _integer,@ApiParam(value = "None")  @FormParam("int32")  Integer int32,@ApiParam(value = "None")  @FormParam("int64")  Long int64,@ApiParam(value = "None")  @FormParam("float")  Float _float,@ApiParam(value = "None")  @FormParam("string")  String _string,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None")  @FormParam("date")  LocalDate _date,@ApiParam(value = "None")  @FormParam("dateTime")  OffsetDateTime _dateTime,@ApiParam(value = "None")  @FormParam("password")  String password,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
+        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext);
     }
     @javax.ws.rs.GET
     
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
index 3b2cbc0beff4..c3da264146ff 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -35,7 +35,7 @@ public abstract class FakeApiService {
     public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException;
-    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,LocalDate date,OffsetDateTime dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,LocalDate _date,OffsetDateTime _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineAdditionalProperties(Map<String, String> param,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
index ca4279704bba..f2c68a3a871a 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/FormatTest.java
@@ -52,7 +52,7 @@
 public class FormatTest  implements Serializable {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -76,7 +76,7 @@ public class FormatTest  implements Serializable {
 
   public static final String JSON_PROPERTY_STRING = "string";
   @JsonProperty(JSON_PROPERTY_STRING)
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   @JsonProperty(JSON_PROPERTY_BYTE)
@@ -88,15 +88,15 @@ public class FormatTest  implements Serializable {
 
   public static final String JSON_PROPERTY_DATE = "date";
   @JsonProperty(JSON_PROPERTY_DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -104,28 +104,28 @@ public class FormatTest  implements Serializable {
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    **/
   @JsonProperty(value = "integer")
   @ApiModelProperty(value = "")
    @Min(10) @Max(100)
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -236,24 +236,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    **/
   @JsonProperty(value = "string")
   @ApiModelProperty(value = "")
    @Pattern(regexp="/[a-z]/i")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -296,64 +296,64 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    **/
   @JsonProperty(value = "date")
   @ApiModelProperty(required = true, value = "")
   @NotNull 
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @ApiModelProperty(value = "")
   
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -376,24 +376,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    **/
   @JsonProperty(value = "BigDecimal")
   @ApiModelProperty(value = "")
   @Valid 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -406,25 +406,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Objects.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -432,20 +432,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 1f9a1e93cb9d..e33e374b7e18 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -40,82 +40,82 @@
 public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
   @JsonProperty(JSON_PROPERTY_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(value = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @ApiModelProperty(value = "")
   
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    **/
   @JsonProperty(value = "map")
   @ApiModelProperty(value = "")
   @Valid 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -128,14 +128,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -143,9 +143,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 431b462fb934..cd624a96beaf 100644
--- a/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-datelib-j8/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -67,7 +67,7 @@ public Response testClientModel(Client body, SecurityContext securityContext) th
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, LocalDate _date, OffsetDateTime _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
index 646056933a3d..7438fcbf1bb9 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApi.java
@@ -238,10 +238,10 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class)
     })
-    public Response testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,@ApiParam(value = "None")  @FormParam("integer")  Integer integer,@ApiParam(value = "None")  @FormParam("int32")  Integer int32,@ApiParam(value = "None")  @FormParam("int64")  Long int64,@ApiParam(value = "None")  @FormParam("float")  Float _float,@ApiParam(value = "None")  @FormParam("string")  String string,
- @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None")  @FormParam("date")  Date date,@ApiParam(value = "None")  @FormParam("dateTime")  Date dateTime,@ApiParam(value = "None")  @FormParam("password")  String password,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback,@Context SecurityContext securityContext)
+    public Response testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,@ApiParam(value = "None")  @FormParam("integer")  Integer _integer,@ApiParam(value = "None")  @FormParam("int32")  Integer int32,@ApiParam(value = "None")  @FormParam("int64")  Long int64,@ApiParam(value = "None")  @FormParam("float")  Float _float,@ApiParam(value = "None")  @FormParam("string")  String _string,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None")  @FormParam("date")  Date _date,@ApiParam(value = "None")  @FormParam("dateTime")  Date _dateTime,@ApiParam(value = "None")  @FormParam("password")  String password,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
+        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext);
     }
     @javax.ws.rs.GET
     
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
index 0045186d2b5d..54031cd735ad 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -45,7 +45,7 @@ public abstract class FakeApiService {
     public abstract Response testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException;
-    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,Date _date,Date _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<EnumClass> enumQueryModelArray,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineAdditionalProperties(Map<String, String> requestBody,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
index fd7c3fa61f1c..cdcb690f8456 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
@@ -34,26 +34,26 @@
 public class FooGetDefaultResponse   {
   public static final String JSON_PROPERTY_STRING = "string";
   @JsonProperty(JSON_PROPERTY_STRING)
-  private Foo string;
+  private Foo _string;
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    **/
   @JsonProperty(value = "string")
   @ApiModelProperty(value = "")
   @Valid 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -66,12 +66,12 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
@@ -79,7 +79,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java
index e1688e6c2c9e..9caa9c5f541f 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/FormatTest.java
@@ -52,7 +52,7 @@
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -80,7 +80,7 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_STRING = "string";
   @JsonProperty(JSON_PROPERTY_STRING)
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   @JsonProperty(JSON_PROPERTY_BYTE)
@@ -92,15 +92,15 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_DATE = "date";
   @JsonProperty(JSON_PROPERTY_DATE)
-  private Date date;
+  private Date _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private Date dateTime;
+  private Date _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -114,26 +114,26 @@ public class FormatTest   {
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   private String patternWithDigitsAndDelimiter;
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    **/
   @JsonProperty(value = "integer")
   @ApiModelProperty(value = "")
    @Min(10) @Max(100)
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -264,24 +264,24 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    **/
   @JsonProperty(value = "string")
   @ApiModelProperty(value = "")
    @Pattern(regexp="/[a-z]/i")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -324,64 +324,64 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(Date date) {
-    this.date = date;
+  public FormatTest _date(Date _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    **/
   @JsonProperty(value = "date")
   @ApiModelProperty(required = true, value = "")
   @NotNull 
   public Date getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(Date date) {
-    this.date = date;
+  public void setDate(Date _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @ApiModelProperty(value = "")
   
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -454,19 +454,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Objects.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -474,7 +474,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, _byte, binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, _byte, binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
@@ -482,19 +482,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 4cd16bfb874b..98834fc328e7 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,82 +39,82 @@
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private Date dateTime;
+  private Date _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
   @JsonProperty(JSON_PROPERTY_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(value = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @ApiModelProperty(value = "")
   
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    **/
   @JsonProperty(value = "map")
   @ApiModelProperty(value = "")
   @Valid 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -127,14 +127,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -142,9 +142,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
index e7e99b928321..54d80b81ec41 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
@@ -40,7 +40,7 @@
 public class ObjectWithDeprecatedFields   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
@@ -54,24 +54,24 @@ public class ObjectWithDeprecatedFields   {
   @JsonProperty(JSON_PROPERTY_BARS)
   private List<String> bars = new ArrayList<>();
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(value = "")
   
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -152,7 +152,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -160,7 +160,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
@@ -168,7 +168,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 739775601e7b..e08fa98ad9b7 100644
--- a/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs-jersey/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -97,7 +97,7 @@ public Response testClientModel(Client client, SecurityContext securityContext)
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, Date _date, Date _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
index 9572c48d51c6..68c3d223d9c5 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/api/FakeApi.java
@@ -159,14 +159,14 @@ public interface FakeApi {
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @return Invalid username supplied
@@ -181,7 +181,7 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  Date dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback);
+    Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer _integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate _date,@FormParam(value = "dateTime")  Date _dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback);
 
 
     /**
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
index 8509239130dc..a99b9acb0ceb 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/FormatTest.java
@@ -25,27 +25,27 @@
 @JsonTypeName("format_test")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest  implements Serializable {
-  private Integer integer;
+  private Integer _integer;
   private Integer int32;
   private Long int64;
   private BigDecimal number;
   private Float _float;
   private Double _double;
-  private String string;
+  private String _string;
   private byte[] _byte;
   private File binary;
-  private LocalDate date;
-  private Date dateTime;
-  private UUID uuid;
+  private LocalDate _date;
+  private Date _dateTime;
+  private UUID _uuid;
   private String password;
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   /**
    * minimum: 10
    * maximum: 100
    **/
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -53,12 +53,12 @@ public FormatTest integer(Integer integer) {
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
    @Min(10) @Max(100)public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   @JsonProperty("integer")
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   /**
@@ -166,8 +166,8 @@ public void setDouble(Double _double) {
 
   /**
    **/
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -175,12 +175,12 @@ public FormatTest string(String string) {
   @ApiModelProperty(value = "")
   @JsonProperty("string")
    @Pattern(regexp="/[a-z]/i")public String getString() {
-    return string;
+    return _string;
   }
 
   @JsonProperty("string")
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   /**
@@ -223,8 +223,8 @@ public void setBinary(File binary) {
 
   /**
    **/
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
@@ -232,18 +232,18 @@ public FormatTest date(LocalDate date) {
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   @NotNull public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   @JsonProperty("date")
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
   /**
    **/
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -251,18 +251,18 @@ public FormatTest dateTime(Date dateTime) {
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -270,12 +270,12 @@ public FormatTest uuid(UUID uuid) {
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
@@ -299,8 +299,8 @@ public void setPassword(String password) {
 
   /**
    **/
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
@@ -308,12 +308,12 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   @Valid public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
   @JsonProperty("BigDecimal")
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -326,25 +326,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -352,20 +352,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 58313ebe02ea..ebf93fe7ad27 100644
--- a/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface-response/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -23,14 +23,14 @@
 @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
-  private UUID uuid;
-  private Date dateTime;
-  private @Valid Map<String, Animal> map = new HashMap<>();
+  private UUID _uuid;
+  private Date _dateTime;
+  private @Valid Map<String, Animal> _map = new HashMap<>();
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -38,18 +38,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -57,18 +57,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
@@ -76,26 +76,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   @Valid public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   @JsonProperty("map")
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
 
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(String key) {
-    if (this.map != null) {
-      this.map.remove(key);
+    if (this._map != null) {
+      this._map.remove(key);
     }
 
     return this;
@@ -110,14 +110,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -125,9 +125,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
index 44f91c89ce0a..c2c7a0e24314 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/api/FakeApi.java
@@ -159,14 +159,14 @@ public interface FakeApi {
      * @param _double None
      * @param patternWithoutDelimiter None
      * @param _byte None
-     * @param integer None
+     * @param _integer None
      * @param int32 None
      * @param int64 None
      * @param _float None
-     * @param string None
+     * @param _string None
      * @param binary None
-     * @param date None
-     * @param dateTime None
+     * @param _date None
+     * @param _dateTime None
      * @param password None
      * @param paramCallback None
      * @return Invalid username supplied
@@ -181,7 +181,7 @@ public interface FakeApi {
     @ApiResponses(value = { 
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class) })
-    void testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  Date dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback);
+    void testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer _integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate _date,@FormParam(value = "dateTime")  Date _dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback);
 
 
     /**
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
index 8509239130dc..a99b9acb0ceb 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/FormatTest.java
@@ -25,27 +25,27 @@
 @JsonTypeName("format_test")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest  implements Serializable {
-  private Integer integer;
+  private Integer _integer;
   private Integer int32;
   private Long int64;
   private BigDecimal number;
   private Float _float;
   private Double _double;
-  private String string;
+  private String _string;
   private byte[] _byte;
   private File binary;
-  private LocalDate date;
-  private Date dateTime;
-  private UUID uuid;
+  private LocalDate _date;
+  private Date _dateTime;
+  private UUID _uuid;
   private String password;
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   /**
    * minimum: 10
    * maximum: 100
    **/
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -53,12 +53,12 @@ public FormatTest integer(Integer integer) {
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
    @Min(10) @Max(100)public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   @JsonProperty("integer")
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   /**
@@ -166,8 +166,8 @@ public void setDouble(Double _double) {
 
   /**
    **/
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -175,12 +175,12 @@ public FormatTest string(String string) {
   @ApiModelProperty(value = "")
   @JsonProperty("string")
    @Pattern(regexp="/[a-z]/i")public String getString() {
-    return string;
+    return _string;
   }
 
   @JsonProperty("string")
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   /**
@@ -223,8 +223,8 @@ public void setBinary(File binary) {
 
   /**
    **/
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
@@ -232,18 +232,18 @@ public FormatTest date(LocalDate date) {
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   @NotNull public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   @JsonProperty("date")
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
   /**
    **/
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -251,18 +251,18 @@ public FormatTest dateTime(Date dateTime) {
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -270,12 +270,12 @@ public FormatTest uuid(UUID uuid) {
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
@@ -299,8 +299,8 @@ public void setPassword(String password) {
 
   /**
    **/
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
@@ -308,12 +308,12 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   @Valid public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
   @JsonProperty("BigDecimal")
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -326,25 +326,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -352,20 +352,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 58313ebe02ea..ebf93fe7ad27 100644
--- a/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-interface/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -23,14 +23,14 @@
 @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
-  private UUID uuid;
-  private Date dateTime;
-  private @Valid Map<String, Animal> map = new HashMap<>();
+  private UUID _uuid;
+  private Date _dateTime;
+  private @Valid Map<String, Animal> _map = new HashMap<>();
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -38,18 +38,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -57,18 +57,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
@@ -76,26 +76,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   @Valid public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   @JsonProperty("map")
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
 
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(String key) {
-    if (this.map != null) {
-      this.map.remove(key);
+    if (this._map != null) {
+      this._map.remove(key);
     }
 
     return this;
@@ -110,14 +110,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -125,9 +125,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java
index 5f9871eb20f3..cb62572ad602 100644
--- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/api/FakeApi.java
@@ -129,7 +129,7 @@ public Response testClientModel(@Valid @NotNull Client body) {
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class)
     })
-    public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  Date dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
+    public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer _integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate _date,@FormParam(value = "dateTime")  Date _dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
         return Response.ok().entity("magic!").build();
     }
 
diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java
index 38e40e47e681..a8a96f584ca7 100644
--- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/FormatTest.java
@@ -25,36 +25,36 @@
 @JsonTypeName("format_test")
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest  implements Serializable {
-  private Integer integer;
+  private Integer _integer;
   private Integer int32;
   private Long int64;
   private BigDecimal number;
   private Float _float;
   private Double _double;
-  private String string;
+  private String _string;
   private byte[] _byte;
   private File binary;
-  private LocalDate date;
-  private Date dateTime;
-  private UUID uuid;
+  private LocalDate _date;
+  private Date _dateTime;
+  private UUID _uuid;
   private String password;
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   protected FormatTest(FormatTestBuilder<?, ?> b) {
-    this.integer = b.integer;
+    this._integer = b._integer;
     this.int32 = b.int32;
     this.int64 = b.int64;
     this.number = b.number;
     this._float = b._float;
     this._double = b._double;
-    this.string = b.string;
+    this._string = b._string;
     this._byte = b._byte;
     this.binary = b.binary;
-    this.date = b.date;
-    this.dateTime = b.dateTime;
-    this.uuid = b.uuid;
+    this._date = b._date;
+    this._dateTime = b._dateTime;
+    this._uuid = b._uuid;
     this.password = b.password;
-    this.bigDecimal = b.bigDecimal;
+    this._bigDecimal = b._bigDecimal;
   }
 
   public FormatTest() {
@@ -64,8 +64,8 @@ public FormatTest() {
    * minimum: 10
    * maximum: 100
    **/
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -73,12 +73,12 @@ public FormatTest integer(Integer integer) {
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
    @Min(10) @Max(100)public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   @JsonProperty("integer")
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   /**
@@ -186,8 +186,8 @@ public void setDouble(Double _double) {
 
   /**
    **/
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -195,12 +195,12 @@ public FormatTest string(String string) {
   @ApiModelProperty(value = "")
   @JsonProperty("string")
    @Pattern(regexp="/[a-z]/i")public String getString() {
-    return string;
+    return _string;
   }
 
   @JsonProperty("string")
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   /**
@@ -243,8 +243,8 @@ public void setBinary(File binary) {
 
   /**
    **/
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
@@ -252,18 +252,18 @@ public FormatTest date(LocalDate date) {
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   @NotNull public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   @JsonProperty("date")
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
   /**
    **/
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -271,18 +271,18 @@ public FormatTest dateTime(Date dateTime) {
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -290,12 +290,12 @@ public FormatTest uuid(UUID uuid) {
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
@@ -319,8 +319,8 @@ public void setPassword(String password) {
 
   /**
    **/
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
@@ -328,12 +328,12 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   @Valid public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
   @JsonProperty("BigDecimal")
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -346,25 +346,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -372,20 +372,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -420,26 +420,26 @@ public FormatTest build() {
   }
 
   public static abstract class FormatTestBuilder<C extends FormatTest, B extends FormatTestBuilder<C, B>>  {
-    private Integer integer;
+    private Integer _integer;
     private Integer int32;
     private Long int64;
     private BigDecimal number;
     private Float _float;
     private Double _double;
-    private String string;
+    private String _string;
     private byte[] _byte;
     private File binary;
-    private LocalDate date;
-    private Date dateTime;
-    private UUID uuid;
+    private LocalDate _date;
+    private Date _dateTime;
+    private UUID _uuid;
     private String password;
-    private BigDecimal bigDecimal;
+    private BigDecimal _bigDecimal;
     protected abstract B self();
 
     public abstract C build();
 
-    public B integer(Integer integer) {
-      this.integer = integer;
+    public B _integer(Integer _integer) {
+      this._integer = _integer;
       return self();
     }
     public B int32(Integer int32) {
@@ -462,8 +462,8 @@ public B _double(Double _double) {
       this._double = _double;
       return self();
     }
-    public B string(String string) {
-      this.string = string;
+    public B _string(String _string) {
+      this._string = _string;
       return self();
     }
     public B _byte(byte[] _byte) {
@@ -474,24 +474,24 @@ public B binary(File binary) {
       this.binary = binary;
       return self();
     }
-    public B date(LocalDate date) {
-      this.date = date;
+    public B _date(LocalDate _date) {
+      this._date = _date;
       return self();
     }
-    public B dateTime(Date dateTime) {
-      this.dateTime = dateTime;
+    public B _dateTime(Date _dateTime) {
+      this._dateTime = _dateTime;
       return self();
     }
-    public B uuid(UUID uuid) {
-      this.uuid = uuid;
+    public B _uuid(UUID _uuid) {
+      this._uuid = _uuid;
       return self();
     }
     public B password(String password) {
       this.password = password;
       return self();
     }
-    public B bigDecimal(BigDecimal bigDecimal) {
-      this.bigDecimal = bigDecimal;
+    public B _bigDecimal(BigDecimal _bigDecimal) {
+      this._bigDecimal = _bigDecimal;
       return self();
     }
   }
diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b49c92c145de..20bd79295905 100644
--- a/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-jakarta/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -23,14 +23,14 @@
 @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass")
 @jakarta.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
-  private UUID uuid;
-  private Date dateTime;
-  private @Valid Map<String, Animal> map = new HashMap<>();
+  private UUID _uuid;
+  private Date _dateTime;
+  private @Valid Map<String, Animal> _map = new HashMap<>();
 
   protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder<?, ?> b) {
-    this.uuid = b.uuid;
-    this.dateTime = b.dateTime;
-    this.map = b.map;
+    this._uuid = b._uuid;
+    this._dateTime = b._dateTime;
+    this._map = b._map;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
@@ -38,8 +38,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -47,18 +47,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -66,18 +66,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
@@ -85,26 +85,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   @Valid public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   @JsonProperty("map")
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
 
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(String key) {
-    if (this.map != null) {
-      this.map.remove(key);
+    if (this._map != null) {
+      this._map.remove(key);
     }
 
     return this;
@@ -119,14 +119,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -134,9 +134,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -171,23 +171,23 @@ public MixedPropertiesAndAdditionalPropertiesClass build() {
   }
 
   public static abstract class MixedPropertiesAndAdditionalPropertiesClassBuilder<C extends MixedPropertiesAndAdditionalPropertiesClass, B extends MixedPropertiesAndAdditionalPropertiesClassBuilder<C, B>>  {
-    private UUID uuid;
-    private Date dateTime;
-    private Map<String, Animal> map = new HashMap<>();
+    private UUID _uuid;
+    private Date _dateTime;
+    private Map<String, Animal> _map = new HashMap<>();
     protected abstract B self();
 
     public abstract C build();
 
-    public B uuid(UUID uuid) {
-      this.uuid = uuid;
+    public B _uuid(UUID _uuid) {
+      this._uuid = _uuid;
       return self();
     }
-    public B dateTime(Date dateTime) {
-      this.dateTime = dateTime;
+    public B _dateTime(Date _dateTime) {
+      this._dateTime = _dateTime;
       return self();
     }
-    public B map(Map<String, Animal> map) {
-      this.map = map;
+    public B _map(Map<String, Animal> _map) {
+      this._map = _map;
       return self();
     }
   }
diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/FakeApi.java
index 8975c10eab8f..ef6031bb8d20 100644
--- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/api/FakeApi.java
@@ -203,7 +203,7 @@ public Response testClientModel(@Valid @NotNull Client body) {
                 
             })
         })
-    public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  LocalDateTime dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
+    public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer _integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate _date,@FormParam(value = "dateTime")  LocalDateTime _dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
         return Response.ok().entity("magic!").build();
     }
 
diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java
index 844cb59e6b1a..a036ba718a84 100644
--- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/FormatTest.java
@@ -23,36 +23,36 @@
 @JsonTypeName("format_test")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest  implements Serializable {
-  private Integer integer;
+  private Integer _integer;
   private Integer int32;
   private Long int64;
   private BigDecimal number;
   private Float _float;
   private Double _double;
-  private String string;
+  private String _string;
   private byte[] _byte;
   private File binary;
-  private LocalDate date;
-  private LocalDateTime dateTime;
-  private UUID uuid;
+  private LocalDate _date;
+  private LocalDateTime _dateTime;
+  private UUID _uuid;
   private String password;
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   protected FormatTest(FormatTestBuilder<?, ?> b) {
-    this.integer = b.integer;
+    this._integer = b._integer;
     this.int32 = b.int32;
     this.int64 = b.int64;
     this.number = b.number;
     this._float = b._float;
     this._double = b._double;
-    this.string = b.string;
+    this._string = b._string;
     this._byte = b._byte;
     this.binary = b.binary;
-    this.date = b.date;
-    this.dateTime = b.dateTime;
-    this.uuid = b.uuid;
+    this._date = b._date;
+    this._dateTime = b._dateTime;
+    this._uuid = b._uuid;
     this.password = b.password;
-    this.bigDecimal = b.bigDecimal;
+    this._bigDecimal = b._bigDecimal;
   }
 
   public FormatTest() {
@@ -62,8 +62,8 @@ public FormatTest() {
    * minimum: 10
    * maximum: 100
    **/
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -71,12 +71,12 @@ public FormatTest integer(Integer integer) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("integer")
    @Min(10) @Max(100)public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   @JsonProperty("integer")
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   /**
@@ -184,8 +184,8 @@ public void setDouble(Double _double) {
 
   /**
    **/
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -193,12 +193,12 @@ public FormatTest string(String string) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("string")
    @Pattern(regexp="/[a-z]/i")public String getString() {
-    return string;
+    return _string;
   }
 
   @JsonProperty("string")
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   /**
@@ -241,8 +241,8 @@ public void setBinary(File binary) {
 
   /**
    **/
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
@@ -250,18 +250,18 @@ public FormatTest date(LocalDate date) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "")
   @JsonProperty("date")
   @NotNull public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   @JsonProperty("date")
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
   /**
    **/
-  public FormatTest dateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -269,18 +269,18 @@ public FormatTest dateTime(LocalDateTime dateTime) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("dateTime")
   public LocalDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -288,12 +288,12 @@ public FormatTest uuid(UUID uuid) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
@@ -317,8 +317,8 @@ public void setPassword(String password) {
 
   /**
    **/
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
@@ -326,12 +326,12 @@ public FormatTest bigDecimal(BigDecimal bigDecimal) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("BigDecimal")
   @Valid public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
   @JsonProperty("BigDecimal")
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -344,25 +344,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -370,20 +370,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -418,26 +418,26 @@ public FormatTest build() {
   }
 
   public static abstract class FormatTestBuilder<C extends FormatTest, B extends FormatTestBuilder<C, B>>  {
-    private Integer integer;
+    private Integer _integer;
     private Integer int32;
     private Long int64;
     private BigDecimal number;
     private Float _float;
     private Double _double;
-    private String string;
+    private String _string;
     private byte[] _byte;
     private File binary;
-    private LocalDate date;
-    private LocalDateTime dateTime;
-    private UUID uuid;
+    private LocalDate _date;
+    private LocalDateTime _dateTime;
+    private UUID _uuid;
     private String password;
-    private BigDecimal bigDecimal;
+    private BigDecimal _bigDecimal;
     protected abstract B self();
 
     public abstract C build();
 
-    public B integer(Integer integer) {
-      this.integer = integer;
+    public B _integer(Integer _integer) {
+      this._integer = _integer;
       return self();
     }
     public B int32(Integer int32) {
@@ -460,8 +460,8 @@ public B _double(Double _double) {
       this._double = _double;
       return self();
     }
-    public B string(String string) {
-      this.string = string;
+    public B _string(String _string) {
+      this._string = _string;
       return self();
     }
     public B _byte(byte[] _byte) {
@@ -472,24 +472,24 @@ public B binary(File binary) {
       this.binary = binary;
       return self();
     }
-    public B date(LocalDate date) {
-      this.date = date;
+    public B _date(LocalDate _date) {
+      this._date = _date;
       return self();
     }
-    public B dateTime(LocalDateTime dateTime) {
-      this.dateTime = dateTime;
+    public B _dateTime(LocalDateTime _dateTime) {
+      this._dateTime = _dateTime;
       return self();
     }
-    public B uuid(UUID uuid) {
-      this.uuid = uuid;
+    public B _uuid(UUID _uuid) {
+      this._uuid = _uuid;
       return self();
     }
     public B password(String password) {
       this.password = password;
       return self();
     }
-    public B bigDecimal(BigDecimal bigDecimal) {
-      this.bigDecimal = bigDecimal;
+    public B _bigDecimal(BigDecimal _bigDecimal) {
+      this._bigDecimal = _bigDecimal;
       return self();
     }
   }
diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 5687b4d15941..3c7b5ec2408d 100644
--- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -21,14 +21,14 @@
 @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
-  private UUID uuid;
-  private LocalDateTime dateTime;
-  private @Valid Map<String, Animal> map = new HashMap<>();
+  private UUID _uuid;
+  private LocalDateTime _dateTime;
+  private @Valid Map<String, Animal> _map = new HashMap<>();
 
   protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder<?, ?> b) {
-    this.uuid = b.uuid;
-    this.dateTime = b.dateTime;
-    this.map = b.map;
+    this._uuid = b._uuid;
+    this._dateTime = b._dateTime;
+    this._map = b._map;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
@@ -36,8 +36,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -45,18 +45,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -64,18 +64,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTi
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("dateTime")
   public LocalDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
@@ -83,26 +83,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("map")
   @Valid public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   @JsonProperty("map")
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
 
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(String key) {
-    if (this.map != null) {
-      this.map.remove(key);
+    if (this._map != null) {
+      this._map.remove(key);
     }
 
     return this;
@@ -117,14 +117,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -132,9 +132,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -169,23 +169,23 @@ public MixedPropertiesAndAdditionalPropertiesClass build() {
   }
 
   public static abstract class MixedPropertiesAndAdditionalPropertiesClassBuilder<C extends MixedPropertiesAndAdditionalPropertiesClass, B extends MixedPropertiesAndAdditionalPropertiesClassBuilder<C, B>>  {
-    private UUID uuid;
-    private LocalDateTime dateTime;
-    private Map<String, Animal> map = new HashMap<>();
+    private UUID _uuid;
+    private LocalDateTime _dateTime;
+    private Map<String, Animal> _map = new HashMap<>();
     protected abstract B self();
 
     public abstract C build();
 
-    public B uuid(UUID uuid) {
-      this.uuid = uuid;
+    public B _uuid(UUID _uuid) {
+      this._uuid = _uuid;
       return self();
     }
-    public B dateTime(LocalDateTime dateTime) {
-      this.dateTime = dateTime;
+    public B _dateTime(LocalDateTime _dateTime) {
+      this._dateTime = _dateTime;
       return self();
     }
-    public B map(Map<String, Animal> map) {
-      this.map = map;
+    public B _map(Map<String, Animal> _map) {
+      this._map = _map;
       return self();
     }
   }
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java
index 91f474680edd..08f1295659e9 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/api/FakeApi.java
@@ -296,7 +296,7 @@ public Response testClientModel(@Valid @NotNull Client client) {
                 
             })
         })
-    public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  LocalDateTime dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
+    public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer _integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate _date,@FormParam(value = "dateTime")  LocalDateTime _dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
         return Response.ok().entity("magic!").build();
     }
 
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
index 66dfd8271ab2..2c176f8f7edd 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
@@ -18,10 +18,10 @@
 @JsonTypeName("_foo_get_default_response")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse  implements Serializable {
-  private Foo string;
+  private Foo _string;
 
   protected FooGetDefaultResponse(FooGetDefaultResponseBuilder<?, ?> b) {
-    this.string = b.string;
+    this._string = b._string;
   }
 
   public FooGetDefaultResponse() {
@@ -29,8 +29,8 @@ public FooGetDefaultResponse() {
 
   /**
    **/
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
@@ -38,12 +38,12 @@ public FooGetDefaultResponse string(Foo string) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("string")
   @Valid public Foo getString() {
-    return string;
+    return _string;
   }
 
   @JsonProperty("string")
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -56,12 +56,12 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
@@ -69,7 +69,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -104,13 +104,13 @@ public FooGetDefaultResponse build() {
   }
 
   public static abstract class FooGetDefaultResponseBuilder<C extends FooGetDefaultResponse, B extends FooGetDefaultResponseBuilder<C, B>>  {
-    private Foo string;
+    private Foo _string;
     protected abstract B self();
 
     public abstract C build();
 
-    public B string(Foo string) {
-      this.string = string;
+    public B _string(Foo _string) {
+      this._string = _string;
       return self();
     }
   }
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FormatTest.java
index 433825c25a8d..59619a5ab3ce 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/FormatTest.java
@@ -23,37 +23,37 @@
 @JsonTypeName("format_test")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest  implements Serializable {
-  private Integer integer;
+  private Integer _integer;
   private Integer int32;
   private Long int64;
   private BigDecimal number;
   private Float _float;
   private Double _double;
   private BigDecimal decimal;
-  private String string;
+  private String _string;
   private byte[] _byte;
   private File binary;
-  private LocalDate date;
-  private LocalDateTime dateTime;
-  private UUID uuid;
+  private LocalDate _date;
+  private LocalDateTime _dateTime;
+  private UUID _uuid;
   private String password;
   private String patternWithDigits;
   private String patternWithDigitsAndDelimiter;
 
   protected FormatTest(FormatTestBuilder<?, ?> b) {
-    this.integer = b.integer;
+    this._integer = b._integer;
     this.int32 = b.int32;
     this.int64 = b.int64;
     this.number = b.number;
     this._float = b._float;
     this._double = b._double;
     this.decimal = b.decimal;
-    this.string = b.string;
+    this._string = b._string;
     this._byte = b._byte;
     this.binary = b.binary;
-    this.date = b.date;
-    this.dateTime = b.dateTime;
-    this.uuid = b.uuid;
+    this._date = b._date;
+    this._dateTime = b._dateTime;
+    this._uuid = b._uuid;
     this.password = b.password;
     this.patternWithDigits = b.patternWithDigits;
     this.patternWithDigitsAndDelimiter = b.patternWithDigitsAndDelimiter;
@@ -66,8 +66,8 @@ public FormatTest() {
    * minimum: 10
    * maximum: 100
    **/
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -75,12 +75,12 @@ public FormatTest integer(Integer integer) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("integer")
    @Min(10) @Max(100)public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   @JsonProperty("integer")
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   /**
@@ -207,8 +207,8 @@ public void setDecimal(BigDecimal decimal) {
 
   /**
    **/
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -216,12 +216,12 @@ public FormatTest string(String string) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("string")
    @Pattern(regexp="/[a-z]/i")public String getString() {
-    return string;
+    return _string;
   }
 
   @JsonProperty("string")
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   /**
@@ -264,8 +264,8 @@ public void setBinary(File binary) {
 
   /**
    **/
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
@@ -273,18 +273,18 @@ public FormatTest date(LocalDate date) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(required = true, description = "")
   @JsonProperty("date")
   @NotNull public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   @JsonProperty("date")
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
   /**
    **/
-  public FormatTest dateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -292,18 +292,18 @@ public FormatTest dateTime(LocalDateTime dateTime) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("dateTime")
   public LocalDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -311,12 +311,12 @@ public FormatTest uuid(UUID uuid) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
@@ -388,19 +388,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -408,7 +408,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
@@ -416,19 +416,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
@@ -466,19 +466,19 @@ public FormatTest build() {
   }
 
   public static abstract class FormatTestBuilder<C extends FormatTest, B extends FormatTestBuilder<C, B>>  {
-    private Integer integer;
+    private Integer _integer;
     private Integer int32;
     private Long int64;
     private BigDecimal number;
     private Float _float;
     private Double _double;
     private BigDecimal decimal;
-    private String string;
+    private String _string;
     private byte[] _byte;
     private File binary;
-    private LocalDate date;
-    private LocalDateTime dateTime;
-    private UUID uuid;
+    private LocalDate _date;
+    private LocalDateTime _dateTime;
+    private UUID _uuid;
     private String password;
     private String patternWithDigits;
     private String patternWithDigitsAndDelimiter;
@@ -486,8 +486,8 @@ public static abstract class FormatTestBuilder<C extends FormatTest, B extends F
 
     public abstract C build();
 
-    public B integer(Integer integer) {
-      this.integer = integer;
+    public B _integer(Integer _integer) {
+      this._integer = _integer;
       return self();
     }
     public B int32(Integer int32) {
@@ -514,8 +514,8 @@ public B decimal(BigDecimal decimal) {
       this.decimal = decimal;
       return self();
     }
-    public B string(String string) {
-      this.string = string;
+    public B _string(String _string) {
+      this._string = _string;
       return self();
     }
     public B _byte(byte[] _byte) {
@@ -526,16 +526,16 @@ public B binary(File binary) {
       this.binary = binary;
       return self();
     }
-    public B date(LocalDate date) {
-      this.date = date;
+    public B _date(LocalDate _date) {
+      this._date = _date;
       return self();
     }
-    public B dateTime(LocalDateTime dateTime) {
-      this.dateTime = dateTime;
+    public B _dateTime(LocalDateTime _dateTime) {
+      this._dateTime = _dateTime;
       return self();
     }
-    public B uuid(UUID uuid) {
-      this.uuid = uuid;
+    public B _uuid(UUID _uuid) {
+      this._uuid = _uuid;
       return self();
     }
     public B password(String password) {
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 5687b4d15941..3c7b5ec2408d 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -21,14 +21,14 @@
 @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
-  private UUID uuid;
-  private LocalDateTime dateTime;
-  private @Valid Map<String, Animal> map = new HashMap<>();
+  private UUID _uuid;
+  private LocalDateTime _dateTime;
+  private @Valid Map<String, Animal> _map = new HashMap<>();
 
   protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder<?, ?> b) {
-    this.uuid = b.uuid;
-    this.dateTime = b.dateTime;
-    this.map = b.map;
+    this._uuid = b._uuid;
+    this._dateTime = b._dateTime;
+    this._map = b._map;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
@@ -36,8 +36,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -45,18 +45,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -64,18 +64,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(LocalDateTime dateTi
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("dateTime")
   public LocalDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(LocalDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(LocalDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
@@ -83,26 +83,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("map")
   @Valid public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   @JsonProperty("map")
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
 
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(String key) {
-    if (this.map != null) {
-      this.map.remove(key);
+    if (this._map != null) {
+      this._map.remove(key);
     }
 
     return this;
@@ -117,14 +117,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -132,9 +132,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -169,23 +169,23 @@ public MixedPropertiesAndAdditionalPropertiesClass build() {
   }
 
   public static abstract class MixedPropertiesAndAdditionalPropertiesClassBuilder<C extends MixedPropertiesAndAdditionalPropertiesClass, B extends MixedPropertiesAndAdditionalPropertiesClassBuilder<C, B>>  {
-    private UUID uuid;
-    private LocalDateTime dateTime;
-    private Map<String, Animal> map = new HashMap<>();
+    private UUID _uuid;
+    private LocalDateTime _dateTime;
+    private Map<String, Animal> _map = new HashMap<>();
     protected abstract B self();
 
     public abstract C build();
 
-    public B uuid(UUID uuid) {
-      this.uuid = uuid;
+    public B _uuid(UUID _uuid) {
+      this._uuid = _uuid;
       return self();
     }
-    public B dateTime(LocalDateTime dateTime) {
-      this.dateTime = dateTime;
+    public B _dateTime(LocalDateTime _dateTime) {
+      this._dateTime = _dateTime;
       return self();
     }
-    public B map(Map<String, Animal> map) {
-      this.map = map;
+    public B _map(Map<String, Animal> _map) {
+      this._map = _map;
       return self();
     }
   }
diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
index 1e3c2e3f58fa..53b434a13ba2 100644
--- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
+++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
@@ -21,13 +21,13 @@
 @JsonTypeName("ObjectWithDeprecatedFields")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields  implements Serializable {
-  private String uuid;
+  private String _uuid;
   private BigDecimal id;
   private DeprecatedObject deprecatedRef;
   private @Valid List<String> bars = new ArrayList<>();
 
   protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder<?, ?> b) {
-    this.uuid = b.uuid;
+    this._uuid = b._uuid;
     this.id = b.id;
     this.deprecatedRef = b.deprecatedRef;
     this.bars = b.bars;
@@ -38,8 +38,8 @@ public ObjectWithDeprecatedFields() {
 
   /**
    **/
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -47,12 +47,12 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
   @org.eclipse.microprofile.openapi.annotations.media.Schema(description = "")
   @JsonProperty("uuid")
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
@@ -138,7 +138,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -146,7 +146,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
@@ -154,7 +154,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
@@ -192,7 +192,7 @@ public ObjectWithDeprecatedFields build() {
   }
 
   public static abstract class ObjectWithDeprecatedFieldsBuilder<C extends ObjectWithDeprecatedFields, B extends ObjectWithDeprecatedFieldsBuilder<C, B>>  {
-    private String uuid;
+    private String _uuid;
     private BigDecimal id;
     private DeprecatedObject deprecatedRef;
     private List<String> bars = new ArrayList<>();
@@ -200,8 +200,8 @@ public static abstract class ObjectWithDeprecatedFieldsBuilder<C extends ObjectW
 
     public abstract C build();
 
-    public B uuid(String uuid) {
-      this.uuid = uuid;
+    public B _uuid(String _uuid) {
+      this._uuid = _uuid;
       return self();
     }
     public B id(BigDecimal id) {
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
index ca07676f1286..f5d1ff276326 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/api/FakeApi.java
@@ -210,7 +210,7 @@ public Response testClientModel(@Valid @NotNull Client client) {
         @ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @ApiResponse(code = 404, message = "User not found", response = Void.class)
     })
-    public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate date,@FormParam(value = "dateTime")  Date dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
+    public Response testEndpointParameters(@FormParam(value = "number")  BigDecimal number,@FormParam(value = "double")  Double _double,@FormParam(value = "pattern_without_delimiter")  String patternWithoutDelimiter,@FormParam(value = "byte")  byte[] _byte,@FormParam(value = "integer")  Integer _integer,@FormParam(value = "int32")  Integer int32,@FormParam(value = "int64")  Long int64,@FormParam(value = "float")  Float _float,@FormParam(value = "string")  String _string, @FormParam(value = "binary") InputStream binaryInputStream,@FormParam(value = "date")  LocalDate _date,@FormParam(value = "dateTime")  Date _dateTime,@FormParam(value = "password")  String password,@FormParam(value = "callback")  String paramCallback) {
         return Response.ok().entity("magic!").build();
     }
 
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
index 9d84983dc1fb..33e6486e3dd6 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
@@ -20,10 +20,10 @@
 @JsonTypeName("_foo_get_default_response")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FooGetDefaultResponse  implements Serializable {
-  private Foo string;
+  private Foo _string;
 
   protected FooGetDefaultResponse(FooGetDefaultResponseBuilder<?, ?> b) {
-    this.string = b.string;
+    this._string = b._string;
   }
 
   public FooGetDefaultResponse() {
@@ -31,8 +31,8 @@ public FooGetDefaultResponse() {
 
   /**
    **/
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
@@ -40,12 +40,12 @@ public FooGetDefaultResponse string(Foo string) {
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   @Valid public Foo getString() {
-    return string;
+    return _string;
   }
 
   @JsonProperty("string")
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -58,12 +58,12 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
@@ -71,7 +71,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -106,13 +106,13 @@ public FooGetDefaultResponse build() {
   }
 
   public static abstract class FooGetDefaultResponseBuilder<C extends FooGetDefaultResponse, B extends FooGetDefaultResponseBuilder<C, B>>  {
-    private Foo string;
+    private Foo _string;
     protected abstract B self();
 
     public abstract C build();
 
-    public B string(Foo string) {
-      this.string = string;
+    public B _string(Foo _string) {
+      this._string = _string;
       return self();
     }
   }
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
index 995e623fa962..2230b6781439 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/FormatTest.java
@@ -25,37 +25,37 @@
 @JsonTypeName("format_test")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest  implements Serializable {
-  private Integer integer;
+  private Integer _integer;
   private Integer int32;
   private Long int64;
   private BigDecimal number;
   private Float _float;
   private Double _double;
   private BigDecimal decimal;
-  private String string;
+  private String _string;
   private byte[] _byte;
   private File binary;
-  private LocalDate date;
-  private Date dateTime;
-  private UUID uuid;
+  private LocalDate _date;
+  private Date _dateTime;
+  private UUID _uuid;
   private String password;
   private String patternWithDigits;
   private String patternWithDigitsAndDelimiter;
 
   protected FormatTest(FormatTestBuilder<?, ?> b) {
-    this.integer = b.integer;
+    this._integer = b._integer;
     this.int32 = b.int32;
     this.int64 = b.int64;
     this.number = b.number;
     this._float = b._float;
     this._double = b._double;
     this.decimal = b.decimal;
-    this.string = b.string;
+    this._string = b._string;
     this._byte = b._byte;
     this.binary = b.binary;
-    this.date = b.date;
-    this.dateTime = b.dateTime;
-    this.uuid = b.uuid;
+    this._date = b._date;
+    this._dateTime = b._dateTime;
+    this._uuid = b._uuid;
     this.password = b.password;
     this.patternWithDigits = b.patternWithDigits;
     this.patternWithDigitsAndDelimiter = b.patternWithDigitsAndDelimiter;
@@ -68,8 +68,8 @@ public FormatTest() {
    * minimum: 10
    * maximum: 100
    **/
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
@@ -77,12 +77,12 @@ public FormatTest integer(Integer integer) {
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
    @Min(10) @Max(100)public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
   @JsonProperty("integer")
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   /**
@@ -209,8 +209,8 @@ public void setDecimal(BigDecimal decimal) {
 
   /**
    **/
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
@@ -218,12 +218,12 @@ public FormatTest string(String string) {
   @ApiModelProperty(value = "")
   @JsonProperty("string")
    @Pattern(regexp="/[a-z]/i")public String getString() {
-    return string;
+    return _string;
   }
 
   @JsonProperty("string")
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   /**
@@ -266,8 +266,8 @@ public void setBinary(File binary) {
 
   /**
    **/
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
@@ -275,18 +275,18 @@ public FormatTest date(LocalDate date) {
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   @NotNull public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
   @JsonProperty("date")
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
   /**
    **/
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -294,18 +294,18 @@ public FormatTest dateTime(Date dateTime) {
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -313,12 +313,12 @@ public FormatTest uuid(UUID uuid) {
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
@@ -390,19 +390,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -410,7 +410,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
@@ -418,19 +418,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
@@ -468,19 +468,19 @@ public FormatTest build() {
   }
 
   public static abstract class FormatTestBuilder<C extends FormatTest, B extends FormatTestBuilder<C, B>>  {
-    private Integer integer;
+    private Integer _integer;
     private Integer int32;
     private Long int64;
     private BigDecimal number;
     private Float _float;
     private Double _double;
     private BigDecimal decimal;
-    private String string;
+    private String _string;
     private byte[] _byte;
     private File binary;
-    private LocalDate date;
-    private Date dateTime;
-    private UUID uuid;
+    private LocalDate _date;
+    private Date _dateTime;
+    private UUID _uuid;
     private String password;
     private String patternWithDigits;
     private String patternWithDigitsAndDelimiter;
@@ -488,8 +488,8 @@ public static abstract class FormatTestBuilder<C extends FormatTest, B extends F
 
     public abstract C build();
 
-    public B integer(Integer integer) {
-      this.integer = integer;
+    public B _integer(Integer _integer) {
+      this._integer = _integer;
       return self();
     }
     public B int32(Integer int32) {
@@ -516,8 +516,8 @@ public B decimal(BigDecimal decimal) {
       this.decimal = decimal;
       return self();
     }
-    public B string(String string) {
-      this.string = string;
+    public B _string(String _string) {
+      this._string = _string;
       return self();
     }
     public B _byte(byte[] _byte) {
@@ -528,16 +528,16 @@ public B binary(File binary) {
       this.binary = binary;
       return self();
     }
-    public B date(LocalDate date) {
-      this.date = date;
+    public B _date(LocalDate _date) {
+      this._date = _date;
       return self();
     }
-    public B dateTime(Date dateTime) {
-      this.dateTime = dateTime;
+    public B _dateTime(Date _dateTime) {
+      this._dateTime = _dateTime;
       return self();
     }
-    public B uuid(UUID uuid) {
-      this.uuid = uuid;
+    public B _uuid(UUID _uuid) {
+      this._uuid = _uuid;
       return self();
     }
     public B password(String password) {
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 18f7c56cba4d..59e400f1d408 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -23,14 +23,14 @@
 @JsonTypeName("MixedPropertiesAndAdditionalPropertiesClass")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass  implements Serializable {
-  private UUID uuid;
-  private Date dateTime;
-  private @Valid Map<String, Animal> map = new HashMap<>();
+  private UUID _uuid;
+  private Date _dateTime;
+  private @Valid Map<String, Animal> _map = new HashMap<>();
 
   protected MixedPropertiesAndAdditionalPropertiesClass(MixedPropertiesAndAdditionalPropertiesClassBuilder<?, ?> b) {
-    this.uuid = b.uuid;
-    this.dateTime = b.dateTime;
-    this.map = b.map;
+    this._uuid = b._uuid;
+    this._dateTime = b._dateTime;
+    this._map = b._map;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
@@ -38,8 +38,8 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -47,18 +47,18 @@ public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
@@ -66,18 +66,18 @@ public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
   @JsonProperty("dateTime")
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
   /**
    **/
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
@@ -85,26 +85,26 @@ public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map)
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   @Valid public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
   @JsonProperty("map")
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
 
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   public MixedPropertiesAndAdditionalPropertiesClass removeMapItem(String key) {
-    if (this.map != null) {
-      this.map.remove(key);
+    if (this._map != null) {
+      this._map.remove(key);
     }
 
     return this;
@@ -119,14 +119,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -134,9 +134,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -171,23 +171,23 @@ public MixedPropertiesAndAdditionalPropertiesClass build() {
   }
 
   public static abstract class MixedPropertiesAndAdditionalPropertiesClassBuilder<C extends MixedPropertiesAndAdditionalPropertiesClass, B extends MixedPropertiesAndAdditionalPropertiesClassBuilder<C, B>>  {
-    private UUID uuid;
-    private Date dateTime;
-    private Map<String, Animal> map = new HashMap<>();
+    private UUID _uuid;
+    private Date _dateTime;
+    private Map<String, Animal> _map = new HashMap<>();
     protected abstract B self();
 
     public abstract C build();
 
-    public B uuid(UUID uuid) {
-      this.uuid = uuid;
+    public B _uuid(UUID _uuid) {
+      this._uuid = _uuid;
       return self();
     }
-    public B dateTime(Date dateTime) {
-      this.dateTime = dateTime;
+    public B _dateTime(Date _dateTime) {
+      this._dateTime = _dateTime;
       return self();
     }
-    public B map(Map<String, Animal> map) {
-      this.map = map;
+    public B _map(Map<String, Animal> _map) {
+      this._map = _map;
       return self();
     }
   }
diff --git a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
index 250066a2e4fb..78e54a0ee889 100644
--- a/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
+++ b/samples/server/petstore/jaxrs-spec/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
@@ -23,13 +23,13 @@
 @JsonTypeName("ObjectWithDeprecatedFields")
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class ObjectWithDeprecatedFields  implements Serializable {
-  private String uuid;
+  private String _uuid;
   private BigDecimal id;
   private DeprecatedObject deprecatedRef;
   private @Valid List<String> bars = new ArrayList<>();
 
   protected ObjectWithDeprecatedFields(ObjectWithDeprecatedFieldsBuilder<?, ?> b) {
-    this.uuid = b.uuid;
+    this._uuid = b._uuid;
     this.id = b.id;
     this.deprecatedRef = b.deprecatedRef;
     this.bars = b.bars;
@@ -40,8 +40,8 @@ public ObjectWithDeprecatedFields() {
 
   /**
    **/
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
@@ -49,12 +49,12 @@ public ObjectWithDeprecatedFields uuid(String uuid) {
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
   @JsonProperty("uuid")
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   /**
@@ -140,7 +140,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -148,7 +148,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
@@ -156,7 +156,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
@@ -194,7 +194,7 @@ public ObjectWithDeprecatedFields build() {
   }
 
   public static abstract class ObjectWithDeprecatedFieldsBuilder<C extends ObjectWithDeprecatedFields, B extends ObjectWithDeprecatedFieldsBuilder<C, B>>  {
-    private String uuid;
+    private String _uuid;
     private BigDecimal id;
     private DeprecatedObject deprecatedRef;
     private List<String> bars = new ArrayList<>();
@@ -202,8 +202,8 @@ public static abstract class ObjectWithDeprecatedFieldsBuilder<C extends ObjectW
 
     public abstract C build();
 
-    public B uuid(String uuid) {
-      this.uuid = uuid;
+    public B _uuid(String _uuid) {
+      this._uuid = _uuid;
       return self();
     }
     public B id(BigDecimal id) {
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
index fc792f10d456..67250b383b12 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApi.java
@@ -169,10 +169,10 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class)
     })
-    public Response testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,@ApiParam(value = "None")  @FormParam("integer")  Integer integer,@ApiParam(value = "None")  @FormParam("int32")  Integer int32,@ApiParam(value = "None")  @FormParam("int64")  Long int64,@ApiParam(value = "None")  @FormParam("float")  Float _float,@ApiParam(value = "None")  @FormParam("string")  String string,
- @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None")  @FormParam("date")  Date date,@ApiParam(value = "None")  @FormParam("dateTime")  Date dateTime,@ApiParam(value = "None")  @FormParam("password")  String password,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback,@Context SecurityContext securityContext)
+    public Response testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,@ApiParam(value = "None")  @FormParam("integer")  Integer _integer,@ApiParam(value = "None")  @FormParam("int32")  Integer int32,@ApiParam(value = "None")  @FormParam("int64")  Long int64,@ApiParam(value = "None")  @FormParam("float")  Float _float,@ApiParam(value = "None")  @FormParam("string")  String _string,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None")  @FormParam("date")  Date _date,@ApiParam(value = "None")  @FormParam("dateTime")  Date _dateTime,@ApiParam(value = "None")  @FormParam("password")  String password,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
+        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext);
     }
     @javax.ws.rs.GET
     
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
index e86ea2a82624..8dd8b9951d17 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -33,7 +33,7 @@ public abstract class FakeApiService {
     public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException;
-    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,Date _date,Date _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineAdditionalProperties(Map<String, String> param,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java
index 4d36290eca8b..855f9595c194 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/FormatTest.java
@@ -50,7 +50,7 @@
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -74,7 +74,7 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_STRING = "string";
   @JsonProperty(JSON_PROPERTY_STRING)
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   @JsonProperty(JSON_PROPERTY_BYTE)
@@ -86,15 +86,15 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_DATE = "date";
   @JsonProperty(JSON_PROPERTY_DATE)
-  private Date date;
+  private Date _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private Date dateTime;
+  private Date _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -102,28 +102,28 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    **/
   @JsonProperty(value = "integer")
   @ApiModelProperty(value = "")
    @Min(10) @Max(100)
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -234,24 +234,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    **/
   @JsonProperty(value = "string")
   @ApiModelProperty(value = "")
    @Pattern(regexp="/[a-z]/i")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -294,64 +294,64 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(Date date) {
-    this.date = date;
+  public FormatTest _date(Date _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    **/
   @JsonProperty(value = "date")
   @ApiModelProperty(required = true, value = "")
   @NotNull 
   public Date getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(Date date) {
-    this.date = date;
+  public void setDate(Date _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @ApiModelProperty(value = "")
   
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -374,24 +374,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    **/
   @JsonProperty(value = "BigDecimal")
   @ApiModelProperty(value = "")
   @Valid 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -404,25 +404,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Objects.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -430,20 +430,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 4cd16bfb874b..98834fc328e7 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,82 +39,82 @@
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private Date dateTime;
+  private Date _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
   @JsonProperty(JSON_PROPERTY_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(value = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @ApiModelProperty(value = "")
   
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    **/
   @JsonProperty(value = "map")
   @ApiModelProperty(value = "")
   @Valid 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -127,14 +127,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -142,9 +142,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 7eb9b711bb17..7c3e0652cf05 100644
--- a/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2-useTags/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -65,7 +65,7 @@ public Response testClientModel(Client body, SecurityContext securityContext) th
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, Date _date, Date _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
index ee4fad33ccb4..a7428741079e 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApi.java
@@ -170,10 +170,10 @@ public Response testClientModel(@ApiParam(value = "client model", required = tru
         @io.swagger.annotations.ApiResponse(code = 400, message = "Invalid username supplied", response = Void.class),
         @io.swagger.annotations.ApiResponse(code = 404, message = "User not found", response = Void.class)
     })
-    public Response testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,@ApiParam(value = "None")  @FormParam("integer")  Integer integer,@ApiParam(value = "None")  @FormParam("int32")  Integer int32,@ApiParam(value = "None")  @FormParam("int64")  Long int64,@ApiParam(value = "None")  @FormParam("float")  Float _float,@ApiParam(value = "None")  @FormParam("string")  String string,
- @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None")  @FormParam("date")  Date date,@ApiParam(value = "None")  @FormParam("dateTime")  Date dateTime,@ApiParam(value = "None")  @FormParam("password")  String password,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback,@Context SecurityContext securityContext)
+    public Response testEndpointParameters(@ApiParam(value = "None", required=true)  @FormParam("number")  BigDecimal number,@ApiParam(value = "None", required=true)  @FormParam("double")  Double _double,@ApiParam(value = "None", required=true)  @FormParam("pattern_without_delimiter")  String patternWithoutDelimiter,@ApiParam(value = "None", required=true)  @FormParam("byte")  byte[] _byte,@ApiParam(value = "None")  @FormParam("integer")  Integer _integer,@ApiParam(value = "None")  @FormParam("int32")  Integer int32,@ApiParam(value = "None")  @FormParam("int64")  Long int64,@ApiParam(value = "None")  @FormParam("float")  Float _float,@ApiParam(value = "None")  @FormParam("string")  String _string,
+ @FormDataParam("binary") FormDataBodyPart binaryBodypart ,@ApiParam(value = "None")  @FormParam("date")  Date _date,@ApiParam(value = "None")  @FormParam("dateTime")  Date _dateTime,@ApiParam(value = "None")  @FormParam("password")  String password,@ApiParam(value = "None")  @FormParam("callback")  String paramCallback,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
+        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext);
     }
     @javax.ws.rs.GET
     
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
index b90e1f7c7311..d5cdde77c9c5 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -34,7 +34,7 @@ public abstract class FakeApiService {
     public abstract Response testBodyWithFileSchema(FileSchemaTestClass body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testBodyWithQueryParams( @NotNull String query,User body,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testClientModel(Client body,SecurityContext securityContext) throws NotFoundException;
-    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,Date _date,Date _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineAdditionalProperties(Map<String, String> param,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java
index 4d36290eca8b..855f9595c194 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/FormatTest.java
@@ -50,7 +50,7 @@
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -74,7 +74,7 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_STRING = "string";
   @JsonProperty(JSON_PROPERTY_STRING)
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   @JsonProperty(JSON_PROPERTY_BYTE)
@@ -86,15 +86,15 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_DATE = "date";
   @JsonProperty(JSON_PROPERTY_DATE)
-  private Date date;
+  private Date _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private Date dateTime;
+  private Date _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -102,28 +102,28 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_BIG_DECIMAL = "BigDecimal";
   @JsonProperty(JSON_PROPERTY_BIG_DECIMAL)
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    **/
   @JsonProperty(value = "integer")
   @ApiModelProperty(value = "")
    @Min(10) @Max(100)
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -234,24 +234,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    **/
   @JsonProperty(value = "string")
   @ApiModelProperty(value = "")
    @Pattern(regexp="/[a-z]/i")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -294,64 +294,64 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(Date date) {
-    this.date = date;
+  public FormatTest _date(Date _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    **/
   @JsonProperty(value = "date")
   @ApiModelProperty(required = true, value = "")
   @NotNull 
   public Date getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(Date date) {
-    this.date = date;
+  public void setDate(Date _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @ApiModelProperty(value = "")
   
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -374,24 +374,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    **/
   @JsonProperty(value = "BigDecimal")
   @ApiModelProperty(value = "")
   @Valid 
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
 
@@ -404,25 +404,25 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Objects.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, _byte, binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, _byte, binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
@@ -430,20 +430,20 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 4cd16bfb874b..98834fc328e7 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -39,82 +39,82 @@
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private Date dateTime;
+  private Date _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
   @JsonProperty(JSON_PROPERTY_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @ApiModelProperty(value = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @ApiModelProperty(value = "")
   
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    **/
   @JsonProperty(value = "map")
   @ApiModelProperty(value = "")
   @Valid 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -127,14 +127,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -142,9 +142,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 81765288e54d..b44a118bd737 100644
--- a/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey2/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -66,7 +66,7 @@ public Response testClientModel(Client body, SecurityContext securityContext) th
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, Date _date, Date _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApi.java
index c59152531220..948c57530b52 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApi.java
@@ -248,9 +248,9 @@ public Response testClientModel(@Schema(description = "client model", required =
             },security = {
             @SecurityRequirement(name = "http_basic_test")
         }, tags={ "fake", }) 
-    public Response testEndpointParameters(@Schema(description = "None") @QueryParam("number") BigDecimal number,@Schema(description = "None") @QueryParam("double") Double _double,@Schema(description = "None") @QueryParam("pattern_without_delimiter") String patternWithoutDelimiter,@Schema(description = "None") @QueryParam("byte") byte[] _byte,@Schema(description = "None") @QueryParam("integer") Integer integer,@Schema(description = "None") @QueryParam("int32") Integer int32,@Schema(description = "None") @QueryParam("int64") Long int64,@Schema(description = "None") @QueryParam("float") Float _float,@Schema(description = "None") @QueryParam("string") String string,@FormDataParam("binary") FormDataBodyPart binaryBodypart,@Schema(description = "None") @QueryParam("date") Date date,@Schema(description = "None") @QueryParam("dateTime") Date dateTime,@Schema(description = "None") @QueryParam("password") String password,@Schema(description = "None") @QueryParam("callback") String paramCallback,@Context SecurityContext securityContext)
+    public Response testEndpointParameters(@Schema(description = "None") @QueryParam("number") BigDecimal number,@Schema(description = "None") @QueryParam("double") Double _double,@Schema(description = "None") @QueryParam("pattern_without_delimiter") String patternWithoutDelimiter,@Schema(description = "None") @QueryParam("byte") byte[] _byte,@Schema(description = "None") @QueryParam("integer") Integer _integer,@Schema(description = "None") @QueryParam("int32") Integer int32,@Schema(description = "None") @QueryParam("int64") Long int64,@Schema(description = "None") @QueryParam("float") Float _float,@Schema(description = "None") @QueryParam("string") String _string,@FormDataParam("binary") FormDataBodyPart binaryBodypart,@Schema(description = "None") @QueryParam("date") Date _date,@Schema(description = "None") @QueryParam("dateTime") Date _dateTime,@Schema(description = "None") @QueryParam("password") String password,@Schema(description = "None") @QueryParam("callback") String paramCallback,@Context SecurityContext securityContext)
     throws NotFoundException {
-        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binaryBodypart, date, dateTime, password, paramCallback, securityContext);
+        return delegate.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binaryBodypart, _date, _dateTime, password, paramCallback, securityContext);
     }
 
     @jakarta.ws.rs.GET
diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java
index 878268d44555..cead1ceba94b 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/api/FakeApiService.java
@@ -45,7 +45,7 @@ public abstract class FakeApiService {
     public abstract Response testBodyWithFileSchema(FileSchemaTestClass fileSchemaTestClass,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testBodyWithQueryParams( @NotNull String query,User user,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testClientModel(Client client,SecurityContext securityContext) throws NotFoundException;
-    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer integer,Integer int32,Long int64,Float _float,String string,FormDataBodyPart binaryBodypart,Date date,Date dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
+    public abstract Response testEndpointParameters(BigDecimal number,Double _double,String patternWithoutDelimiter,byte[] _byte,Integer _integer,Integer int32,Long int64,Float _float,String _string,FormDataBodyPart binaryBodypart,Date _date,Date _dateTime,String password,String paramCallback,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testEnumParameters(List<String> enumHeaderStringArray,String enumHeaderString,List<String> enumQueryStringArray,String enumQueryString,Integer enumQueryInteger,Double enumQueryDouble,List<EnumClass> enumQueryModelArray,List<String> enumFormStringArray,String enumFormString,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testGroupParameters( @NotNull Integer requiredStringGroup, @NotNull Boolean requiredBooleanGroup, @NotNull Long requiredInt64Group,Integer stringGroup,Boolean booleanGroup,Long int64Group,SecurityContext securityContext) throws NotFoundException;
     public abstract Response testInlineAdditionalProperties(Map<String, String> requestBody,SecurityContext securityContext) throws NotFoundException;
diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
index b8586d396089..797bda9ec63f 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FooGetDefaultResponse.java
@@ -33,26 +33,26 @@
 public class FooGetDefaultResponse   {
   public static final String JSON_PROPERTY_STRING = "string";
   @JsonProperty(JSON_PROPERTY_STRING)
-  private Foo string;
+  private Foo _string;
 
-  public FooGetDefaultResponse string(Foo string) {
-    this.string = string;
+  public FooGetDefaultResponse _string(Foo _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    **/
   @JsonProperty(value = "string")
   @Schema(description = "")
   @Valid 
   public Foo getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(Foo string) {
-    this.string = string;
+  public void setString(Foo _string) {
+    this._string = _string;
   }
 
 
@@ -65,12 +65,12 @@ public boolean equals(Object o) {
       return false;
     }
     FooGetDefaultResponse fooGetDefaultResponse = (FooGetDefaultResponse) o;
-    return Objects.equals(this.string, fooGetDefaultResponse.string);
+    return Objects.equals(this._string, fooGetDefaultResponse._string);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(string);
+    return Objects.hash(_string);
   }
 
   @Override
@@ -78,7 +78,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FooGetDefaultResponse {\n");
     
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FormatTest.java
index 3189dd0e461b..54bed82a3026 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/FormatTest.java
@@ -51,7 +51,7 @@
 public class FormatTest   {
   public static final String JSON_PROPERTY_INTEGER = "integer";
   @JsonProperty(JSON_PROPERTY_INTEGER)
-  private Integer integer;
+  private Integer _integer;
 
   public static final String JSON_PROPERTY_INT32 = "int32";
   @JsonProperty(JSON_PROPERTY_INT32)
@@ -79,7 +79,7 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_STRING = "string";
   @JsonProperty(JSON_PROPERTY_STRING)
-  private String string;
+  private String _string;
 
   public static final String JSON_PROPERTY_BYTE = "byte";
   @JsonProperty(JSON_PROPERTY_BYTE)
@@ -91,15 +91,15 @@ public class FormatTest   {
 
   public static final String JSON_PROPERTY_DATE = "date";
   @JsonProperty(JSON_PROPERTY_DATE)
-  private Date date;
+  private Date _date;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private Date dateTime;
+  private Date _dateTime;
 
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_PASSWORD = "password";
   @JsonProperty(JSON_PROPERTY_PASSWORD)
@@ -113,26 +113,26 @@ public class FormatTest   {
   @JsonProperty(JSON_PROPERTY_PATTERN_WITH_DIGITS_AND_DELIMITER)
   private String patternWithDigitsAndDelimiter;
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    **/
   @JsonProperty(value = "integer")
   @Schema(description = "")
    @Min(10) @Max(100)
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -263,24 +263,24 @@ public void setDecimal(BigDecimal decimal) {
     this.decimal = decimal;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    **/
   @JsonProperty(value = "string")
   @Schema(description = "")
    @Pattern(regexp="/[a-z]/i")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -323,64 +323,64 @@ public void setBinary(File binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(Date date) {
-    this.date = date;
+  public FormatTest _date(Date _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    **/
   @JsonProperty(value = "date")
   @Schema(required = true, description = "")
   @NotNull 
   public Date getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(Date date) {
-    this.date = date;
+  public void setDate(Date _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @Schema(description = "")
   
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @Schema(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", description = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -453,19 +453,19 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
         Objects.equals(this.decimal, formatTest.decimal) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Objects.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
         Objects.equals(this.patternWithDigits, formatTest.patternWithDigits) &&
         Objects.equals(this.patternWithDigitsAndDelimiter, formatTest.patternWithDigitsAndDelimiter);
@@ -473,7 +473,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, decimal, string, _byte, binary, date, dateTime, uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, decimal, _string, _byte, binary, _date, _dateTime, _uuid, password, patternWithDigits, patternWithDigitsAndDelimiter);
   }
 
   @Override
@@ -481,19 +481,19 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
     
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
     sb.append("    decimal: ").append(toIndentedString(decimal)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
     sb.append("    patternWithDigits: ").append(toIndentedString(patternWithDigits)).append("\n");
     sb.append("    patternWithDigitsAndDelimiter: ").append(toIndentedString(patternWithDigitsAndDelimiter)).append("\n");
diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index fc2e0dfaaa99..26b0a13d3a2b 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -38,82 +38,82 @@
 public class MixedPropertiesAndAdditionalPropertiesClass   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private UUID uuid;
+  private UUID _uuid;
 
   public static final String JSON_PROPERTY_DATE_TIME = "dateTime";
   @JsonProperty(JSON_PROPERTY_DATE_TIME)
-  private Date dateTime;
+  private Date _dateTime;
 
   public static final String JSON_PROPERTY_MAP = "map";
   @JsonProperty(JSON_PROPERTY_MAP)
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @Schema(description = "")
   
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    **/
   @JsonProperty(value = "dateTime")
   @Schema(description = "")
   
   public Date getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Date dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Date _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    **/
   @JsonProperty(value = "map")
   @Schema(description = "")
   @Valid 
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
 
@@ -126,14 +126,14 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
@@ -141,9 +141,9 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
index c4fcee316bee..b49d7970e132 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/gen/java/org/openapitools/model/ObjectWithDeprecatedFields.java
@@ -39,7 +39,7 @@
 public class ObjectWithDeprecatedFields   {
   public static final String JSON_PROPERTY_UUID = "uuid";
   @JsonProperty(JSON_PROPERTY_UUID)
-  private String uuid;
+  private String _uuid;
 
   public static final String JSON_PROPERTY_ID = "id";
   @JsonProperty(JSON_PROPERTY_ID)
@@ -53,24 +53,24 @@ public class ObjectWithDeprecatedFields   {
   @JsonProperty(JSON_PROPERTY_BARS)
   private List<String> bars = new ArrayList<>();
 
-  public ObjectWithDeprecatedFields uuid(String uuid) {
-    this.uuid = uuid;
+  public ObjectWithDeprecatedFields _uuid(String _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    **/
   @JsonProperty(value = "uuid")
   @Schema(description = "")
   
   public String getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(String uuid) {
-    this.uuid = uuid;
+  public void setUuid(String _uuid) {
+    this._uuid = _uuid;
   }
 
   public ObjectWithDeprecatedFields id(BigDecimal id) {
@@ -151,7 +151,7 @@ public boolean equals(Object o) {
       return false;
     }
     ObjectWithDeprecatedFields objectWithDeprecatedFields = (ObjectWithDeprecatedFields) o;
-    return Objects.equals(this.uuid, objectWithDeprecatedFields.uuid) &&
+    return Objects.equals(this._uuid, objectWithDeprecatedFields._uuid) &&
         Objects.equals(this.id, objectWithDeprecatedFields.id) &&
         Objects.equals(this.deprecatedRef, objectWithDeprecatedFields.deprecatedRef) &&
         Objects.equals(this.bars, objectWithDeprecatedFields.bars);
@@ -159,7 +159,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, id, deprecatedRef, bars);
+    return Objects.hash(_uuid, id, deprecatedRef, bars);
   }
 
   @Override
@@ -167,7 +167,7 @@ public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class ObjectWithDeprecatedFields {\n");
     
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    id: ").append(toIndentedString(id)).append("\n");
     sb.append("    deprecatedRef: ").append(toIndentedString(deprecatedRef)).append("\n");
     sb.append("    bars: ").append(toIndentedString(bars)).append("\n");
diff --git a/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java b/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
index 0ee8823877ca..994686d84c34 100644
--- a/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
+++ b/samples/server/petstore/jaxrs/jersey3/src/main/java/org/openapitools/api/impl/FakeApiServiceImpl.java
@@ -97,7 +97,7 @@ public Response testClientModel(Client client, SecurityContext securityContext)
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
     @Override
-    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, FormDataBodyPart binaryBodypart, Date date, Date dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
+    public Response testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer _integer, Integer int32, Long int64, Float _float, String _string, FormDataBodyPart binaryBodypart, Date _date, Date _dateTime, String password, String paramCallback, SecurityContext securityContext) throws NotFoundException {
         // do some magic!
         return Response.ok().entity(new ApiResponseMessage(ApiResponseMessage.OK, "magic!")).build();
     }
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 9a8878b33153..05e18040d69d 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
@@ -308,14 +308,14 @@ ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -345,14 +345,14 @@ ResponseEntity<Void> testEndpointParameters(
         @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) throws Exception;
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 49ce891d115a..3e61d44a20b8 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,7 +29,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -41,23 +41,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -66,33 +66,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -203,24 +203,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -343,24 +343,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -372,45 +372,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 d4ce79069e10..d289ccbf2cf9 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,80 +27,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -112,23 +112,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 491edc841567..3b7b4ab48399 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
@@ -359,14 +359,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -396,14 +396,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 a491314b90b6..c65bf62120fc 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,7 +29,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -41,23 +41,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -66,33 +66,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -203,24 +203,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -343,24 +343,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -372,45 +372,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 52cef4739752..8ec99a3f6aa7 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,80 +27,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -112,23 +112,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 491edc841567..3b7b4ab48399 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
@@ -359,14 +359,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -396,14 +396,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 ddf25fd77f36..2fd79d7b7838 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 64fb64b661b1..a5ca7aef0502 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 5fe4ea1a3dda..062f7c826c6c 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
@@ -319,14 +319,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -356,18 +356,18 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
-        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
 
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 fd1dac8d97c0..9a514e6f236c 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
@@ -189,14 +189,14 @@ default ResponseEntity<Client> testClientModel(Client client) {
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -207,14 +207,14 @@ default ResponseEntity<Void> testEndpointParameters(BigDecimal number,
         Double _double,
         String patternWithoutDelimiter,
         byte[] _byte,
-        Integer integer,
+        Integer _integer,
         Integer int32,
         Long int64,
         Float _float,
-        String string,
+        String _string,
         MultipartFile binary,
-        LocalDate date,
-        OffsetDateTime dateTime,
+        LocalDate _date,
+        OffsetDateTime _dateTime,
         String password,
         String paramCallback) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
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 ddf25fd77f36..2fd79d7b7838 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 64fb64b661b1..a5ca7aef0502 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 5fe4ea1a3dda..062f7c826c6c 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
@@ -319,14 +319,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -356,18 +356,18 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
-        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
 
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 fd1dac8d97c0..9a514e6f236c 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
@@ -189,14 +189,14 @@ default ResponseEntity<Client> testClientModel(Client client) {
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -207,14 +207,14 @@ default ResponseEntity<Void> testEndpointParameters(BigDecimal number,
         Double _double,
         String patternWithoutDelimiter,
         byte[] _byte,
-        Integer integer,
+        Integer _integer,
         Integer int32,
         Long int64,
         Float _float,
-        String string,
+        String _string,
         MultipartFile binary,
-        LocalDate date,
-        OffsetDateTime dateTime,
+        LocalDate _date,
+        OffsetDateTime _dateTime,
         String password,
         String paramCallback) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
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 294484b3737e..507040c00fad 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,53 +67,53 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
   /**
    * Constructor with all args parameters
    */
-  public FormatTest(Integer integer, Integer int32, Long int64, BigDecimal number, Float _float, Double _double, String string, byte[] _byte, org.springframework.core.io.Resource binary, LocalDate date, OffsetDateTime dateTime, UUID uuid, String password, BigDecimal bigDecimal) {
-      this.integer = integer;
+  public FormatTest(Integer _integer, Integer int32, Long int64, BigDecimal number, Float _float, Double _double, String _string, byte[] _byte, org.springframework.core.io.Resource binary, LocalDate _date, OffsetDateTime _dateTime, UUID _uuid, String password, BigDecimal _bigDecimal) {
+      this._integer = _integer;
       this.int32 = int32;
       this.int64 = int64;
       this.number = number;
       this._float = _float;
       this._double = _double;
-      this.string = string;
+      this._string = _string;
       this._byte = _byte;
       this.binary = binary;
-      this.date = date;
-      this.dateTime = dateTime;
-      this.uuid = uuid;
+      this._date = _date;
+      this._dateTime = _dateTime;
+      this._uuid = _uuid;
       this.password = password;
-      this.bigDecimal = bigDecimal;
+      this._bigDecimal = _bigDecimal;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -224,24 +224,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -284,64 +284,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -364,24 +364,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -393,45 +393,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 603711ab07ee..a48fa9e4791e 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,13 +28,13 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
   public MixedPropertiesAndAdditionalPropertiesClass() {
     super();
@@ -43,78 +43,78 @@ public MixedPropertiesAndAdditionalPropertiesClass() {
   /**
    * Constructor with all args parameters
    */
-  public MixedPropertiesAndAdditionalPropertiesClass(UUID uuid, OffsetDateTime dateTime, Map<String, Animal> map) {
-      this.uuid = uuid;
-      this.dateTime = dateTime;
-      this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass(UUID _uuid, OffsetDateTime _dateTime, Map<String, Animal> _map) {
+      this._uuid = _uuid;
+      this._dateTime = _dateTime;
+      this._map = _map;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -126,23 +126,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 57ef4ff2bf95..342503f5dad0 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
@@ -359,14 +359,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -396,14 +396,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 ddf25fd77f36..2fd79d7b7838 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 64fb64b661b1..a5ca7aef0502 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java
index 3a4876c97724..c4975b1fb0ad 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApi.java
@@ -342,14 +342,14 @@ default Mono<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -380,19 +380,19 @@ default Mono<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestPart(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestPart(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestPart(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) Flux<Part> binary,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestPart(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback,
         @ApiIgnore final ServerWebExchange exchange
     ) {
-        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange);
+        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, exchange);
     }
 
 
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApiDelegate.java
index f812dafd5b28..32e98fa7a939 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -214,14 +214,14 @@ default Mono<Client> testClientModel(Mono<Client> client,
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -232,14 +232,14 @@ default Mono<Void> testEndpointParameters(BigDecimal number,
         Double _double,
         String patternWithoutDelimiter,
         byte[] _byte,
-        Integer integer,
+        Integer _integer,
         Integer int32,
         Long int64,
         Float _float,
-        String string,
+        String _string,
         Flux<Part> binary,
-        LocalDate date,
-        OffsetDateTime dateTime,
+        LocalDate _date,
+        OffsetDateTime _dateTime,
         String password,
         String paramCallback,
         ServerWebExchange exchange) {
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java
index ddf25fd77f36..2fd79d7b7838 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/FormatTest.java
@@ -30,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 64fb64b661b1..a5ca7aef0502 100644
--- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -28,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 072db6eeae26..8ccc3c4ade96 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
@@ -333,14 +333,14 @@ default Mono<ResponseEntity<Client>> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -370,19 +370,19 @@ default Mono<ResponseEntity<Void>> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestPart(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestPart(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestPart(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestPart(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) Flux<Part> binary,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestPart(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestPart(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestPart(value = "callback", required = false) String paramCallback,
         @ApiIgnore final ServerWebExchange exchange
     ) {
-        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback, exchange);
+        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback, exchange);
     }
 
 
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 95cd34a1a3ac..f5b0128f3df6 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
@@ -215,14 +215,14 @@ default Mono<ResponseEntity<Client>> testClientModel(Mono<Client> client,
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -233,14 +233,14 @@ default Mono<ResponseEntity<Void>> testEndpointParameters(BigDecimal number,
         Double _double,
         String patternWithoutDelimiter,
         byte[] _byte,
-        Integer integer,
+        Integer _integer,
         Integer int32,
         Long int64,
         Float _float,
-        String string,
+        String _string,
         Flux<Part> binary,
-        LocalDate date,
-        OffsetDateTime dateTime,
+        LocalDate _date,
+        OffsetDateTime _dateTime,
         String password,
         String paramCallback,
         ServerWebExchange exchange) {
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 ddf25fd77f36..2fd79d7b7838 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 64fb64b661b1..a5ca7aef0502 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
index 78a69bf9a563..3c853bfe95f9 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -284,14 +284,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -321,18 +321,18 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
-        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
 
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 9b45ed14f5d4..aafd7beddd0d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -166,14 +166,14 @@ default ResponseEntity<Client> testClientModel(Client body) {
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -184,14 +184,14 @@ default ResponseEntity<Void> testEndpointParameters(BigDecimal number,
         Double _double,
         String patternWithoutDelimiter,
         byte[] _byte,
-        Integer integer,
+        Integer _integer,
         Integer int32,
         Long int64,
         Float _float,
-        String string,
+        String _string,
         MultipartFile binary,
-        LocalDate date,
-        OffsetDateTime dateTime,
+        LocalDate _date,
+        OffsetDateTime _dateTime,
         String password,
         String paramCallback) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
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 ddf25fd77f36..2fd79d7b7838 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 64fb64b661b1..a5ca7aef0502 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
index 78a69bf9a563..3c853bfe95f9 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApi.java
@@ -284,14 +284,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -321,18 +321,18 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
-        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+        return getDelegate().testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, _integer, int32, int64, _float, _string, binary, _date, _dateTime, password, paramCallback);
     }
 
 
diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java
index 9b45ed14f5d4..aafd7beddd0d 100644
--- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java
+++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java
@@ -166,14 +166,14 @@ default ResponseEntity<Client> testClientModel(Client body) {
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -184,14 +184,14 @@ default ResponseEntity<Void> testEndpointParameters(BigDecimal number,
         Double _double,
         String patternWithoutDelimiter,
         byte[] _byte,
-        Integer integer,
+        Integer _integer,
         Integer int32,
         Long int64,
         Float _float,
-        String string,
+        String _string,
         MultipartFile binary,
-        LocalDate date,
-        OffsetDateTime dateTime,
+        LocalDate _date,
+        OffsetDateTime _dateTime,
         String password,
         String paramCallback) {
         return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED);
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 ddf25fd77f36..2fd79d7b7838 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 64fb64b661b1..a5ca7aef0502 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
index 434c14572ac4..b091653f6ca7 100644
--- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java
@@ -314,14 +314,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -351,14 +351,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 ddf25fd77f36..2fd79d7b7838 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 64fb64b661b1..a5ca7aef0502 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
index 434c14572ac4..b091653f6ca7 100644
--- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
+++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java
@@ -314,14 +314,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -351,14 +351,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 ddf25fd77f36..2fd79d7b7838 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 64fb64b661b1..a5ca7aef0502 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 15e87397b915..3ae04617e4a8 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
@@ -359,14 +359,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -396,14 +396,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 fdc12d0824ca..469197526b7e 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Optional<@Min(10) @Max(100) Integer> integer = Optional.empty();
+  private Optional<@Min(10) @Max(100) Integer> _integer = Optional.empty();
 
   private Optional<@Min(20) @Max(200) Integer> int32 = Optional.empty();
 
@@ -42,23 +42,23 @@ public class FormatTest {
 
   private Optional<@DecimalMin("67.8") @DecimalMax("123.4") Double> _double = Optional.empty();
 
-  private Optional<@Pattern(regexp = "/[a-z]/i") String> string = Optional.empty();
+  private Optional<@Pattern(regexp = "/[a-z]/i") String> _string = Optional.empty();
 
   private byte[] _byte;
 
   private Optional<org.springframework.core.io.Resource> binary = Optional.empty();
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private Optional<OffsetDateTime> dateTime = Optional.empty();
+  private Optional<OffsetDateTime> _dateTime = Optional.empty();
 
-  private Optional<UUID> uuid = Optional.empty();
+  private Optional<UUID> _uuid = Optional.empty();
 
   private String password;
 
-  private Optional<BigDecimal> bigDecimal = Optional.empty();
+  private Optional<BigDecimal> _bigDecimal = Optional.empty();
 
   public FormatTest() {
     super();
@@ -67,33 +67,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = Optional.of(integer);
+  public FormatTest _integer(Integer _integer) {
+    this._integer = Optional.of(_integer);
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Optional<@Min(10) @Max(100) Integer> getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Optional<Integer> integer) {
-    this.integer = integer;
+  public void setInteger(Optional<Integer> _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Optional<Double> _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = Optional.of(string);
+  public FormatTest _string(String _string) {
+    this._string = Optional.of(_string);
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public Optional<@Pattern(regexp = "/[a-z]/i") String> getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(Optional<String> string) {
-    this.string = string;
+  public void setString(Optional<String> _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(Optional<org.springframework.core.io.Resource> binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = Optional.of(dateTime);
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = Optional.of(_dateTime);
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Optional<OffsetDateTime> getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Optional<OffsetDateTime> dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Optional<OffsetDateTime> _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = Optional.of(uuid);
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = Optional.of(_uuid);
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public Optional<UUID> getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(Optional<UUID> uuid) {
-    this.uuid = uuid;
+  public void setUuid(Optional<UUID> _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = Optional.of(bigDecimal);
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = Optional.of(_bigDecimal);
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public Optional<BigDecimal> getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(Optional<BigDecimal> bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(Optional<BigDecimal> _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -440,25 +440,25 @@ protected Builder(FormatTest instance) {
     }
 
     protected Builder copyOf(FormatTest value) { 
-      this.instance.setInteger(value.integer);
+      this.instance.setInteger(value._integer);
       this.instance.setInt32(value.int32);
       this.instance.setInt64(value.int64);
       this.instance.setNumber(value.number);
       this.instance.setFloat(value._float);
       this.instance.setDouble(value._double);
-      this.instance.setString(value.string);
+      this.instance.setString(value._string);
       this.instance.setByte(value._byte);
       this.instance.setBinary(value.binary);
-      this.instance.setDate(value.date);
-      this.instance.setDateTime(value.dateTime);
-      this.instance.setUuid(value.uuid);
+      this.instance.setDate(value._date);
+      this.instance.setDateTime(value._dateTime);
+      this.instance.setUuid(value._uuid);
       this.instance.setPassword(value.password);
-      this.instance.setBigDecimal(value.bigDecimal);
+      this.instance.setBigDecimal(value._bigDecimal);
       return this;
     }
 
-    public FormatTest.Builder integer(Integer integer) {
-      this.instance.integer(integer);
+    public FormatTest.Builder _integer(Integer _integer) {
+      this.instance._integer(_integer);
       return this;
     }
     
@@ -487,8 +487,8 @@ public FormatTest.Builder _double(Double _double) {
       return this;
     }
     
-    public FormatTest.Builder string(String string) {
-      this.instance.string(string);
+    public FormatTest.Builder _string(String _string) {
+      this.instance._string(_string);
       return this;
     }
     
@@ -502,18 +502,18 @@ public FormatTest.Builder binary(org.springframework.core.io.Resource binary) {
       return this;
     }
     
-    public FormatTest.Builder date(LocalDate date) {
-      this.instance.date(date);
+    public FormatTest.Builder _date(LocalDate _date) {
+      this.instance._date(_date);
       return this;
     }
     
-    public FormatTest.Builder dateTime(OffsetDateTime dateTime) {
-      this.instance.dateTime(dateTime);
+    public FormatTest.Builder _dateTime(OffsetDateTime _dateTime) {
+      this.instance._dateTime(_dateTime);
       return this;
     }
     
-    public FormatTest.Builder uuid(UUID uuid) {
-      this.instance.uuid(uuid);
+    public FormatTest.Builder _uuid(UUID _uuid) {
+      this.instance._uuid(_uuid);
       return this;
     }
     
@@ -522,8 +522,8 @@ public FormatTest.Builder password(String password) {
       return this;
     }
     
-    public FormatTest.Builder bigDecimal(BigDecimal bigDecimal) {
-      this.instance.bigDecimal(bigDecimal);
+    public FormatTest.Builder _bigDecimal(BigDecimal _bigDecimal) {
+      this.instance._bigDecimal(_bigDecimal);
       return this;
     }
     
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 e779098ebdf9..a01a737b76a3 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,80 +28,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private Optional<UUID> uuid = Optional.empty();
+  private Optional<UUID> _uuid = Optional.empty();
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private Optional<OffsetDateTime> dateTime = Optional.empty();
+  private Optional<OffsetDateTime> _dateTime = Optional.empty();
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = Optional.of(uuid);
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = Optional.of(_uuid);
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public Optional<UUID> getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(Optional<UUID> uuid) {
-    this.uuid = uuid;
+  public void setUuid(Optional<UUID> _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = Optional.of(dateTime);
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = Optional.of(_dateTime);
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public Optional<OffsetDateTime> getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(Optional<OffsetDateTime> dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(Optional<OffsetDateTime> _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -113,23 +113,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
@@ -158,24 +158,24 @@ protected Builder(MixedPropertiesAndAdditionalPropertiesClass instance) {
     }
 
     protected Builder copyOf(MixedPropertiesAndAdditionalPropertiesClass value) { 
-      this.instance.setUuid(value.uuid);
-      this.instance.setDateTime(value.dateTime);
-      this.instance.setMap(value.map);
+      this.instance.setUuid(value._uuid);
+      this.instance.setDateTime(value._dateTime);
+      this.instance.setMap(value._map);
       return this;
     }
 
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder uuid(UUID uuid) {
-      this.instance.uuid(uuid);
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _uuid(UUID _uuid) {
+      this.instance._uuid(_uuid);
       return this;
     }
     
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder dateTime(OffsetDateTime dateTime) {
-      this.instance.dateTime(dateTime);
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _dateTime(OffsetDateTime _dateTime) {
+      this.instance._dateTime(_dateTime);
       return this;
     }
     
-    public MixedPropertiesAndAdditionalPropertiesClass.Builder map(Map<String, Animal> map) {
-      this.instance.map(map);
+    public MixedPropertiesAndAdditionalPropertiesClass.Builder _map(Map<String, Animal> _map) {
+      this.instance._map(_map);
       return this;
     }
     
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 9d59b8ff78e0..436e5dae288e 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
@@ -378,14 +378,14 @@ default ResponseEntity<Client> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -416,14 +416,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @Parameter(name = "double", description = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @Parameter(name = "pattern_without_delimiter", description = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @Parameter(name = "byte", description = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @Parameter(name = "integer", description = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @Parameter(name = "int32", description = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @Parameter(name = "int64", description = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @Parameter(name = "float", description = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @Parameter(name = "string", description = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @Parameter(name = "binary", description = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @Parameter(name = "date", description = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @Parameter(name = "dateTime", description = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @Parameter(name = "password", description = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @Parameter(name = "callback", description = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 2004a28dce55..190c758aad3f 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,7 +29,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTest {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -41,23 +41,23 @@ public class FormatTest {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTest() {
     super();
@@ -66,33 +66,33 @@ public FormatTest() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTest(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTest integer(Integer integer) {
-    this.integer = integer;
+  public FormatTest _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @Schema(name = "integer", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTest int32(Integer int32) {
@@ -203,24 +203,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTest string(String string) {
-    this.string = string;
+  public FormatTest _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @Schema(name = "string", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTest _byte(byte[] _byte) {
@@ -263,64 +263,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTest date(LocalDate date) {
-    this.date = date;
+  public FormatTest _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @Schema(name = "date", requiredMode = Schema.RequiredMode.REQUIRED)
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTest dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTest _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTest uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTest _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", example = "72f98069-206d-4f12-9f12-3d1e525a8e84", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTest password(String password) {
@@ -343,24 +343,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTest bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTest _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @Schema(name = "BigDecimal", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -372,45 +372,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTest formatTest = (FormatTest) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTest {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 475046cd6475..8acadb14a5b6 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,80 +27,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClass {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, Animal> map = new HashMap<>();
+  private Map<String, Animal> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClass _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @Schema(name = "uuid", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClass _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @Schema(name = "dateTime", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClass _map(Map<String, Animal> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @Schema(name = "map", requiredMode = Schema.RequiredMode.NOT_REQUIRED)
   @JsonProperty("map")
   public Map<String, Animal> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, Animal> map) {
-    this.map = map;
+  public void setMap(Map<String, Animal> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -112,23 +112,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 88383d4fb06a..d049e4dedb93 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
@@ -359,14 +359,14 @@ default ResponseEntity<ClientDto> testClientModel(
      * @param _double None (required)
      * @param patternWithoutDelimiter None (required)
      * @param _byte None (required)
-     * @param integer None (optional)
+     * @param _integer None (optional)
      * @param int32 None (optional)
      * @param int64 None (optional)
      * @param _float None (optional)
-     * @param string None (optional)
+     * @param _string None (optional)
      * @param binary None (optional)
-     * @param date None (optional)
-     * @param dateTime None (optional)
+     * @param _date None (optional)
+     * @param _dateTime None (optional)
      * @param password None (optional)
      * @param paramCallback None (optional)
      * @return Invalid username supplied (status code 400)
@@ -396,14 +396,14 @@ default ResponseEntity<Void> testEndpointParameters(
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "double", required = true) Double _double,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "pattern_without_delimiter", required = true) String patternWithoutDelimiter,
         @ApiParam(value = "None", required = true) @Valid @RequestParam(value = "byte", required = true) byte[] _byte,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer integer,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "integer", required = false) Integer _integer,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int32", required = false) Integer int32,
         @ApiParam(value = "None") @Valid @RequestParam(value = "int64", required = false) Long int64,
         @ApiParam(value = "None") @Valid @RequestParam(value = "float", required = false) Float _float,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String string,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "string", required = false) String _string,
         @ApiParam(value = "None") @RequestPart(value = "binary", required = false) MultipartFile binary,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate date,
-        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime dateTime,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "date", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) LocalDate _date,
+        @ApiParam(value = "None") @Valid @RequestParam(value = "dateTime", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) OffsetDateTime _dateTime,
         @ApiParam(value = "None") @Valid @RequestParam(value = "password", required = false) String password,
         @ApiParam(value = "None") @Valid @RequestParam(value = "callback", required = false) String paramCallback
     ) {
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 b639190d99f0..bed583445ff1 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,7 +30,7 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class FormatTestDto {
 
-  private Integer integer;
+  private Integer _integer;
 
   private Integer int32;
 
@@ -42,23 +42,23 @@ public class FormatTestDto {
 
   private Double _double;
 
-  private String string;
+  private String _string;
 
   private byte[] _byte;
 
   private org.springframework.core.io.Resource binary;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE)
-  private LocalDate date;
+  private LocalDate _date;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
-  private UUID uuid;
+  private UUID _uuid;
 
   private String password;
 
-  private BigDecimal bigDecimal;
+  private BigDecimal _bigDecimal;
 
   public FormatTestDto() {
     super();
@@ -67,33 +67,33 @@ public FormatTestDto() {
   /**
    * Constructor with only required parameters
    */
-  public FormatTestDto(BigDecimal number, byte[] _byte, LocalDate date, String password) {
+  public FormatTestDto(BigDecimal number, byte[] _byte, LocalDate _date, String password) {
     this.number = number;
     this._byte = _byte;
-    this.date = date;
+    this._date = _date;
     this.password = password;
   }
 
-  public FormatTestDto integer(Integer integer) {
-    this.integer = integer;
+  public FormatTestDto _integer(Integer _integer) {
+    this._integer = _integer;
     return this;
   }
 
   /**
-   * Get integer
+   * Get _integer
    * minimum: 10
    * maximum: 100
-   * @return integer
+   * @return _integer
    */
   @Min(10) @Max(100) 
   @ApiModelProperty(value = "")
   @JsonProperty("integer")
   public Integer getInteger() {
-    return integer;
+    return _integer;
   }
 
-  public void setInteger(Integer integer) {
-    this.integer = integer;
+  public void setInteger(Integer _integer) {
+    this._integer = _integer;
   }
 
   public FormatTestDto int32(Integer int32) {
@@ -204,24 +204,24 @@ public void setDouble(Double _double) {
     this._double = _double;
   }
 
-  public FormatTestDto string(String string) {
-    this.string = string;
+  public FormatTestDto _string(String _string) {
+    this._string = _string;
     return this;
   }
 
   /**
-   * Get string
-   * @return string
+   * Get _string
+   * @return _string
    */
   @Pattern(regexp = "/[a-z]/i") 
   @ApiModelProperty(value = "")
   @JsonProperty("string")
   public String getString() {
-    return string;
+    return _string;
   }
 
-  public void setString(String string) {
-    this.string = string;
+  public void setString(String _string) {
+    this._string = _string;
   }
 
   public FormatTestDto _byte(byte[] _byte) {
@@ -264,64 +264,64 @@ public void setBinary(org.springframework.core.io.Resource binary) {
     this.binary = binary;
   }
 
-  public FormatTestDto date(LocalDate date) {
-    this.date = date;
+  public FormatTestDto _date(LocalDate _date) {
+    this._date = _date;
     return this;
   }
 
   /**
-   * Get date
-   * @return date
+   * Get _date
+   * @return _date
    */
   @NotNull @Valid 
   @ApiModelProperty(required = true, value = "")
   @JsonProperty("date")
   public LocalDate getDate() {
-    return date;
+    return _date;
   }
 
-  public void setDate(LocalDate date) {
-    this.date = date;
+  public void setDate(LocalDate _date) {
+    this._date = _date;
   }
 
-  public FormatTestDto dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public FormatTestDto _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public FormatTestDto uuid(UUID uuid) {
-    this.uuid = uuid;
+  public FormatTestDto _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
   public FormatTestDto password(String password) {
@@ -344,24 +344,24 @@ public void setPassword(String password) {
     this.password = password;
   }
 
-  public FormatTestDto bigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public FormatTestDto _bigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
     return this;
   }
 
   /**
-   * Get bigDecimal
-   * @return bigDecimal
+   * Get _bigDecimal
+   * @return _bigDecimal
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("BigDecimal")
   public BigDecimal getBigDecimal() {
-    return bigDecimal;
+    return _bigDecimal;
   }
 
-  public void setBigDecimal(BigDecimal bigDecimal) {
-    this.bigDecimal = bigDecimal;
+  public void setBigDecimal(BigDecimal _bigDecimal) {
+    this._bigDecimal = _bigDecimal;
   }
 
   @Override
@@ -373,45 +373,45 @@ public boolean equals(Object o) {
       return false;
     }
     FormatTestDto formatTest = (FormatTestDto) o;
-    return Objects.equals(this.integer, formatTest.integer) &&
+    return Objects.equals(this._integer, formatTest._integer) &&
         Objects.equals(this.int32, formatTest.int32) &&
         Objects.equals(this.int64, formatTest.int64) &&
         Objects.equals(this.number, formatTest.number) &&
         Objects.equals(this._float, formatTest._float) &&
         Objects.equals(this._double, formatTest._double) &&
-        Objects.equals(this.string, formatTest.string) &&
+        Objects.equals(this._string, formatTest._string) &&
         Arrays.equals(this._byte, formatTest._byte) &&
         Objects.equals(this.binary, formatTest.binary) &&
-        Objects.equals(this.date, formatTest.date) &&
-        Objects.equals(this.dateTime, formatTest.dateTime) &&
-        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this._date, formatTest._date) &&
+        Objects.equals(this._dateTime, formatTest._dateTime) &&
+        Objects.equals(this._uuid, formatTest._uuid) &&
         Objects.equals(this.password, formatTest.password) &&
-        Objects.equals(this.bigDecimal, formatTest.bigDecimal);
+        Objects.equals(this._bigDecimal, formatTest._bigDecimal);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password, bigDecimal);
+    return Objects.hash(_integer, int32, int64, number, _float, _double, _string, Arrays.hashCode(_byte), binary, _date, _dateTime, _uuid, password, _bigDecimal);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class FormatTestDto {\n");
-    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    _integer: ").append(toIndentedString(_integer)).append("\n");
     sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
     sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
     sb.append("    number: ").append(toIndentedString(number)).append("\n");
     sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
     sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
-    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _string: ").append(toIndentedString(_string)).append("\n");
     sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
     sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
-    sb.append("    date: ").append(toIndentedString(date)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    _date: ").append(toIndentedString(_date)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
     sb.append("    password: ").append("*").append("\n");
-    sb.append("    bigDecimal: ").append(toIndentedString(bigDecimal)).append("\n");
+    sb.append("    _bigDecimal: ").append(toIndentedString(_bigDecimal)).append("\n");
     sb.append("}");
     return sb.toString();
   }
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 e11f3d6318ef..52443d6d9e2c 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,80 +30,80 @@
 @Generated(value = "org.openapitools.codegen.languages.SpringCodegen", comments = "Generator version: 7.8.0-SNAPSHOT")
 public class MixedPropertiesAndAdditionalPropertiesClassDto {
 
-  private UUID uuid;
+  private UUID _uuid;
 
   @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)
-  private OffsetDateTime dateTime;
+  private OffsetDateTime _dateTime;
 
   @Valid
-  private Map<String, AnimalDto> map = new HashMap<>();
+  private Map<String, AnimalDto> _map = new HashMap<>();
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto uuid(UUID uuid) {
-    this.uuid = uuid;
+  public MixedPropertiesAndAdditionalPropertiesClassDto _uuid(UUID _uuid) {
+    this._uuid = _uuid;
     return this;
   }
 
   /**
-   * Get uuid
-   * @return uuid
+   * Get _uuid
+   * @return _uuid
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("uuid")
   public UUID getUuid() {
-    return uuid;
+    return _uuid;
   }
 
-  public void setUuid(UUID uuid) {
-    this.uuid = uuid;
+  public void setUuid(UUID _uuid) {
+    this._uuid = _uuid;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto dateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public MixedPropertiesAndAdditionalPropertiesClassDto _dateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
     return this;
   }
 
   /**
-   * Get dateTime
-   * @return dateTime
+   * Get _dateTime
+   * @return _dateTime
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("dateTime")
   public OffsetDateTime getDateTime() {
-    return dateTime;
+    return _dateTime;
   }
 
-  public void setDateTime(OffsetDateTime dateTime) {
-    this.dateTime = dateTime;
+  public void setDateTime(OffsetDateTime _dateTime) {
+    this._dateTime = _dateTime;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto map(Map<String, AnimalDto> map) {
-    this.map = map;
+  public MixedPropertiesAndAdditionalPropertiesClassDto _map(Map<String, AnimalDto> _map) {
+    this._map = _map;
     return this;
   }
 
-  public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, AnimalDto mapItem) {
-    if (this.map == null) {
-      this.map = new HashMap<>();
+  public MixedPropertiesAndAdditionalPropertiesClassDto putMapItem(String key, AnimalDto _mapItem) {
+    if (this._map == null) {
+      this._map = new HashMap<>();
     }
-    this.map.put(key, mapItem);
+    this._map.put(key, _mapItem);
     return this;
   }
 
   /**
-   * Get map
-   * @return map
+   * Get _map
+   * @return _map
    */
   @Valid 
   @ApiModelProperty(value = "")
   @JsonProperty("map")
   public Map<String, AnimalDto> getMap() {
-    return map;
+    return _map;
   }
 
-  public void setMap(Map<String, AnimalDto> map) {
-    this.map = map;
+  public void setMap(Map<String, AnimalDto> _map) {
+    this._map = _map;
   }
 
   @Override
@@ -115,23 +115,23 @@ public boolean equals(Object o) {
       return false;
     }
     MixedPropertiesAndAdditionalPropertiesClassDto mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClassDto) o;
-    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
-        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
-        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+    return Objects.equals(this._uuid, mixedPropertiesAndAdditionalPropertiesClass._uuid) &&
+        Objects.equals(this._dateTime, mixedPropertiesAndAdditionalPropertiesClass._dateTime) &&
+        Objects.equals(this._map, mixedPropertiesAndAdditionalPropertiesClass._map);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(uuid, dateTime, map);
+    return Objects.hash(_uuid, _dateTime, _map);
   }
 
   @Override
   public String toString() {
     StringBuilder sb = new StringBuilder();
     sb.append("class MixedPropertiesAndAdditionalPropertiesClassDto {\n");
-    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
-    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
-    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("    _uuid: ").append(toIndentedString(_uuid)).append("\n");
+    sb.append("    _dateTime: ").append(toIndentedString(_dateTime)).append("\n");
+    sb.append("    _map: ").append(toIndentedString(_map)).append("\n");
     sb.append("}");
     return sb.toString();
   }