diff --git a/docs/generators/kotlin-server.html b/docs/generators/kotlin-server.html
index 6491289113a..db271859f90 100644
--- a/docs/generators/kotlin-server.html
+++ b/docs/generators/kotlin-server.html
@@ -19,14 +19,14 @@ sidebar_label: kotlin-server</p>
 </thead>
 <tbody>
 <tr><td>sourceFolder</td><td>source folder for generated code</td><td></td><td>src/main/kotlin</td></tr>
-<tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools</td></tr>
+<tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools.server</td></tr>
 <tr><td>apiSuffix</td><td>suffix for api classes</td><td></td><td>Api</td></tr>
 <tr><td>groupId</td><td>Generated artifact package's organization (i.e. maven groupId).</td><td></td><td>org.openapitools</td></tr>
-<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>null</td></tr>
+<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>kotlin-server</td></tr>
 <tr><td>artifactVersion</td><td>Generated artifact's package version.</td><td></td><td>1.0.0</td></tr>
 <tr><td>enumPropertyNaming</td><td>Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'</td><td></td><td>camelCase</td></tr>
 <tr><td>parcelizeModels</td><td>toggle &quot;@Parcelize&quot; for generated models</td><td></td><td>null</td></tr>
-<tr><td>library</td><td>library template (sub-template) to use</td><td><dl><dt><strong>ktor</strong></dt><dd>ktor framework</dd><dl></td><td>ktor</td></tr>
+<tr><td>library</td><td>library template (sub-template)</td><td><dl><dt><strong>ktor</strong></dt><dd>ktor framework</dd><dl></td><td>ktor</td></tr>
 <tr><td>featureAutoHead</td><td>Automatically provide responses to HEAD requests for existing routes that have the GET verb defined.</td><td></td><td>true</td></tr>
 <tr><td>featureConditionalHeaders</td><td>Avoid sending content if client already has same content, by checking ETag or LastModified properties.</td><td></td><td>false</td></tr>
 <tr><td>featureHSTS</td><td>Avoid sending content if client already has same content, by checking ETag or LastModified properties.</td><td></td><td>true</td></tr>
@@ -34,4 +34,4 @@ sidebar_label: kotlin-server</p>
 <tr><td>featureCompression</td><td>Adds ability to compress outgoing content using gzip, deflate or custom encoder and thus reduce size of the response.</td><td></td><td>true</td></tr>
 </tbody>
 </table>
-</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-7</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
+</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-11</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
diff --git a/docs/generators/kotlin-server/index.html b/docs/generators/kotlin-server/index.html
index 6491289113a..db271859f90 100644
--- a/docs/generators/kotlin-server/index.html
+++ b/docs/generators/kotlin-server/index.html
@@ -19,14 +19,14 @@ sidebar_label: kotlin-server</p>
 </thead>
 <tbody>
 <tr><td>sourceFolder</td><td>source folder for generated code</td><td></td><td>src/main/kotlin</td></tr>
-<tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools</td></tr>
+<tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools.server</td></tr>
 <tr><td>apiSuffix</td><td>suffix for api classes</td><td></td><td>Api</td></tr>
 <tr><td>groupId</td><td>Generated artifact package's organization (i.e. maven groupId).</td><td></td><td>org.openapitools</td></tr>
-<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>null</td></tr>
+<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>kotlin-server</td></tr>
 <tr><td>artifactVersion</td><td>Generated artifact's package version.</td><td></td><td>1.0.0</td></tr>
 <tr><td>enumPropertyNaming</td><td>Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'</td><td></td><td>camelCase</td></tr>
 <tr><td>parcelizeModels</td><td>toggle &quot;@Parcelize&quot; for generated models</td><td></td><td>null</td></tr>
