diff --git a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
index 1cb6759f7ad..98bbfd37998 100644
--- a/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
+++ b/modules/openapi-generator/src/main/resources/C-libcurl/model-body.mustache
@@ -77,12 +77,12 @@ end:
     {{^isContainer}}
     {{^isModel}}
     {{#isEnum}}
-char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
+char* {{classname}}_{{name}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
     char* {{name}}Array[] =  { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
     return {{name}}Array[{{name}}];
 }
 
-{{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{classname}}_FromString(char* {{name}}){
+{{projectName}}_{{classVarName}}_{{enumName}}_e {{classname}}_{{name}}_FromString(char* {{name}}){
     int stringToReturn = 0;
     char *{{name}}Array[] =  { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
     size_t sizeofArray = sizeof({{name}}Array) / sizeof({{name}}Array[0]);
@@ -101,12 +101,12 @@ char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName
     {{#items}}
     {{^isModel}}
     {{#isEnum}}
-char* {{name}}{{classname}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
+char* {{classname}}_{{name}}_ToString({{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}) {
     char *{{name}}Array[] =  { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
     return {{name}}Array[{{name}} - 1];
 }
 
-{{projectName}}_{{classVarName}}_{{enumName}}_e {{name}}{{classname}}_FromString(char* {{name}}) {
+{{projectName}}_{{classVarName}}_{{enumName}}_e {{classname}}_{{name}}_FromString(char* {{name}}) {
     int stringToReturn = 0;
     char *{{name}}Array[] =  { "NULL"{{#allowableValues}}{{#values}}, "{{.}}"{{/values}}{{/allowableValues}} };
     size_t sizeofArray = sizeof({{name}}Array) / sizeof({{name}}Array[0]);
@@ -629,7 +629,7 @@ fail:
     {
     goto end; //Enum
     }
-    {{name}}Variable = {{name}}{{classname}}_FromString({{{name}}}->valuestring);
+    {{name}}Variable = {{classname}}_{{name}}_FromString({{{name}}}->valuestring);
     {{/isString}}
     {{/isEnum}}
     {{^isEnum}}
diff --git a/samples/client/petstore/c/model/order.c b/samples/client/petstore/c/model/order.c
index cd462bedb19..734ff110252 100644
--- a/samples/client/petstore/c/model/order.c
+++ b/samples/client/petstore/c/model/order.c
@@ -4,12 +4,12 @@
 #include "order.h"
 
 
-char* statusorder_ToString(openapi_petstore_order_STATUS_e status) {
+char* order_status_ToString(openapi_petstore_order_STATUS_e status) {
     char* statusArray[] =  { "NULL", "placed", "approved", "delivered" };
     return statusArray[status];
 }
 
-openapi_petstore_order_STATUS_e statusorder_FromString(char* status){
+openapi_petstore_order_STATUS_e order_status_FromString(char* status){
     int stringToReturn = 0;
     char *statusArray[] =  { "NULL", "placed", "approved", "delivered" };
     size_t sizeofArray = sizeof(statusArray) / sizeof(statusArray[0]);
@@ -164,7 +164,7 @@ order_t *order_parseFromJSON(cJSON *orderJSON){
     {
     goto end; //Enum
     }
-    statusVariable = statusorder_FromString(status->valuestring);
+    statusVariable = order_status_FromString(status->valuestring);
     }
 
     // order->complete
diff --git a/samples/client/petstore/c/model/pet.c b/samples/client/petstore/c/model/pet.c
index d5aa7abe30b..7ca8b7a422a 100644
--- a/samples/client/petstore/c/model/pet.c
+++ b/samples/client/petstore/c/model/pet.c
@@ -4,12 +4,12 @@
 #include "pet.h"
 
 
-char* statuspet_ToString(openapi_petstore_pet_STATUS_e status) {
+char* pet_status_ToString(openapi_petstore_pet_STATUS_e status) {
     char* statusArray[] =  { "NULL", "available", "pending", "sold" };
     return statusArray[status];
 }
 
-openapi_petstore_pet_STATUS_e statuspet_FromString(char* status){
+openapi_petstore_pet_STATUS_e pet_status_FromString(char* status){
     int stringToReturn = 0;
     char *statusArray[] =  { "NULL", "available", "pending", "sold" };
     size_t sizeofArray = sizeof(statusArray) / sizeof(statusArray[0]);
@@ -253,7 +253,7 @@ pet_t *pet_parseFromJSON(cJSON *petJSON){
     {
     goto end; //Enum
     }
-    statusVariable = statuspet_FromString(status->valuestring);
+    statusVariable = pet_status_FromString(status->valuestring);
     }