diff --git a/samples/docs/swagger-static-docs/sd/index.html b/samples/docs/swagger-static-docs/sd/index.html
index 940ba692ff2..ec27bf4b8a8 100644
--- a/samples/docs/swagger-static-docs/sd/index.html
+++ b/samples/docs/swagger-static-docs/sd/index.html
@@ -17,62 +17,6 @@
   </div>
   <div class="main_content">
     <h1>API Documentation</h1>
-    <h2>StoreApi</h2>
-    <table>
-      <tr>
-        <th class="column_header_name">Name</th>
-        <th class="column_header_path">Resource</th>
-        <th class="column_header_notes">Notes</th>
-      </tr>
-      <tr>
-        <td><a href="operations/StoreApi.html#getOrderById">getOrderById</a></td>
-        <td>/store.{format}/order/{orderId}</td>
-        <td>Find purchase order by ID<div id="StoreApi_getOrderById" class="operation expandable">For valid response try integer IDs with value &lt;= 5. Anything above 5 or nonintegers will generate API errors</div></td>
-      </tr>
-      <tr>
-        <td><a href="operations/StoreApi.html#deleteOrder">deleteOrder</a></td>
-        <td>/store.{format}/order/{orderId}</td>
-        <td>Delete purchase order by ID<div id="StoreApi_deleteOrder" class="operation expandable">For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors</div></td>
-      </tr>
-      <tr>
-        <td><a href="operations/StoreApi.html#placeOrder">placeOrder</a></td>
-        <td>/store.{format}/order</td>
-        <td>Place an order for a pet<div id="StoreApi_placeOrder" class="operation expandable"></div></td>
-      </tr>
-      </table>
-    <h2>PetApi</h2>
-    <table>
-      <tr>
-        <th class="column_header_name">Name</th>
-        <th class="column_header_path">Resource</th>
-        <th class="column_header_notes">Notes</th>
-      </tr>
-      <tr>
-        <td><a href="operations/PetApi.html#getPetById">getPetById</a></td>
-        <td>/pet.{format}/{petId}</td>
-        <td>Find pet by ID<div id="PetApi_getPetById" class="operation expandable">Returns a pet based on ID</div></td>
-      </tr>
-      <tr>
-        <td><a href="operations/PetApi.html#addPet">addPet</a></td>
-        <td>/pet.{format}</td>
-        <td>Add a new pet to the store<div id="PetApi_addPet" class="operation expandable"></div></td>
-      </tr>
-      <tr>
-        <td><a href="operations/PetApi.html#updatePet">updatePet</a></td>
-        <td>/pet.{format}</td>
-        <td>Update an existing pet<div id="PetApi_updatePet" class="operation expandable"></div></td>
-      </tr>
-      <tr>
-        <td><a href="operations/PetApi.html#findPetsByStatus">findPetsByStatus</a></td>
-        <td>/pet.{format}/findByStatus</td>
-        <td>Finds Pets by status<div id="PetApi_findPetsByStatus" class="operation expandable">Multiple status values can be provided with comma seperated strings</div></td>
-      </tr>
-      <tr>
-        <td><a href="operations/PetApi.html#findPetsByTags">findPetsByTags</a></td>
-        <td>/pet.{format}/findByTags</td>
-        <td>Finds Pets by tags<div id="PetApi_findPetsByTags" class="operation expandable">Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.</div></td>
-      </tr>
-      </table>
     <h2>UserApi</h2>
     <table>
       <tr>
@@ -121,6 +65,62 @@
         <td>Logs out current logged in user session<div id="UserApi_logoutUser" class="operation expandable"></div></td>
       </tr>
       </table>
+    <h2>PetApi</h2>
+    <table>
+      <tr>
+        <th class="column_header_name">Name</th>
+        <th class="column_header_path">Resource</th>
+        <th class="column_header_notes">Notes</th>
+      </tr>
+      <tr>
+        <td><a href="operations/PetApi.html#getPetById">getPetById</a></td>
+        <td>/pet.{format}/{petId}</td>
+        <td>Find pet by ID<div id="PetApi_getPetById" class="operation expandable">Returns a pet based on ID</div></td>
+      </tr>
+      <tr>
+        <td><a href="operations/PetApi.html#addPet">addPet</a></td>
+        <td>/pet.{format}</td>
+        <td>Add a new pet to the store<div id="PetApi_addPet" class="operation expandable"></div></td>
+      </tr>
+      <tr>
+        <td><a href="operations/PetApi.html#updatePet">updatePet</a></td>
+        <td>/pet.{format}</td>
+        <td>Update an existing pet<div id="PetApi_updatePet" class="operation expandable"></div></td>
+      </tr>
+      <tr>
+        <td><a href="operations/PetApi.html#findPetsByStatus">findPetsByStatus</a></td>
+        <td>/pet.{format}/findByStatus</td>
+        <td>Finds Pets by status<div id="PetApi_findPetsByStatus" class="operation expandable">Multiple status values can be provided with comma seperated strings</div></td>
+      </tr>
+      <tr>
+        <td><a href="operations/PetApi.html#findPetsByTags">findPetsByTags</a></td>
+        <td>/pet.{format}/findByTags</td>
+        <td>Finds Pets by tags<div id="PetApi_findPetsByTags" class="operation expandable">Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.</div></td>
+      </tr>
+      </table>
+    <h2>StoreApi</h2>
+    <table>
+      <tr>
+        <th class="column_header_name">Name</th>
+        <th class="column_header_path">Resource</th>
+        <th class="column_header_notes">Notes</th>
+      </tr>
+      <tr>
+        <td><a href="operations/StoreApi.html#getOrderById">getOrderById</a></td>
+        <td>/store.{format}/order/{orderId}</td>
+        <td>Find purchase order by ID<div id="StoreApi_getOrderById" class="operation expandable">For valid response try integer IDs with value &lt;= 5. Anything above 5 or nonintegers will generate API errors</div></td>
+      </tr>
+      <tr>
+        <td><a href="operations/StoreApi.html#deleteOrder">deleteOrder</a></td>
+        <td>/store.{format}/order/{orderId}</td>
+        <td>Delete purchase order by ID<div id="StoreApi_deleteOrder" class="operation expandable">For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors</div></td>
+      </tr>
+      <tr>
+        <td><a href="operations/StoreApi.html#placeOrder">placeOrder</a></td>
+        <td>/store.{format}/order</td>
+        <td>Place an order for a pet<div id="StoreApi_placeOrder" class="operation expandable"></div></td>
+      </tr>
+      </table>
     </div>
 </body>
 </html>