-<tr><td>library</td><td>library template (sub-template) to use</td><td><dl><dt><strong>ktor</strong></dt><dd>ktor framework</dd><dl></td><td>ktor</td></tr>
+<tr><td>library</td><td>library template (sub-template)</td><td><dl><dt><strong>ktor</strong></dt><dd>ktor framework</dd><dl></td><td>ktor</td></tr>
 <tr><td>featureAutoHead</td><td>Automatically provide responses to HEAD requests for existing routes that have the GET verb defined.</td><td></td><td>true</td></tr>
 <tr><td>featureConditionalHeaders</td><td>Avoid sending content if client already has same content, by checking ETag or LastModified properties.</td><td></td><td>false</td></tr>
 <tr><td>featureHSTS</td><td>Avoid sending content if client already has same content, by checking ETag or LastModified properties.</td><td></td><td>true</td></tr>
@@ -34,4 +34,4 @@ sidebar_label: kotlin-server</p>
 <tr><td>featureCompression</td><td>Adds ability to compress outgoing content using gzip, deflate or custom encoder and thus reduce size of the response.</td><td></td><td>true</td></tr>
 </tbody>
 </table>
-</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-7</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
+</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-11</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
diff --git a/docs/generators/kotlin-spring.html b/docs/generators/kotlin-spring.html
index 121ab24b45c..06af3b4fb8a 100644
--- a/docs/generators/kotlin-spring.html
+++ b/docs/generators/kotlin-spring.html
@@ -22,7 +22,7 @@ sidebar_label: kotlin-spring</p>
 <tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools</td></tr>
 <tr><td>apiSuffix</td><td>suffix for api classes</td><td></td><td>Api</td></tr>
 <tr><td>groupId</td><td>Generated artifact package's organization (i.e. maven groupId).</td><td></td><td>org.openapitools</td></tr>
-<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>null</td></tr>
+<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>openapi-spring</td></tr>
 <tr><td>artifactVersion</td><td>Generated artifact's package version.</td><td></td><td>1.0.0</td></tr>
 <tr><td>enumPropertyNaming</td><td>Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'</td><td></td><td>camelCase</td></tr>
 <tr><td>parcelizeModels</td><td>toggle &quot;@Parcelize&quot; for generated models</td><td></td><td>null</td></tr>
@@ -37,7 +37,7 @@ sidebar_label: kotlin-spring</p>
 <tr><td>serviceInterface</td><td>generate service interfaces to go alongside controllers. In most cases this option would be used to update an existing project, so not to override implementations. Useful to help facilitate the generation gap pattern</td><td></td><td>false</td></tr>
 <tr><td>serviceImplementation</td><td>generate stub service implementations that extends service interfaces. If this is set to true service interfaces will also be generated</td><td></td><td>false</td></tr>
 <tr><td>useBeanValidation</td><td>Use BeanValidation API annotations to validate data types</td><td></td><td>true</td></tr>
-<tr><td>library</td><td>library template (sub-template) to use</td><td><dl><dt><strong>spring-boot</strong></dt><dd>Spring-boot Server application.</dd><dl></td><td>spring-boot</td></tr>
+<tr><td>library</td><td>library template (sub-template)</td><td><dl><dt><strong>spring-boot</strong></dt><dd>Spring-boot Server application.</dd><dl></td><td>spring-boot</td></tr>
 </tbody>
 </table>
-</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-7</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
+</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-11</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
diff --git a/docs/generators/kotlin-spring/index.html b/docs/generators/kotlin-spring/index.html
index 121ab24b45c..06af3b4fb8a 100644
--- a/docs/generators/kotlin-spring/index.html
+++ b/docs/generators/kotlin-spring/index.html
@@ -22,7 +22,7 @@ sidebar_label: kotlin-spring</p>
 <tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools</td></tr>
 <tr><td>apiSuffix</td><td>suffix for api classes</td><td></td><td>Api</td></tr>
 <tr><td>groupId</td><td>Generated artifact package's organization (i.e. maven groupId).</td><td></td><td>org.openapitools</td></tr>
-<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>null</td></tr>
+<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>openapi-spring</td></tr>
 <tr><td>artifactVersion</td><td>Generated artifact's package version.</td><td></td><td>1.0.0</td></tr>
 <tr><td>enumPropertyNaming</td><td>Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'</td><td></td><td>camelCase</td></tr>
 <tr><td>parcelizeModels</td><td>toggle &quot;@Parcelize&quot; for generated models</td><td></td><td>null</td></tr>
