diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/AudioApi.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/AudioApi.kt
index 6ca93b273..23f1b9a4d 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/AudioApi.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/AudioApi.kt
@@ -76,7 +76,7 @@ open class AudioApi : ApiClient {
     @SerialName(value = "json") json("json"),
     @SerialName(value = "text") text("text"),
     @SerialName(value = "srt") srt("srt"),
-    @SerialName(value = "verbose_json") verboseJson("verbose_json"),
+    @SerialName(value = "verbose_json") verbose_json("verbose_json"),
     @SerialName(value = "vtt") vtt("vtt")
   }
 
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/FilesApi.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/FilesApi.kt
index c99c6d2b6..7456705c6 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/FilesApi.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/FilesApi.kt
@@ -42,7 +42,7 @@ open class FilesApi : ApiClient {
   @Serializable
   enum class PurposeCreateFile(val value: kotlin.String) {
 
-    @SerialName(value = "fine-tune") fineMinusTune("fine-tune"),
+    @SerialName(value = "fine-tune") fine_tune("fine-tune"),
     @SerialName(value = "assistants") assistants("assistants")
   }
 
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/ImagesApi.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/ImagesApi.kt
index 52feddd00..3b271958f 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/ImagesApi.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/apis/ImagesApi.kt
@@ -82,7 +82,7 @@ open class ImagesApi : ApiClient {
   enum class ResponseFormatCreateImageEdit(val value: kotlin.String) {
 
     @SerialName(value = "url") url("url"),
-    @SerialName(value = "b64_json") b64Json("b64_json")
+    @SerialName(value = "b64_json") b64_json("b64_json")
   }
 
   /**
@@ -151,7 +151,7 @@ open class ImagesApi : ApiClient {
   enum class ResponseFormatCreateImageVariation(val value: kotlin.String) {
 
     @SerialName(value = "url") url("url"),
-    @SerialName(value = "b64_json") b64Json("b64_json")
+    @SerialName(value = "b64_json") b64_json("b64_json")
   }
 
   /** enum for parameter size */
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantFileObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantFileObject.kt
index 9abaa4796..39e7b763e 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantFileObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantFileObject.kt
@@ -37,10 +37,10 @@ data class AssistantFileObject(
   /**
    * The object type, which is always `assistant.file`.
    *
-   * Values: assistantPeriodFile
+   * Values: assistant_file
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "assistant.file") assistantPeriodFile("assistant.file")
+    @SerialName(value = "assistant.file") assistant_file("assistant.file")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantObjectToolsInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantObjectToolsInner.kt
index 8ea45b6df..281ba3d98 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantObjectToolsInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantObjectToolsInner.kt
@@ -25,11 +25,11 @@ data class AssistantObjectToolsInner(
   /**
    * The type of tool being defined: `code_interpreter`
    *
-   * Values: codeInterpreter,retrieval,function
+   * Values: code_interpreter,retrieval,function
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "code_interpreter") codeInterpreter("code_interpreter"),
+    @SerialName(value = "code_interpreter") code_interpreter("code_interpreter"),
     @SerialName(value = "retrieval") retrieval("retrieval"),
     @SerialName(value = "function") function("function")
   }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantToolsCode.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantToolsCode.kt
index 8fc6ccc6f..d51afb23f 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantToolsCode.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/AssistantToolsCode.kt
@@ -21,10 +21,10 @@ data class AssistantToolsCode(
   /**
    * The type of tool being defined: `code_interpreter`
    *
-   * Values: codeInterpreter
+   * Values: code_interpreter
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "code_interpreter") codeInterpreter("code_interpreter")
+    @SerialName(value = "code_interpreter") code_interpreter("code_interpreter")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionRequestModel.kt
index 2ed4c7b2f..141b2e945 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionRequestModel.kt
@@ -14,28 +14,24 @@ import kotlinx.serialization.*
  * which models work with the Chat API.
  *
  * Values:
- * gptMinus4Minus1106MinusPreview,gptMinus4MinusVisionMinusPreview,gptMinus4,gptMinus4Minus0314,gptMinus4Minus0613,gptMinus4Minus32k,gptMinus4Minus32kMinus0314,gptMinus4Minus32kMinus0613,gptMinus3Period5MinusTurbo,gptMinus3Period5MinusTurboMinus16k,gptMinus3Period5MinusTurboMinus0301,gptMinus3Period5MinusTurboMinus0613,gptMinus3Period5MinusTurboMinus16kMinus0613
+ * gpt_4_1106_preview,gpt_4_vision_preview,gpt_4,gpt_4_0314,gpt_4_0613,gpt_4_32k,gpt_4_32k_0314,gpt_4_32k_0613,gpt_3_5_turbo,gpt_3_5_turbo_16k,gpt_3_5_turbo_0301,gpt_3_5_turbo_0613,gpt_3_5_turbo_16k_0613
  */
 @Serializable
 enum class CreateChatCompletionRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "gpt-4-1106-preview") gptMinus4Minus1106MinusPreview("gpt-4-1106-preview"),
-  @SerialName(value = "gpt-4-vision-preview")
-  gptMinus4MinusVisionMinusPreview("gpt-4-vision-preview"),
-  @SerialName(value = "gpt-4") gptMinus4("gpt-4"),
-  @SerialName(value = "gpt-4-0314") gptMinus4Minus0314("gpt-4-0314"),
-  @SerialName(value = "gpt-4-0613") gptMinus4Minus0613("gpt-4-0613"),
-  @SerialName(value = "gpt-4-32k") gptMinus4Minus32k("gpt-4-32k"),
-  @SerialName(value = "gpt-4-32k-0314") gptMinus4Minus32kMinus0314("gpt-4-32k-0314"),
-  @SerialName(value = "gpt-4-32k-0613") gptMinus4Minus32kMinus0613("gpt-4-32k-0613"),
-  @SerialName(value = "gpt-3.5-turbo") gptMinus3Period5MinusTurbo("gpt-3.5-turbo"),
-  @SerialName(value = "gpt-3.5-turbo-16k") gptMinus3Period5MinusTurboMinus16k("gpt-3.5-turbo-16k"),
-  @SerialName(value = "gpt-3.5-turbo-0301")
-  gptMinus3Period5MinusTurboMinus0301("gpt-3.5-turbo-0301"),
-  @SerialName(value = "gpt-3.5-turbo-0613")
-  gptMinus3Period5MinusTurboMinus0613("gpt-3.5-turbo-0613"),
-  @SerialName(value = "gpt-3.5-turbo-16k-0613")
-  gptMinus3Period5MinusTurboMinus16kMinus0613("gpt-3.5-turbo-16k-0613");
+  @SerialName(value = "gpt-4-1106-preview") gpt_4_1106_preview("gpt-4-1106-preview"),
+  @SerialName(value = "gpt-4-vision-preview") gpt_4_vision_preview("gpt-4-vision-preview"),
+  @SerialName(value = "gpt-4") gpt_4("gpt-4"),
+  @SerialName(value = "gpt-4-0314") gpt_4_0314("gpt-4-0314"),
+  @SerialName(value = "gpt-4-0613") gpt_4_0613("gpt-4-0613"),
+  @SerialName(value = "gpt-4-32k") gpt_4_32k("gpt-4-32k"),
+  @SerialName(value = "gpt-4-32k-0314") gpt_4_32k_0314("gpt-4-32k-0314"),
+  @SerialName(value = "gpt-4-32k-0613") gpt_4_32k_0613("gpt-4-32k-0613"),
+  @SerialName(value = "gpt-3.5-turbo") gpt_3_5_turbo("gpt-3.5-turbo"),
+  @SerialName(value = "gpt-3.5-turbo-16k") gpt_3_5_turbo_16k("gpt-3.5-turbo-16k"),
+  @SerialName(value = "gpt-3.5-turbo-0301") gpt_3_5_turbo_0301("gpt-3.5-turbo-0301"),
+  @SerialName(value = "gpt-3.5-turbo-0613") gpt_3_5_turbo_0613("gpt-3.5-turbo-0613"),
+  @SerialName(value = "gpt-3.5-turbo-16k-0613") gpt_3_5_turbo_16k_0613("gpt-3.5-turbo-16k-0613");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionRequestResponseFormat.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionRequestResponseFormat.kt
index 5957c331a..4b8ca8628 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionRequestResponseFormat.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionRequestResponseFormat.kt
@@ -32,11 +32,11 @@ data class CreateChatCompletionRequestResponseFormat(
   /**
    * Must be one of `text` or `json_object`.
    *
-   * Values: text,jsonObject
+   * Values: text,json_object
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
     @SerialName(value = "text") text("text"),
-    @SerialName(value = "json_object") jsonObject("json_object")
+    @SerialName(value = "json_object") json_object("json_object")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionResponse.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionResponse.kt
index 118677c0e..e895f021d 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionResponse.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionResponse.kt
@@ -51,10 +51,10 @@ data class CreateChatCompletionResponse(
   /**
    * The object type, which is always `chat.completion`.
    *
-   * Values: chatPeriodCompletion
+   * Values: chat_completion
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "chat.completion") chatPeriodCompletion("chat.completion")
+    @SerialName(value = "chat.completion") chat_completion("chat.completion")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionResponseChoicesInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionResponseChoicesInner.kt
index 88f021589..fdc09bccd 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionResponseChoicesInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionResponseChoicesInner.kt
@@ -39,14 +39,14 @@ data class CreateChatCompletionResponseChoicesInner(
    * filters, `tool_calls` if the model called a tool, or `function_call` (deprecated) if the model
    * called a function.
    *
-   * Values: stop,lengthType,toolCalls,contentFilter,functionCall
+   * Values: stop,length_type,tool_calls,content_filter,function_call
    */
   @Serializable
   enum class FinishReason(val value: kotlin.String) {
     @SerialName(value = "stop") stop("stop"),
-    @SerialName(value = "length") lengthType("length"),
-    @SerialName(value = "tool_calls") toolCalls("tool_calls"),
-    @SerialName(value = "content_filter") contentFilter("content_filter"),
-    @SerialName(value = "function_call") functionCall("function_call")
+    @SerialName(value = "length") length_type("length"),
+    @SerialName(value = "tool_calls") tool_calls("tool_calls"),
+    @SerialName(value = "content_filter") content_filter("content_filter"),
+    @SerialName(value = "function_call") function_call("function_call")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionStreamResponse.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionStreamResponse.kt
index de693f505..b3821d289 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionStreamResponse.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionStreamResponse.kt
@@ -51,11 +51,10 @@ data class CreateChatCompletionStreamResponse(
   /**
    * The object type, which is always `chat.completion.chunk`.
    *
-   * Values: chatPeriodCompletionPeriodChunk
+   * Values: chat_completion_chunk
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "chat.completion.chunk")
-    chatPeriodCompletionPeriodChunk("chat.completion.chunk")
+    @SerialName(value = "chat.completion.chunk") chat_completion_chunk("chat.completion.chunk")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionStreamResponseChoicesInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionStreamResponseChoicesInner.kt
index 3774fd300..ea46c7897 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionStreamResponseChoicesInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateChatCompletionStreamResponseChoicesInner.kt
@@ -39,14 +39,14 @@ data class CreateChatCompletionStreamResponseChoicesInner(
    * filters, `tool_calls` if the model called a tool, or `function_call` (deprecated) if the model
    * called a function.
    *
-   * Values: stop,lengthType,toolCalls,contentFilter,functionCall
+   * Values: stop,length_type,tool_calls,content_filter,function_call
    */
   @Serializable
   enum class FinishReason(val value: kotlin.String) {
     @SerialName(value = "stop") stop("stop"),
-    @SerialName(value = "length") lengthType("length"),
-    @SerialName(value = "tool_calls") toolCalls("tool_calls"),
-    @SerialName(value = "content_filter") contentFilter("content_filter"),
-    @SerialName(value = "function_call") functionCall("function_call")
+    @SerialName(value = "length") length_type("length"),
+    @SerialName(value = "tool_calls") tool_calls("tool_calls"),
+    @SerialName(value = "content_filter") content_filter("content_filter"),
+    @SerialName(value = "function_call") function_call("function_call")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionRequestModel.kt
index 0c9480190..338577756 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionRequestModel.kt
@@ -14,22 +14,21 @@ import kotlinx.serialization.*
  * of them.
  *
  * Values:
- * babbageMinus002,davinciMinus002,gptMinus3Period5MinusTurboMinusInstruct,textMinusDavinciMinus003,textMinusDavinciMinus002,textMinusDavinciMinus001,codeMinusDavinciMinus002,textMinusCurieMinus001,textMinusBabbageMinus001,textMinusAdaMinus001
+ * babbage_002,davinci_002,gpt_3_5_turbo_instruct,text_davinci_003,text_davinci_002,text_davinci_001,code_davinci_002,text_curie_001,text_babbage_001,text_ada_001
  */
 @Serializable
 enum class CreateCompletionRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "babbage-002") babbageMinus002("babbage-002"),
-  @SerialName(value = "davinci-002") davinciMinus002("davinci-002"),
-  @SerialName(value = "gpt-3.5-turbo-instruct")
-  gptMinus3Period5MinusTurboMinusInstruct("gpt-3.5-turbo-instruct"),
-  @SerialName(value = "text-davinci-003") textMinusDavinciMinus003("text-davinci-003"),
-  @SerialName(value = "text-davinci-002") textMinusDavinciMinus002("text-davinci-002"),
-  @SerialName(value = "text-davinci-001") textMinusDavinciMinus001("text-davinci-001"),
-  @SerialName(value = "code-davinci-002") codeMinusDavinciMinus002("code-davinci-002"),
-  @SerialName(value = "text-curie-001") textMinusCurieMinus001("text-curie-001"),
-  @SerialName(value = "text-babbage-001") textMinusBabbageMinus001("text-babbage-001"),
-  @SerialName(value = "text-ada-001") textMinusAdaMinus001("text-ada-001");
+  @SerialName(value = "babbage-002") babbage_002("babbage-002"),
+  @SerialName(value = "davinci-002") davinci_002("davinci-002"),
+  @SerialName(value = "gpt-3.5-turbo-instruct") gpt_3_5_turbo_instruct("gpt-3.5-turbo-instruct"),
+  @SerialName(value = "text-davinci-003") text_davinci_003("text-davinci-003"),
+  @SerialName(value = "text-davinci-002") text_davinci_002("text-davinci-002"),
+  @SerialName(value = "text-davinci-001") text_davinci_001("text-davinci-001"),
+  @SerialName(value = "code-davinci-002") code_davinci_002("code-davinci-002"),
+  @SerialName(value = "text-curie-001") text_curie_001("text-curie-001"),
+  @SerialName(value = "text-babbage-001") text_babbage_001("text-babbage-001"),
+  @SerialName(value = "text-ada-001") text_ada_001("text-ada-001");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionResponse.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionResponse.kt
index bdc8e4253..68b172f20 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionResponse.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionResponse.kt
@@ -52,10 +52,10 @@ data class CreateCompletionResponse(
   /**
    * The object type, which is always \"text_completion\"
    *
-   * Values: textCompletion
+   * Values: text_completion
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "text_completion") textCompletion("text_completion")
+    @SerialName(value = "text_completion") text_completion("text_completion")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionResponseChoicesInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionResponseChoicesInner.kt
index 81250b12f..8083cedfc 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionResponseChoicesInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateCompletionResponseChoicesInner.kt
@@ -39,12 +39,12 @@ data class CreateCompletionResponseChoicesInner(
    * the request was reached, or `content_filter` if content was omitted due to a flag from our
    * content filters.
    *
-   * Values: stop,lengthType,contentFilter
+   * Values: stop,length_type,content_filter
    */
   @Serializable
   enum class FinishReason(val value: kotlin.String) {
     @SerialName(value = "stop") stop("stop"),
-    @SerialName(value = "length") lengthType("length"),
-    @SerialName(value = "content_filter") contentFilter("content_filter")
+    @SerialName(value = "length") length_type("length"),
+    @SerialName(value = "content_filter") content_filter("content_filter")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEditRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEditRequestModel.kt
index d43b0f081..1791c80fb 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEditRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEditRequestModel.kt
@@ -12,15 +12,13 @@ import kotlinx.serialization.*
  * ID of the model to use. You can use the `text-davinci-edit-001` or `code-davinci-edit-001` model
  * with this endpoint.
  *
- * Values: textMinusDavinciMinusEditMinus001,codeMinusDavinciMinusEditMinus001
+ * Values: text_davinci_edit_001,code_davinci_edit_001
  */
 @Serializable
 enum class CreateEditRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "text-davinci-edit-001")
-  textMinusDavinciMinusEditMinus001("text-davinci-edit-001"),
-  @SerialName(value = "code-davinci-edit-001")
-  codeMinusDavinciMinusEditMinus001("code-davinci-edit-001");
+  @SerialName(value = "text-davinci-edit-001") text_davinci_edit_001("text-davinci-edit-001"),
+  @SerialName(value = "code-davinci-edit-001") code_davinci_edit_001("code-davinci-edit-001");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEditResponseChoicesInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEditResponseChoicesInner.kt
index bfbac517f..b56669b1d 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEditResponseChoicesInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEditResponseChoicesInner.kt
@@ -39,11 +39,11 @@ data class CreateEditResponseChoicesInner(
    * the request was reached, or `content_filter` if content was omitted due to a flag from our
    * content filters.
    *
-   * Values: stop,lengthType
+   * Values: stop,length_type
    */
   @Serializable
   enum class FinishReason(val value: kotlin.String) {
     @SerialName(value = "stop") stop("stop"),
-    @SerialName(value = "length") lengthType("length")
+    @SerialName(value = "length") length_type("length")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEmbeddingRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEmbeddingRequestModel.kt
index 92d58bcd6..dab33db04 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEmbeddingRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateEmbeddingRequestModel.kt
@@ -13,13 +13,12 @@ import kotlinx.serialization.*
  * all of your available models, or see our [Model overview](/docs/models/overview) for descriptions
  * of them.
  *
- * Values: textMinusEmbeddingMinusAdaMinus002
+ * Values: text_embedding_ada_002
  */
 @Serializable
 enum class CreateEmbeddingRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "text-embedding-ada-002")
-  textMinusEmbeddingMinusAdaMinus002("text-embedding-ada-002");
+  @SerialName(value = "text-embedding-ada-002") text_embedding_ada_002("text-embedding-ada-002");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateFineTuningJobRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateFineTuningJobRequestModel.kt
index 6323edac0..ffd97e9e3 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateFineTuningJobRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateFineTuningJobRequestModel.kt
@@ -12,14 +12,14 @@ import kotlinx.serialization.*
  * The name of the model to fine-tune. You can select one of the
  * [supported models](/docs/guides/fine-tuning/what-models-can-be-fine-tuned).
  *
- * Values: babbageMinus002,davinciMinus002,gptMinus3Period5MinusTurbo
+ * Values: babbage_002,davinci_002,gpt_3_5_turbo
  */
 @Serializable
 enum class CreateFineTuningJobRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "babbage-002") babbageMinus002("babbage-002"),
-  @SerialName(value = "davinci-002") davinciMinus002("davinci-002"),
-  @SerialName(value = "gpt-3.5-turbo") gptMinus3Period5MinusTurbo("gpt-3.5-turbo");
+  @SerialName(value = "babbage-002") babbage_002("babbage-002"),
+  @SerialName(value = "davinci-002") davinci_002("davinci-002"),
+  @SerialName(value = "gpt-3.5-turbo") gpt_3_5_turbo("gpt-3.5-turbo");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageEditRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageEditRequestModel.kt
index ceb2473a9..047befe3c 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageEditRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageEditRequestModel.kt
@@ -11,12 +11,12 @@ import kotlinx.serialization.*
 /**
  * The model to use for image generation. Only `dall-e-2` is supported at this time.
  *
- * Values: dallMinusEMinus2
+ * Values: dall_e_2
  */
 @Serializable
 enum class CreateImageEditRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "dall-e-2") dallMinusEMinus2("dall-e-2");
+  @SerialName(value = "dall-e-2") dall_e_2("dall-e-2");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageRequest.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageRequest.kt
index 6d33fdc82..907202191 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageRequest.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageRequest.kt
@@ -73,12 +73,12 @@ data class CreateImageRequest(
   /**
    * The format in which the generated images are returned. Must be one of `url` or `b64_json`.
    *
-   * Values: url,b64Json
+   * Values: url,b64_json
    */
   @Serializable
   enum class ResponseFormat(val value: kotlin.String) {
     @SerialName(value = "url") url("url"),
-    @SerialName(value = "b64_json") b64Json("b64_json")
+    @SerialName(value = "b64_json") b64_json("b64_json")
   }
   /**
    * The size of the generated images. Must be one of `256x256`, `512x512`, or `1024x1024` for
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageRequestModel.kt
index 47ad7d638..99768065c 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateImageRequestModel.kt
@@ -11,13 +11,13 @@ import kotlinx.serialization.*
 /**
  * The model to use for image generation.
  *
- * Values: dallMinusEMinus2,dallMinusEMinus3
+ * Values: dall_e_2,dall_e_3
  */
 @Serializable
 enum class CreateImageRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "dall-e-2") dallMinusEMinus2("dall-e-2"),
-  @SerialName(value = "dall-e-3") dallMinusEMinus3("dall-e-3");
+  @SerialName(value = "dall-e-2") dall_e_2("dall-e-2"),
+  @SerialName(value = "dall-e-3") dall_e_3("dall-e-3");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateModerationRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateModerationRequestModel.kt
index 1159eb749..103c85754 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateModerationRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateModerationRequestModel.kt
@@ -15,15 +15,13 @@ import kotlinx.serialization.*
  * `text-moderation-stable`, we will provide advanced notice before updating the model. Accuracy of
  * `text-moderation-stable` may be slightly lower than for `text-moderation-latest`.
  *
- * Values: textMinusModerationMinusLatest,textMinusModerationMinusStable
+ * Values: text_moderation_latest,text_moderation_stable
  */
 @Serializable
 enum class CreateModerationRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "text-moderation-latest")
-  textMinusModerationMinusLatest("text-moderation-latest"),
-  @SerialName(value = "text-moderation-stable")
-  textMinusModerationMinusStable("text-moderation-stable");
+  @SerialName(value = "text-moderation-latest") text_moderation_latest("text-moderation-latest"),
+  @SerialName(value = "text-moderation-stable") text_moderation_stable("text-moderation-stable");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateSpeechRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateSpeechRequestModel.kt
index eb7e23995..a1e756be1 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateSpeechRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateSpeechRequestModel.kt
@@ -11,13 +11,13 @@ import kotlinx.serialization.*
 /**
  * One of the available [TTS models](/docs/models/tts): `tts-1` or `tts-1-hd`
  *
- * Values: ttsMinus1,ttsMinus1MinusHd
+ * Values: tts_1,tts_1_hd
  */
 @Serializable
 enum class CreateSpeechRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "tts-1") ttsMinus1("tts-1"),
-  @SerialName(value = "tts-1-hd") ttsMinus1MinusHd("tts-1-hd");
+  @SerialName(value = "tts-1") tts_1("tts-1"),
+  @SerialName(value = "tts-1-hd") tts_1_hd("tts-1-hd");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateThreadAndRunRequestToolsInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateThreadAndRunRequestToolsInner.kt
index 84529c0fb..36e9bda9e 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateThreadAndRunRequestToolsInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateThreadAndRunRequestToolsInner.kt
@@ -25,11 +25,11 @@ data class CreateThreadAndRunRequestToolsInner(
   /**
    * The type of tool being defined: `code_interpreter`
    *
-   * Values: codeInterpreter,retrieval,function
+   * Values: code_interpreter,retrieval,function
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "code_interpreter") codeInterpreter("code_interpreter"),
+    @SerialName(value = "code_interpreter") code_interpreter("code_interpreter"),
     @SerialName(value = "retrieval") retrieval("retrieval"),
     @SerialName(value = "function") function("function")
   }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateTranscriptionRequestModel.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateTranscriptionRequestModel.kt
index 0cf845032..6a369e088 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateTranscriptionRequestModel.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/CreateTranscriptionRequestModel.kt
@@ -11,12 +11,12 @@ import kotlinx.serialization.*
 /**
  * ID of the model to use. Only `whisper-1` is currently available.
  *
- * Values: whisperMinus1
+ * Values: whisper_1
  */
 @Serializable
 enum class CreateTranscriptionRequestModel(val value: kotlin.String) {
 
-  @SerialName(value = "whisper-1") whisperMinus1("whisper-1");
+  @SerialName(value = "whisper-1") whisper_1("whisper-1");
 
   /**
    * Override [toString()] to avoid using the enum variable name as the value, and instead use the
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteAssistantFileResponse.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteAssistantFileResponse.kt
index 3db94fe49..1cd05eb00 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteAssistantFileResponse.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteAssistantFileResponse.kt
@@ -25,10 +25,9 @@ data class DeleteAssistantFileResponse(
   @SerialName(value = "object") @Required val `object`: DeleteAssistantFileResponse.`Object`
 ) {
 
-  /** Values: assistantPeriodFilePeriodDeleted */
+  /** Values: assistant_file_deleted */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "assistant.file.deleted")
-    assistantPeriodFilePeriodDeleted("assistant.file.deleted")
+    @SerialName(value = "assistant.file.deleted") assistant_file_deleted("assistant.file.deleted")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteAssistantResponse.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteAssistantResponse.kt
index 5a22b42fd..c408a77d7 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteAssistantResponse.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteAssistantResponse.kt
@@ -22,9 +22,9 @@ data class DeleteAssistantResponse(
   @SerialName(value = "object") @Required val `object`: DeleteAssistantResponse.`Object`
 ) {
 
-  /** Values: assistantPeriodDeleted */
+  /** Values: assistant_deleted */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "assistant.deleted") assistantPeriodDeleted("assistant.deleted")
+    @SerialName(value = "assistant.deleted") assistant_deleted("assistant.deleted")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteMessageResponse.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteMessageResponse.kt
index 37a994532..e8cd77353 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteMessageResponse.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteMessageResponse.kt
@@ -22,10 +22,9 @@ data class DeleteMessageResponse(
   @SerialName(value = "object") @Required val `object`: DeleteMessageResponse.`Object`
 ) {
 
-  /** Values: threadPeriodMessagePeriodDeleted */
+  /** Values: thread_message_deleted */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "thread.message.deleted")
-    threadPeriodMessagePeriodDeleted("thread.message.deleted")
+    @SerialName(value = "thread.message.deleted") thread_message_deleted("thread.message.deleted")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteThreadResponse.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteThreadResponse.kt
index c902bb42a..4750aabc7 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteThreadResponse.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/DeleteThreadResponse.kt
@@ -22,9 +22,9 @@ data class DeleteThreadResponse(
   @SerialName(value = "object") @Required val `object`: DeleteThreadResponse.`Object`
 ) {
 
-  /** Values: threadPeriodDeleted */
+  /** Values: thread_deleted */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "thread.deleted") threadPeriodDeleted("thread.deleted")
+    @SerialName(value = "thread.deleted") thread_deleted("thread.deleted")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTune.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTune.kt
index 170a8c29f..7f3846647 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTune.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTune.kt
@@ -79,10 +79,10 @@ data class FineTune(
   /**
    * The object type, which is always \"fine-tune\".
    *
-   * Values: fineMinusTune
+   * Values: fine_tune
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "fine-tune") fineMinusTune("fine-tune")
+    @SerialName(value = "fine-tune") fine_tune("fine-tune")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuneEvent.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuneEvent.kt
index 44d8836f8..dc047f4e8 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuneEvent.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuneEvent.kt
@@ -27,9 +27,9 @@ data class FineTuneEvent(
   @SerialName(value = "object") @Required val `object`: FineTuneEvent.`Object`
 ) {
 
-  /** Values: fineMinusTuneMinusEvent */
+  /** Values: fine_tune_event */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "fine-tune-event") fineMinusTuneMinusEvent("fine-tune-event")
+    @SerialName(value = "fine-tune-event") fine_tune_event("fine-tune-event")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuningJob.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuningJob.kt
index 27761ddc1..0d708bd12 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuningJob.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuningJob.kt
@@ -84,21 +84,21 @@ data class FineTuningJob(
   /**
    * The object type, which is always \"fine_tuning.job\".
    *
-   * Values: fineTuningPeriodJob
+   * Values: fine_tuning_job
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "fine_tuning.job") fineTuningPeriodJob("fine_tuning.job")
+    @SerialName(value = "fine_tuning.job") fine_tuning_job("fine_tuning.job")
   }
   /**
    * The current status of the fine-tuning job, which can be either `validating_files`, `queued`,
    * `running`, `succeeded`, `failed`, or `cancelled`.
    *
-   * Values: validatingFiles,queued,running,succeeded,failed,cancelled
+   * Values: validating_files,queued,running,succeeded,failed,cancelled
    */
   @Serializable
   enum class Status(val value: kotlin.String) {
-    @SerialName(value = "validating_files") validatingFiles("validating_files"),
+    @SerialName(value = "validating_files") validating_files("validating_files"),
     @SerialName(value = "queued") queued("queued"),
     @SerialName(value = "running") running("running"),
     @SerialName(value = "succeeded") succeeded("succeeded"),
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuningJobEvent.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuningJobEvent.kt
index 39fe52082..041c840fe 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuningJobEvent.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/FineTuningJobEvent.kt
@@ -35,10 +35,9 @@ data class FineTuningJobEvent(
     @SerialName(value = "warn") warn("warn"),
     @SerialName(value = "error") error("error")
   }
-  /** Values: fineTuningPeriodJobPeriodEvent */
+  /** Values: fine_tuning_job_event */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "fine_tuning.job.event")
-    fineTuningPeriodJobPeriodEvent("fine_tuning.job.event")
+    @SerialName(value = "fine_tuning.job.event") fine_tuning_job_event("fine_tuning.job.event")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentImageFileObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentImageFileObject.kt
index df8232866..d0eb0c080 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentImageFileObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentImageFileObject.kt
@@ -27,10 +27,10 @@ data class MessageContentImageFileObject(
   /**
    * Always `image_file`.
    *
-   * Values: imageFile
+   * Values: image_file
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "image_file") imageFile("image_file")
+    @SerialName(value = "image_file") image_file("image_file")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextAnnotationsFileCitationObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextAnnotationsFileCitationObject.kt
index fcc240a7f..a16e202fe 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextAnnotationsFileCitationObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextAnnotationsFileCitationObject.kt
@@ -41,10 +41,10 @@ data class MessageContentTextAnnotationsFileCitationObject(
   /**
    * Always `file_citation`.
    *
-   * Values: fileCitation
+   * Values: file_citation
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "file_citation") fileCitation("file_citation")
+    @SerialName(value = "file_citation") file_citation("file_citation")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextAnnotationsFilePathObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextAnnotationsFilePathObject.kt
index 77750a10e..70fb846c4 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextAnnotationsFilePathObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextAnnotationsFilePathObject.kt
@@ -38,10 +38,10 @@ data class MessageContentTextAnnotationsFilePathObject(
   /**
    * Always `file_path`.
    *
-   * Values: filePath
+   * Values: file_path
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "file_path") filePath("file_path")
+    @SerialName(value = "file_path") file_path("file_path")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextObjectTextAnnotationsInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextObjectTextAnnotationsInner.kt
index b093652de..b2ee67122 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextObjectTextAnnotationsInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageContentTextObjectTextAnnotationsInner.kt
@@ -39,11 +39,11 @@ data class MessageContentTextObjectTextAnnotationsInner(
   /**
    * Always `file_citation`.
    *
-   * Values: fileCitation,filePath
+   * Values: file_citation,file_path
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "file_citation") fileCitation("file_citation"),
-    @SerialName(value = "file_path") filePath("file_path")
+    @SerialName(value = "file_citation") file_citation("file_citation"),
+    @SerialName(value = "file_path") file_path("file_path")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageFileObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageFileObject.kt
index ba1058095..6efd6327b 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageFileObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageFileObject.kt
@@ -38,10 +38,10 @@ data class MessageFileObject(
   /**
    * The object type, which is always `thread.message.file`.
    *
-   * Values: threadPeriodMessagePeriodFile
+   * Values: thread_message_file
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "thread.message.file") threadPeriodMessagePeriodFile("thread.message.file")
+    @SerialName(value = "thread.message.file") thread_message_file("thread.message.file")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageObject.kt
index d47a9916d..227b3883f 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageObject.kt
@@ -71,11 +71,11 @@ data class MessageObject(
   /**
    * The object type, which is always `thread.message`.
    *
-   * Values: threadPeriodMessage
+   * Values: thread_message
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "thread.message") threadPeriodMessage("thread.message")
+    @SerialName(value = "thread.message") thread_message("thread.message")
   }
   /**
    * The entity that produced the message. One of `user` or `assistant`.
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageObjectContentInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageObjectContentInner.kt
index 8bb9c7aa3..55368a588 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageObjectContentInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/MessageObjectContentInner.kt
@@ -27,11 +27,11 @@ data class MessageObjectContentInner(
   /**
    * Always `image_file`.
    *
-   * Values: imageFile,text
+   * Values: image_file,text
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "image_file") imageFile("image_file"),
+    @SerialName(value = "image_file") image_file("image_file"),
     @SerialName(value = "text") text("text")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/OpenAIFile.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/OpenAIFile.kt
index bbee5509e..37f491ed6 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/OpenAIFile.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/OpenAIFile.kt
@@ -71,14 +71,14 @@ data class OpenAIFile(
    * The intended purpose of the file. Supported values are `fine-tune`, `fine-tune-results`,
    * `assistants`, and `assistants_output`.
    *
-   * Values: fineMinusTune,fineMinusTuneMinusResults,assistants,assistantsOutput
+   * Values: fine_tune,fine_tune_results,assistants,assistants_output
    */
   @Serializable
   enum class Purpose(val value: kotlin.String) {
-    @SerialName(value = "fine-tune") fineMinusTune("fine-tune"),
-    @SerialName(value = "fine-tune-results") fineMinusTuneMinusResults("fine-tune-results"),
+    @SerialName(value = "fine-tune") fine_tune("fine-tune"),
+    @SerialName(value = "fine-tune-results") fine_tune_results("fine-tune-results"),
     @SerialName(value = "assistants") assistants("assistants"),
-    @SerialName(value = "assistants_output") assistantsOutput("assistants_output")
+    @SerialName(value = "assistants_output") assistants_output("assistants_output")
   }
   /**
    * Deprecated. The current status of the file, which can be either `uploaded`, `processed`, or
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObject.kt
index 5b7da0129..3ed561ea9 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObject.kt
@@ -101,23 +101,23 @@ data class RunObject(
   /**
    * The object type, which is always `thread.run`.
    *
-   * Values: threadPeriodRun
+   * Values: thread_run
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "thread.run") threadPeriodRun("thread.run")
+    @SerialName(value = "thread.run") thread_run("thread.run")
   }
   /**
    * The status of the run, which can be either `queued`, `in_progress`, `requires_action`,
    * `cancelling`, `cancelled`, `failed`, `completed`, or `expired`.
    *
-   * Values: queued,inProgress,requiresAction,cancelling,cancelled,failed,completed,expired
+   * Values: queued,in_progress,requires_action,cancelling,cancelled,failed,completed,expired
    */
   @Serializable
   enum class Status(val value: kotlin.String) {
     @SerialName(value = "queued") queued("queued"),
-    @SerialName(value = "in_progress") inProgress("in_progress"),
-    @SerialName(value = "requires_action") requiresAction("requires_action"),
+    @SerialName(value = "in_progress") in_progress("in_progress"),
+    @SerialName(value = "requires_action") requires_action("requires_action"),
     @SerialName(value = "cancelling") cancelling("cancelling"),
     @SerialName(value = "cancelled") cancelled("cancelled"),
     @SerialName(value = "failed") failed("failed"),
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObjectLastError.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObjectLastError.kt
index da5a86ad8..48d4ec66d 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObjectLastError.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObjectLastError.kt
@@ -29,11 +29,11 @@ data class RunObjectLastError(
   /**
    * One of `server_error` or `rate_limit_exceeded`.
    *
-   * Values: serverError,rateLimitExceeded
+   * Values: server_error,rate_limit_exceeded
    */
   @Serializable
   enum class Code(val value: kotlin.String) {
-    @SerialName(value = "server_error") serverError("server_error"),
-    @SerialName(value = "rate_limit_exceeded") rateLimitExceeded("rate_limit_exceeded")
+    @SerialName(value = "server_error") server_error("server_error"),
+    @SerialName(value = "rate_limit_exceeded") rate_limit_exceeded("rate_limit_exceeded")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObjectRequiredAction.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObjectRequiredAction.kt
index e532a7769..3d17f8188 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObjectRequiredAction.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunObjectRequiredAction.kt
@@ -29,10 +29,10 @@ data class RunObjectRequiredAction(
   /**
    * For now, this is always `submit_tool_outputs`.
    *
-   * Values: submitToolOutputs
+   * Values: submit_tool_outputs
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "submit_tool_outputs") submitToolOutputs("submit_tool_outputs")
+    @SerialName(value = "submit_tool_outputs") submit_tool_outputs("submit_tool_outputs")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsMessageCreationObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsMessageCreationObject.kt
index 8e02217d0..5c97b560f 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsMessageCreationObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsMessageCreationObject.kt
@@ -29,10 +29,10 @@ data class RunStepDetailsMessageCreationObject(
   /**
    * Always `message_creation``.
    *
-   * Values: messageCreation
+   * Values: message_creation
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "message_creation") messageCreation("message_creation")
+    @SerialName(value = "message_creation") message_creation("message_creation")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsCodeObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsCodeObject.kt
index a2e9986dd..4fa81ec0d 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsCodeObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsCodeObject.kt
@@ -35,10 +35,10 @@ data class RunStepDetailsToolCallsCodeObject(
    * The type of tool call. This is always going to be `code_interpreter` for this type of tool
    * call.
    *
-   * Values: codeInterpreter
+   * Values: code_interpreter
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "code_interpreter") codeInterpreter("code_interpreter")
+    @SerialName(value = "code_interpreter") code_interpreter("code_interpreter")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsObject.kt
index ed55dbeae..81b162192 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsObject.kt
@@ -32,10 +32,10 @@ data class RunStepDetailsToolCallsObject(
   /**
    * Always `tool_calls`.
    *
-   * Values: toolCalls
+   * Values: tool_calls
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "tool_calls") toolCalls("tool_calls")
+    @SerialName(value = "tool_calls") tool_calls("tool_calls")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsObjectToolCallsInner.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsObjectToolCallsInner.kt
index f0d34723a..889718714 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsObjectToolCallsInner.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepDetailsToolCallsObjectToolCallsInner.kt
@@ -41,11 +41,11 @@ data class RunStepDetailsToolCallsObjectToolCallsInner(
    * The type of tool call. This is always going to be `code_interpreter` for this type of tool
    * call.
    *
-   * Values: codeInterpreter,retrieval,function
+   * Values: code_interpreter,retrieval,function
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "code_interpreter") codeInterpreter("code_interpreter"),
+    @SerialName(value = "code_interpreter") code_interpreter("code_interpreter"),
     @SerialName(value = "retrieval") retrieval("retrieval"),
     @SerialName(value = "function") function("function")
   }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObject.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObject.kt
index c96d0d090..b2fee36fa 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObject.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObject.kt
@@ -82,31 +82,31 @@ data class RunStepObject(
   /**
    * The object type, which is always `thread.run.step``.
    *
-   * Values: threadPeriodRunPeriodStep
+   * Values: thread_run_step
    */
   @Serializable
   enum class `Object`(val value: kotlin.String) {
-    @SerialName(value = "thread.run.step") threadPeriodRunPeriodStep("thread.run.step")
+    @SerialName(value = "thread.run.step") thread_run_step("thread.run.step")
   }
   /**
    * The type of run step, which can be either `message_creation` or `tool_calls`.
    *
-   * Values: messageCreation,toolCalls
+   * Values: message_creation,tool_calls
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "message_creation") messageCreation("message_creation"),
-    @SerialName(value = "tool_calls") toolCalls("tool_calls")
+    @SerialName(value = "message_creation") message_creation("message_creation"),
+    @SerialName(value = "tool_calls") tool_calls("tool_calls")
   }
   /**
    * The status of the run step, which can be either `in_progress`, `cancelled`, `failed`,
    * `completed`, or `expired`.
    *
-   * Values: inProgress,cancelled,failed,completed,expired
+   * Values: in_progress,cancelled,failed,completed,expired
    */
   @Serializable
   enum class Status(val value: kotlin.String) {
-    @SerialName(value = "in_progress") inProgress("in_progress"),
+    @SerialName(value = "in_progress") in_progress("in_progress"),
     @SerialName(value = "cancelled") cancelled("cancelled"),
     @SerialName(value = "failed") failed("failed"),
     @SerialName(value = "completed") completed("completed"),
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObjectLastError.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObjectLastError.kt
index dda51e62f..a72258c5a 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObjectLastError.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObjectLastError.kt
@@ -29,11 +29,11 @@ data class RunStepObjectLastError(
   /**
    * One of `server_error` or `rate_limit_exceeded`.
    *
-   * Values: serverError,rateLimitExceeded
+   * Values: server_error,rate_limit_exceeded
    */
   @Serializable
   enum class Code(val value: kotlin.String) {
-    @SerialName(value = "server_error") serverError("server_error"),
-    @SerialName(value = "rate_limit_exceeded") rateLimitExceeded("rate_limit_exceeded")
+    @SerialName(value = "server_error") server_error("server_error"),
+    @SerialName(value = "rate_limit_exceeded") rate_limit_exceeded("rate_limit_exceeded")
   }
 }
diff --git a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObjectStepDetails.kt b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObjectStepDetails.kt
index 2075a7e6f..ccfe8309d 100644
--- a/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObjectStepDetails.kt
+++ b/openai-client/client/src/commonMain/kotlin/com/xebia/functional/openai/models/RunStepObjectStepDetails.kt
@@ -36,11 +36,11 @@ data class RunStepObjectStepDetails(
   /**
    * Always `message_creation``.
    *
-   * Values: messageCreation,toolCalls
+   * Values: message_creation,tool_calls
    */
   @Serializable
   enum class Type(val value: kotlin.String) {
-    @SerialName(value = "message_creation") messageCreation("message_creation"),
-    @SerialName(value = "tool_calls") toolCalls("tool_calls")
+    @SerialName(value = "message_creation") message_creation("message_creation"),
+    @SerialName(value = "tool_calls") tool_calls("tool_calls")
   }
 }
diff --git a/openai-client/generator/README.md b/openai-client/generator/README.md
index cf319eedc..7cb83fb94 100644
--- a/openai-client/generator/README.md
+++ b/openai-client/generator/README.md
@@ -2,24 +2,27 @@
 
 Autogenerated client for OpenAI using the OpenAPI specification and [OpenAPI Generator](https://openapi-generator.tech/)
 
-## How to run
+## Download API Specification
 
-1. Enter into module's root path
+Requirements:
+* File `openai-client/generator/config/openai-api-commit` with the desired commit of the OpenAI API
 
-2. Download openai-api specification
+Running the task `downloadOpenAIAPI` will read that commit and download the specification into `openai-client/generator/config/openai-api.yaml`
 
 ```shell
-curl -o config/openai-api.yaml https://raw.githubusercontent.com/openai/openai-openapi/master/openapi.yaml
+./gradlew downloadOpenAIAPI
 ```
 
-3. Run the openapi generator CLI from module's root with the following parameters:
+## Generate code
 
-```shell
-./gradlew openaiClientGenerate
-```
+Requirements:
+* File `openai-client/generator/config/openai-api.yaml` with the API specification
+* File `openai-client/generator/config/openai-config.json` containing the configuration for the generator
 
-4. Run the spotLess task from project's root
+Running the task `openaiClientGenerate` will:
+* Generate the code with OpenAI Generator using the configuration
+* Run the task `spotlessApply`
 
 ```shell
-./gradlew spotlessApply
+./gradlew openaiClientGenerate
 ```
\ No newline at end of file
diff --git a/openai-client/generator/src/main/java/ai/xef/openai/generator/KMMGeneratorConfig.java b/openai-client/generator/src/main/java/ai/xef/openai/generator/KMMGeneratorConfig.java
index 684e028a8..8ec6a09dd 100644
--- a/openai-client/generator/src/main/java/ai/xef/openai/generator/KMMGeneratorConfig.java
+++ b/openai-client/generator/src/main/java/ai/xef/openai/generator/KMMGeneratorConfig.java
@@ -1,5 +1,6 @@
 package ai.xef.openai.generator;
 
+import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenProperty;
 import org.openapitools.codegen.languages.KotlinClientCodegen;
@@ -14,6 +15,9 @@ public class KMMGeneratorConfig extends KotlinClientCodegen {
 
     public KMMGeneratorConfig() {
         super();
+        specialCharReplacements.put("-", "_");
+        specialCharReplacements.put(".", "_");
+        enumPropertyNaming = CodegenConstants.ENUM_PROPERTY_NAMING_TYPE.snake_case;
     }
 
     private Optional<CodegenProperty> readEnumModel(List<CodegenProperty> all) {