diff --git a/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache b/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache
index c2c70aa906d..bd7b7444c8f 100644
--- a/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache
+++ b/modules/swagger-codegen/src/main/resources/swagger-static/operation.mustache
@@ -23,7 +23,7 @@
       {{#isPathParam}}<span class="param-in">Path: </span>{{/isPathParam}}
       {{#isHeaderParam}}<span class="param-in">Header: </span>{{/isHeaderParam}}
       {{#isBodyParam}}<span class="param-in">Body: </span>{{/isBodyParam}}
-      <span class="param-name">{{paramName}}</span>
+      <span class="param-name">{{baseName}}</span>
       <span class="param-type">{{dataType}}{{#baseType}}({{baseType}}){{/baseType}}</span>
       {{#optional}}<span class="param-optional-flag">(optional)</span>{{/optional}}
       <p class="param-description">{{description}}</p>
diff --git a/samples/dynamic-html/docs/index.html b/samples/dynamic-html/docs/index.html
index 1b7ba98febb..22ed5d50b68 100644
--- a/samples/dynamic-html/docs/index.html
+++ b/samples/dynamic-html/docs/index.html
@@ -58,25 +58,6 @@
           </ul>
         </div>
         
-        <div class="section-box">
-          <div class="section-header">
-            <a href="#!/StoreApi">StoreApi</a>
-          </div>
-          <ul>
-			      
-			      
-            <li><a href="#!/StoreApi#getInventory">getInventory</a></li>
-            
-            <li><a href="#!/StoreApi#placeOrder">placeOrder</a></li>
-            
-            <li><a href="#!/StoreApi#getOrderById">getOrderById</a></li>
-            
-            <li><a href="#!/StoreApi#deleteOrder">deleteOrder</a></li>
-            
-            
-          </ul>
-        </div>
-        
         <div class="section-box">
           <div class="section-header">
             <a href="#!/PetApi">PetApi</a>
@@ -104,6 +85,25 @@
           </ul>
         </div>
         
+        <div class="section-box">
+          <div class="section-header">
+            <a href="#!/StoreApi">StoreApi</a>
+          </div>
+          <ul>
+			      
+			      
+            <li><a href="#!/StoreApi#getInventory">getInventory</a></li>
+            
+            <li><a href="#!/StoreApi#placeOrder">placeOrder</a></li>
+            
+            <li><a href="#!/StoreApi#getOrderById">getOrderById</a></li>
+            
+            <li><a href="#!/StoreApi#deleteOrder">deleteOrder</a></li>
+            
+            
+          </ul>
+        </div>
+        
         
       </div>
     <div class="non-sidebar">
diff --git a/samples/dynamic-html/docs/operations/PetApi.html b/samples/dynamic-html/docs/operations/PetApi.html
index 0c7bb8bd189..08e1cd1d42c 100644
--- a/samples/dynamic-html/docs/operations/PetApi.html
+++ b/samples/dynamic-html/docs/operations/PetApi.html
@@ -206,18 +206,6 @@
 	  <li class="parameter">
       
       
-      
-      <span class="param-in">Header: </span>
-      
-      <span class="param-name">apiKey</span>
-      <span class="param-type">String</span>
-      
-      <p class="param-description"></p>
-	  </li>
-    
-	  <li class="parameter">
-      
-      
       <span class="param-in">Path: </span>
       
       
@@ -227,6 +215,18 @@
       <p class="param-description">Pet id to delete</p>
 	  </li>
     
+	  <li class="parameter">
+      
+      
+      
+      <span class="param-in">Header: </span>
+      
+      <span class="param-name">api_key</span>
+      <span class="param-type">String</span>
+      
+      <p class="param-description"></p>
+	  </li>
+    
   </ul>
   
   <h2><a name="uploadFile"></a>uploadFile</h2>
diff --git a/samples/dynamic-html/docs/operations/UserApi.html b/samples/dynamic-html/docs/operations/UserApi.html
index f3af4dcaa76..8639fdfbf9f 100644
--- a/samples/dynamic-html/docs/operations/UserApi.html
+++ b/samples/dynamic-html/docs/operations/UserApi.html
@@ -161,7 +161,7 @@
       <span class="param-name">username</span>
       <span class="param-type">String</span>
       
-      <p class="param-description">The name that needs to be fetched. Use user1 for testing. </p>
+      <p class="param-description">The name that needs to be fetched. Use user1 for testing.</p>
 	  </li>
     
   </ul>