@@ -37,7 +37,7 @@ sidebar_label: kotlin-spring</p>
 <tr><td>serviceInterface</td><td>generate service interfaces to go alongside controllers. In most cases this option would be used to update an existing project, so not to override implementations. Useful to help facilitate the generation gap pattern</td><td></td><td>false</td></tr>
 <tr><td>serviceImplementation</td><td>generate stub service implementations that extends service interfaces. If this is set to true service interfaces will also be generated</td><td></td><td>false</td></tr>
 <tr><td>useBeanValidation</td><td>Use BeanValidation API annotations to validate data types</td><td></td><td>true</td></tr>
-<tr><td>library</td><td>library template (sub-template) to use</td><td><dl><dt><strong>spring-boot</strong></dt><dd>Spring-boot Server application.</dd><dl></td><td>spring-boot</td></tr>
+<tr><td>library</td><td>library template (sub-template)</td><td><dl><dt><strong>spring-boot</strong></dt><dd>Spring-boot Server application.</dd><dl></td><td>spring-boot</td></tr>
 </tbody>
 </table>
-</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-7</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
+</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-11</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
diff --git a/docs/generators/kotlin.html b/docs/generators/kotlin.html
index 754cfc94391..635135cc8b5 100644
--- a/docs/generators/kotlin.html
+++ b/docs/generators/kotlin.html
@@ -19,15 +19,15 @@ sidebar_label: kotlin</p>
 </thead>
 <tbody>
 <tr><td>sourceFolder</td><td>source folder for generated code</td><td></td><td>src/main/kotlin</td></tr>
-<tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools</td></tr>
+<tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools.client</td></tr>
 <tr><td>apiSuffix</td><td>suffix for api classes</td><td></td><td>Api</td></tr>
 <tr><td>groupId</td><td>Generated artifact package's organization (i.e. maven groupId).</td><td></td><td>org.openapitools</td></tr>
-<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>null</td></tr>
+<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>kotlin-client</td></tr>
 <tr><td>artifactVersion</td><td>Generated artifact's package version.</td><td></td><td>1.0.0</td></tr>
 <tr><td>enumPropertyNaming</td><td>Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'</td><td></td><td>camelCase</td></tr>
 <tr><td>parcelizeModels</td><td>toggle &quot;@Parcelize&quot; for generated models</td><td></td><td>null</td></tr>
-<tr><td>dateLibrary</td><td>Option. Date library to use</td><td><dl><dt><strong>string</strong></dt><dd>String</dd><dt><strong>java8</strong></dt><dd>Java 8 native JSR310</dd><dt><strong>threetenbp</strong></dt><dd>Threetenbp</dd><dl></td><td>null</td></tr>
-<tr><td>collectionType</td><td>Option. Collection type to use</td><td><dl><dt><strong>array</strong></dt><dd>kotlin.Array</dd><dt><strong>list</strong></dt><dd>kotlin.collections.List</dd><dl></td><td>null</td></tr>
+<tr><td>dateLibrary</td><td>Option. Date library to use</td><td><dl><dt><strong>string</strong></dt><dd>String</dd><dt><strong>java8</strong></dt><dd>Java 8 native JSR310</dd><dt><strong>threetenbp</strong></dt><dd>Threetenbp</dd><dl></td><td>java8</td></tr>
+<tr><td>collectionType</td><td>Option. Collection type to use</td><td><dl><dt><strong>array</strong></dt><dd>kotlin.Array</dd><dt><strong>list</strong></dt><dd>kotlin.collections.List</dd><dl></td><td>array</td></tr>
 </tbody>
 </table>
-</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-7</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
+</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-11</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
diff --git a/docs/generators/kotlin/index.html b/docs/generators/kotlin/index.html
index 754cfc94391..635135cc8b5 100644
--- a/docs/generators/kotlin/index.html
+++ b/docs/generators/kotlin/index.html
@@ -19,15 +19,15 @@ sidebar_label: kotlin</p>
 </thead>
 <tbody>
 <tr><td>sourceFolder</td><td>source folder for generated code</td><td></td><td>src/main/kotlin</td></tr>