diff --git a/samples/docs/swagger-static-docs/sd/operations/PetApi.html b/samples/docs/swagger-static-docs/sd/operations/PetApi.html
index e3fc72676dd..ac5505201b3 100644
--- a/samples/docs/swagger-static-docs/sd/operations/PetApi.html
+++ b/samples/docs/swagger-static-docs/sd/operations/PetApi.html
@@ -17,7 +17,7 @@
 	</div>
 
   <div class="main_content">
-	  <h1></h1>
+	  <h1>PetApi</h1>
 	  <a name="getPetById"></a>
 	  <h2>getPetById</h2>
 	  <h3>GET: /pet.{format}/{petId}</h3>
@@ -136,3 +136,4 @@
 	  </div>
 </body>
 </html>
+
diff --git a/samples/docs/swagger-static-docs/sd/operations/StoreApi.html b/samples/docs/swagger-static-docs/sd/operations/StoreApi.html
index 36cc6c0b866..88e9a0a3abd 100644
--- a/samples/docs/swagger-static-docs/sd/operations/StoreApi.html
+++ b/samples/docs/swagger-static-docs/sd/operations/StoreApi.html
@@ -17,7 +17,7 @@
 	</div>
 
   <div class="main_content">
-	  <h1></h1>
+	  <h1>StoreApi</h1>
 	  <a name="getOrderById"></a>
 	  <h2>getOrderById</h2>
 	  <h3>GET: /store.{format}/order/{orderId}</h3>
@@ -90,3 +90,4 @@
 	  </div>
 </body>
 </html>
+
diff --git a/samples/docs/swagger-static-docs/sd/operations/UserApi.html b/samples/docs/swagger-static-docs/sd/operations/UserApi.html
index f7f90d08c49..57f82e233cf 100644
--- a/samples/docs/swagger-static-docs/sd/operations/UserApi.html
+++ b/samples/docs/swagger-static-docs/sd/operations/UserApi.html
@@ -17,7 +17,7 @@
 	</div>
 
   <div class="main_content">
-	  <h1></h1>
+	  <h1>UserApi</h1>
 	  <a name="createUsersWithArrayInput"></a>
 	  <h2>createUsersWithArrayInput</h2>
 	  <h3>POST: /user.{format}/createWithArray</h3>
@@ -212,3 +212,4 @@
 	  </div>
 </body>
 </html>
+
diff --git a/src/main/resources/swagger-static/operation.mustache b/src/main/resources/swagger-static/operation.mustache
index ae4b6de94bb..753bf15298c 100644
--- a/src/main/resources/swagger-static/operation.mustache
+++ b/src/main/resources/swagger-static/operation.mustache
@@ -17,7 +17,7 @@
 	</div>
 
   <div class="main_content">
-	  <h1>{{classname}}</h1>
+	  <h1>{{className}}</h1>
 	  {{#operations}}
 	  {{#operation}}
 	  <a name="{{nickname}}"></a>
@@ -79,4 +79,4 @@
 	  {{/operations}}
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>

Name	Resource	Notes
getOrderById	/store.{format}/order/{orderId}	Find purchase order by ID For valid response try integer IDs with value <= 5. Anything above 5 or nonintegers will generate API errors
deleteOrder	/store.{format}/order/{orderId}	Delete purchase order by ID For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
placeOrder	/store.{format}/order	Place an order for a pet
Name	Resource	Notes
getPetById	/pet.{format}/{petId}	Find pet by ID Returns a pet based on ID
addPet	/pet.{format}	Add a new pet to the store
updatePet	/pet.{format}	Update an existing pet
findPetsByStatus	/pet.{format}/findByStatus	Finds Pets by status Multiple status values can be provided with comma seperated strings
findPetsByTags	/pet.{format}/findByTags	Finds Pets by tags Muliple tags can be provided with comma seperated strings. Use tag1, tag2, tag3 for testing.