diff --git a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache
index 05861c89f2a..e8d2ea96a40 100644
--- a/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-rest-sdk-client/model-source.mustache
@@ -188,9 +188,9 @@ bool {{classname}}::fromJson(const web::json::value& val)
         const web::json::value& fieldValue = val.at(utility::conversions::to_string_t(U("{{baseName}}")));
         if(!fieldValue.is_null())
         {
-            {{{dataType}}} refVal_{{baseName}};
-            ok &= ModelBase::fromJson(fieldValue, refVal_{{baseName}});
-            {{setter}}(refVal_{{baseName}});
+            {{{dataType}}} refVal_{{setter}};
+            ok &= ModelBase::fromJson(fieldValue, refVal_{{setter}});
+            {{setter}}(refVal_{{setter}});
         }
     }{{/isInherited}}{{/vars}}
     return ok;
@@ -223,9 +223,9 @@ bool {{classname}}::fromMultiPart(std::shared_ptr<MultipartFormData> multipart,
     {{#vars}}
     if(multipart->hasContent(utility::conversions::to_string_t(U("{{baseName}}"))))
     {
-        {{{dataType}}} refVal_{{baseName}};
-        ok &= ModelBase::fromHttpContent(multipart->getContent(utility::conversions::to_string_t(U("{{baseName}}"))), refVal_{{baseName}} );
-        {{setter}}(refVal_{{baseName}});
+        {{{dataType}}} refVal_{{setter}};
+        ok &= ModelBase::fromHttpContent(multipart->getContent(utility::conversions::to_string_t(U("{{baseName}}"))), refVal_{{setter}} );
+        {{setter}}(refVal_{{setter}});
     }
     {{/vars}}
     return ok;