-<tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools</td></tr>
+<tr><td>packageName</td><td>Generated artifact package name.</td><td></td><td>org.openapitools.client</td></tr>
 <tr><td>apiSuffix</td><td>suffix for api classes</td><td></td><td>Api</td></tr>
 <tr><td>groupId</td><td>Generated artifact package's organization (i.e. maven groupId).</td><td></td><td>org.openapitools</td></tr>
-<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>null</td></tr>
+<tr><td>artifactId</td><td>Generated artifact id (name of jar).</td><td></td><td>kotlin-client</td></tr>
 <tr><td>artifactVersion</td><td>Generated artifact's package version.</td><td></td><td>1.0.0</td></tr>
 <tr><td>enumPropertyNaming</td><td>Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'</td><td></td><td>camelCase</td></tr>
 <tr><td>parcelizeModels</td><td>toggle &quot;@Parcelize&quot; for generated models</td><td></td><td>null</td></tr>
-<tr><td>dateLibrary</td><td>Option. Date library to use</td><td><dl><dt><strong>string</strong></dt><dd>String</dd><dt><strong>java8</strong></dt><dd>Java 8 native JSR310</dd><dt><strong>threetenbp</strong></dt><dd>Threetenbp</dd><dl></td><td>null</td></tr>
-<tr><td>collectionType</td><td>Option. Collection type to use</td><td><dl><dt><strong>array</strong></dt><dd>kotlin.Array</dd><dt><strong>list</strong></dt><dd>kotlin.collections.List</dd><dl></td><td>null</td></tr>
+<tr><td>dateLibrary</td><td>Option. Date library to use</td><td><dl><dt><strong>string</strong></dt><dd>String</dd><dt><strong>java8</strong></dt><dd>Java 8 native JSR310</dd><dt><strong>threetenbp</strong></dt><dd>Threetenbp</dd><dl></td><td>java8</td></tr>
+<tr><td>collectionType</td><td>Option. Collection type to use</td><td><dl><dt><strong>array</strong></dt><dd>kotlin.Array</dd><dt><strong>list</strong></dt><dd>kotlin.collections.List</dd><dl></td><td>array</td></tr>
 </tbody>
 </table>
-</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-7</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file
+</span></div></article></div><div class="docLastUpdate"><em>Last updated on 2019-5-11</em></div><div class="docs-prevnext"></div></div></div><nav class="onPageNav"></nav></div><footer class="nav-footer" id="footer"><section class="sitemap"><a href="/" class="nav-home"><img src="/img/mono-logo.svg" alt="OpenAPI Generator" width="66" height="58"/></a><div><h5>Docs</h5><a href="/docs/en/customization.html">Customizing Generators</a><a href="/docs/en/integrations.html">Workflow Integrations</a></div><div><h5>Community</h5><a href="/en/users.html">User Showcase</a><a href="http://stackoverflow.com/questions/tagged/openapi-generator" target="_blank" rel="noreferrer noopener">Stack Overflow</a><a href="https://gitter.im/OpenAPITools/openapi-generator">Chat Room</a><a href="https://twitter.com/oas_generator" target="_blank" rel="noreferrer noopener">Twitter</a></div><div><h5>More</h5><a href="/blog">Blog</a><a href="https://github.com/OpenAPITools/openapi-generator">GitHub Repo</a><a class="github-button" href="https://github.com/OpenAPITools/openapi-generator" data-icon="octicon-star" data-count-href="/OpenAPITools/openapi-generator/stargazers" data-show-count="true" data-count-aria-label="# stargazers on GitHub" aria-label="Star this project on GitHub">Star</a></div></section><section class="copyright">Copyright © 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech). (Both &quot;OpenAPI Tools&quot; (https://OpenAPITools.org) and &quot;OpenAPI Generator&quot; are not affiliated with OpenAPI Initiative (OAI))</section></footer></div></body></html>
\ No newline at end of file