diff --git a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
index af7b2371ebc..0be3a197cd1 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
+++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.cpp
@@ -431,7 +431,7 @@ SWGPetApi::updatePetWithFormCallback(HttpRequestWorker * worker) {
     emit updatePetWithFormSignal();
 }
 void
-SWGPetApi::deletePet(QString* api_key, qint64 petId) {
+SWGPetApi::deletePet(QString* apiKey, qint64 petId) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
 
diff --git a/samples/client/petstore/qt5cpp/client/SWGPetApi.h b/samples/client/petstore/qt5cpp/client/SWGPetApi.h
index 2f65cade2c4..488865729b9 100644
--- a/samples/client/petstore/qt5cpp/client/SWGPetApi.h
+++ b/samples/client/petstore/qt5cpp/client/SWGPetApi.h
@@ -28,7 +28,7 @@ public:
     void findPetsByTags(QList<QString*>* tags);
     void getPetById(qint64 petId);
     void updatePetWithForm(QString* petId, QString* name, QString* status);
-    void deletePet(QString* api_key, qint64 petId);
+    void deletePet(QString* apiKey, qint64 petId);
     void uploadFile(qint64 petId, QString* additionalMetadata, SWGHttpRequestInputFileElement* file);
     
 private:
diff --git a/samples/client/petstore/tizen/client/SamiPetApi.cpp b/samples/client/petstore/tizen/client/SamiPetApi.cpp
index 35c4900a9ac..69997d3cee0 100644
--- a/samples/client/petstore/tizen/client/SamiPetApi.cpp
+++ b/samples/client/petstore/tizen/client/SamiPetApi.cpp
@@ -380,7 +380,7 @@ deletePetProcessor(HttpResponse* pHttpResponse, void (* handler)(void*, SamiErro
 }
 
 void 
-SamiPetApi::deletePetWithCompletion(String* api_key, Long* petId, void(*success)(SamiError*)) {
+SamiPetApi::deletePetWithCompletion(String* apiKey, Long* petId, void(*success)(SamiError*)) {
   client = new SamiApiClient();
 
   client->success(&deletePetProcessor, (void(*)(void*, SamiError*))success);
@@ -388,7 +388,7 @@ SamiPetApi::deletePetWithCompletion(String* api_key, Long* petId, void(*success)
   headerParams->Construct();
 
   
-    headerParams->Add(new String("api_key"), api_key);
+    headerParams->Add(new String("api_key"), apiKey);
   
   
 
diff --git a/samples/client/petstore/tizen/client/SamiPetApi.h b/samples/client/petstore/tizen/client/SamiPetApi.h
index 10a957a87b8..05844bd88bd 100644
--- a/samples/client/petstore/tizen/client/SamiPetApi.h
+++ b/samples/client/petstore/tizen/client/SamiPetApi.h
@@ -39,7 +39,7 @@ public:
   updatePetWithFormWithCompletion(String* petId, String* name, String* status, void(* handler)(SamiError*));
   
   void 
-  deletePetWithCompletion(String* api_key, Long* petId, void(* handler)(SamiError*));
+  deletePetWithCompletion(String* apiKey, Long* petId, void(* handler)(SamiError*));
   
   void 
   uploadFileWithCompletion(Long* petId, String* additionalMetadata, SamiFile* file, void(* handler)(SamiError*));
diff --git a/samples/dynamic-html/docs/operations/PetApi.html b/samples/dynamic-html/docs/operations/PetApi.html
index 0fd5a9ae3c6..0c7bb8bd189 100644
--- a/samples/dynamic-html/docs/operations/PetApi.html
+++ b/samples/dynamic-html/docs/operations/PetApi.html
@@ -209,7 +209,7 @@
       
       <span class="param-in">Header: </span>
       
-      <span class="param-name">api_key</span>
+      <span class="param-name">apiKey</span>
       <span class="param-type">String</span>
       
       <p class="param-description"></p>
diff --git a/samples/html/index.html b/samples/html/index.html
index 9d47aa360eb..3cfd67d8d59 100644
--- a/samples/html/index.html
+++ b/samples/html/index.html
@@ -235,7 +235,7 @@
 
     <h3 class="field-label">Parameters</h3>
     <div class="field-items">
-      <div class="param">api_key (optional)</div>
+      <div class="param">apiKey (optional)</div>
 
       <div class="param-desc"><span class="param-type">Header Parameter</span> &mdash;  </div>
       <div class="param">petId (required)</div>
@@ -332,7 +332,7 @@
   &quot;complete&quot; : true,
   &quot;status&quot; : &quot;aeiou&quot;,
   &quot;quantity&quot; : 123,
-  &quot;shipDate&quot; : &quot;2015-05-21T05:49:06.118+0000&quot;
+  &quot;shipDate&quot; : &quot;2015-05-23T15:56:49.441+0000&quot;
 }</code></pre>
     
     <h3 class="field-label">Example data</h3>
@@ -341,7 +341,7 @@
   &lt;id&gt;123456&lt;/id&gt;
   &lt;petId&gt;123456&lt;/petId&gt;
   &lt;quantity&gt;0&lt;/quantity&gt;
-  &lt;shipDate&gt;2015-05-20T22:49:06.120Z&lt;/shipDate&gt;
+  &lt;shipDate&gt;2015-05-23T08:56:49.444Z&lt;/shipDate&gt;
   &lt;status&gt;string&lt;/status&gt;
   &lt;complete&gt;true&lt;/complete&gt;
 &lt;/Order&gt;</code></pre>
@@ -375,7 +375,7 @@
   &quot;complete&quot; : true,
   &quot;status&quot; : &quot;aeiou&quot;,
   &quot;quantity&quot; : 123,
-  &quot;shipDate&quot; : &quot;2015-05-21T05:49:06.121+0000&quot;
+  &quot;shipDate&quot; : &quot;2015-05-23T15:56:49.445+0000&quot;
 }</code></pre>
     
     <h3 class="field-label">Example data</h3>
@@ -384,7 +384,7 @@
   &lt;id&gt;123456&lt;/id&gt;
   &lt;petId&gt;123456&lt;/petId&gt;
   &lt;quantity&gt;0&lt;/quantity&gt;
-  &lt;shipDate&gt;2015-05-20T22:49:06.122Z&lt;/shipDate&gt;
+  &lt;shipDate&gt;2015-05-23T08:56:49.445Z&lt;/shipDate&gt;
   &lt;status&gt;string&lt;/status&gt;
   &lt;complete&gt;true&lt;/complete&gt;
 &lt;/Order&gt;</code></pre>