diff --git a/samples/client/petstore/typescript-angular2/default/api/store.service.ts b/samples/client/petstore/typescript-angular2/default/api/store.service.ts
index d2f7ea11ff9..15b9479e5a6 100644
--- a/samples/client/petstore/typescript-angular2/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular2/default/api/store.service.ts
@@ -73,7 +73,7 @@ export class StoreService {
     }
 
     /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * @summary Delete purchase order by ID
      * @param orderId ID of the order that needs to be deleted
      */
@@ -104,7 +104,7 @@ export class StoreService {
     }
 
     /**
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * @summary Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
diff --git a/samples/client/petstore/typescript-angular2/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular2/npm/api/pet.service.ts
index 0303ca70d3a..285f40c739c 100644
--- a/samples/client/petstore/typescript-angular2/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular2/npm/api/pet.service.ts
@@ -74,8 +74,8 @@ export class PetService {
     }
 
     /**
-     * Add a new pet to the store
      * 
+     * @summary Add a new pet to the store
      * @param body Pet object that needs to be added to the store
      */
     public addPet(body: Pet, extraHttpRequestParams?: any): Observable<{}> {
@@ -90,8 +90,8 @@ export class PetService {
     }
 
     /**
-     * Deletes a pet
      * 
+     * @summary Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
@@ -107,8 +107,8 @@ export class PetService {
     }
 
     /**
-     * Finds Pets by status
      * Multiple status values can be provided with comma separated strings
+     * @summary Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
@@ -123,8 +123,8 @@ export class PetService {
     }
 
     /**
-     * Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @summary Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
@@ -139,8 +139,8 @@ export class PetService {
     }
 
     /**
-     * Find pet by ID
      * Returns a single pet
+     * @summary Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, extraHttpRequestParams?: any): Observable<Pet> {
@@ -155,8 +155,8 @@ export class PetService {
     }
 
     /**
-     * Update an existing pet
      * 
+     * @summary Update an existing pet
      * @param body Pet object that needs to be added to the store
      */
     public updatePet(body: Pet, extraHttpRequestParams?: any): Observable<{}> {
@@ -171,8 +171,8 @@ export class PetService {
     }
 
     /**
-     * Updates a pet in the store with form data
      * 
+     * @summary Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
      * @param name Updated name of the pet
      * @param status Updated status of the pet
@@ -189,8 +189,8 @@ export class PetService {
     }
 
     /**
-     * uploads an image
      * 
+     * @summary uploads an image
      * @param petId ID of pet to update
      * @param additionalMetadata Additional data to pass to server
      * @param file file to upload
diff --git a/samples/client/petstore/typescript-angular2/npm/api/store.service.ts b/samples/client/petstore/typescript-angular2/npm/api/store.service.ts
index 877c8df7e08..15b9479e5a6 100644
--- a/samples/client/petstore/typescript-angular2/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular2/npm/api/store.service.ts
@@ -73,8 +73,8 @@ export class StoreService {
     }
 
     /**
-     * Delete purchase order by ID
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * @summary Delete purchase order by ID
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, extraHttpRequestParams?: any): Observable<{}> {
@@ -89,8 +89,8 @@ export class StoreService {
     }
 
     /**
-     * Returns pet inventories by status
      * Returns a map of status codes to quantities
+     * @summary Returns pet inventories by status
      */
     public getInventory(extraHttpRequestParams?: any): Observable<{ [key: string]: number; }> {
         return this.getInventoryWithHttpInfo(extraHttpRequestParams)
@@ -104,8 +104,8 @@ export class StoreService {
     }
 
     /**
-     * Find purchase order by ID
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * @summary Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, extraHttpRequestParams?: any): Observable<Order> {
@@ -120,8 +120,8 @@ export class StoreService {
     }
 
     /**
-     * Place an order for a pet
      * 
+     * @summary Place an order for a pet
      * @param body order placed for purchasing the pet
      */
     public placeOrder(body: Order, extraHttpRequestParams?: any): Observable<Order> {
diff --git a/samples/client/petstore/typescript-angular2/npm/api/user.service.ts b/samples/client/petstore/typescript-angular2/npm/api/user.service.ts
index 5a5761dcdd3..05738cabea6 100644
--- a/samples/client/petstore/typescript-angular2/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular2/npm/api/user.service.ts
@@ -73,8 +73,8 @@ export class UserService {
     }
 
     /**
-     * Create user
      * This can only be done by the logged in user.
+     * @summary Create user
      * @param body Created user object
      */
     public createUser(body: User, extraHttpRequestParams?: any): Observable<{}> {
@@ -89,8 +89,8 @@ export class UserService {
     }
 
     /**
-     * Creates list of users with given input array
      * 
+     * @summary Creates list of users with given input array
      * @param body List of user object
      */
     public createUsersWithArrayInput(body: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
@@ -105,8 +105,8 @@ export class UserService {
     }
 
     /**
-     * Creates list of users with given input array
      * 
+     * @summary Creates list of users with given input array
      * @param body List of user object
      */
     public createUsersWithListInput(body: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
@@ -121,8 +121,8 @@ export class UserService {
     }
 
     /**
-     * Delete user
      * This can only be done by the logged in user.
+     * @summary Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, extraHttpRequestParams?: any): Observable<{}> {
@@ -137,8 +137,8 @@ export class UserService {
     }
 
     /**
-     * Get user by user name
      * 
+     * @summary Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing. 
      */
     public getUserByName(username: string, extraHttpRequestParams?: any): Observable<User> {
@@ -153,8 +153,8 @@ export class UserService {
     }
 
     /**
-     * Logs user into the system
      * 
+     * @summary Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
@@ -170,8 +170,8 @@ export class UserService {
     }
 
     /**
-     * Logs out current logged in user session
      * 
+     * @summary Logs out current logged in user session
      */
     public logoutUser(extraHttpRequestParams?: any): Observable<{}> {
         return this.logoutUserWithHttpInfo(extraHttpRequestParams)
@@ -185,8 +185,8 @@ export class UserService {
     }
 
     /**
-     * Updated user
      * This can only be done by the logged in user.
+     * @summary Updated user
      * @param username name that need to be deleted
      * @param body Updated user object
      */
diff --git a/samples/client/petstore/typescript-angular2/with-interfaces/api/pet.service.ts b/samples/client/petstore/typescript-angular2/with-interfaces/api/pet.service.ts
index 5198ead65e0..41774ce9aa7 100644
--- a/samples/client/petstore/typescript-angular2/with-interfaces/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular2/with-interfaces/api/pet.service.ts
@@ -75,8 +75,8 @@ export class PetService implements PetServiceInterface {
     }
 
     /**
-     * Add a new pet to the store
      * 
+     * @summary Add a new pet to the store
      * @param body Pet object that needs to be added to the store
      */
     public addPet(body: Pet, extraHttpRequestParams?: any): Observable<{}> {
@@ -91,8 +91,8 @@ export class PetService implements PetServiceInterface {
     }
 
     /**
-     * Deletes a pet
      * 
+     * @summary Deletes a pet
      * @param petId Pet id to delete
      * @param apiKey 
      */
@@ -108,8 +108,8 @@ export class PetService implements PetServiceInterface {
     }
 
     /**
-     * Finds Pets by status
      * Multiple status values can be provided with comma separated strings
+     * @summary Finds Pets by status
      * @param status Status values that need to be considered for filter
      */
     public findPetsByStatus(status: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
@@ -124,8 +124,8 @@ export class PetService implements PetServiceInterface {
     }
 
     /**
-     * Finds Pets by tags
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * @summary Finds Pets by tags
      * @param tags Tags to filter by
      */
     public findPetsByTags(tags: Array<string>, extraHttpRequestParams?: any): Observable<Array<Pet>> {
@@ -140,8 +140,8 @@ export class PetService implements PetServiceInterface {
     }
 
     /**
-     * Find pet by ID
      * Returns a single pet
+     * @summary Find pet by ID
      * @param petId ID of pet to return
      */
     public getPetById(petId: number, extraHttpRequestParams?: any): Observable<Pet> {
@@ -156,8 +156,8 @@ export class PetService implements PetServiceInterface {
     }
 
     /**
-     * Update an existing pet
      * 
+     * @summary Update an existing pet
      * @param body Pet object that needs to be added to the store
      */
     public updatePet(body: Pet, extraHttpRequestParams?: any): Observable<{}> {
@@ -172,8 +172,8 @@ export class PetService implements PetServiceInterface {
     }
 
     /**
-     * Updates a pet in the store with form data
      * 
+     * @summary Updates a pet in the store with form data
      * @param petId ID of pet that needs to be updated
      * @param name Updated name of the pet
      * @param status Updated status of the pet
@@ -190,8 +190,8 @@ export class PetService implements PetServiceInterface {
     }
 
     /**
-     * uploads an image
      * 
+     * @summary uploads an image
      * @param petId ID of pet to update
      * @param additionalMetadata Additional data to pass to server
      * @param file file to upload
diff --git a/samples/client/petstore/typescript-angular2/with-interfaces/api/store.service.ts b/samples/client/petstore/typescript-angular2/with-interfaces/api/store.service.ts
index 811e2ea5574..1b7992f172d 100644
--- a/samples/client/petstore/typescript-angular2/with-interfaces/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular2/with-interfaces/api/store.service.ts
@@ -74,8 +74,8 @@ export class StoreService implements StoreServiceInterface {
     }
 
     /**
-     * Delete purchase order by ID
-     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * @summary Delete purchase order by ID
      * @param orderId ID of the order that needs to be deleted
      */
     public deleteOrder(orderId: string, extraHttpRequestParams?: any): Observable<{}> {
@@ -90,8 +90,8 @@ export class StoreService implements StoreServiceInterface {
     }
 
     /**
-     * Returns pet inventories by status
      * Returns a map of status codes to quantities
+     * @summary Returns pet inventories by status
      */
     public getInventory(extraHttpRequestParams?: any): Observable<{ [key: string]: number; }> {
         return this.getInventoryWithHttpInfo(extraHttpRequestParams)
@@ -105,8 +105,8 @@ export class StoreService implements StoreServiceInterface {
     }
 
     /**
-     * Find purchase order by ID
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * @summary Find purchase order by ID
      * @param orderId ID of pet that needs to be fetched
      */
     public getOrderById(orderId: number, extraHttpRequestParams?: any): Observable<Order> {
@@ -121,8 +121,8 @@ export class StoreService implements StoreServiceInterface {
     }
 
     /**
-     * Place an order for a pet
      * 
+     * @summary Place an order for a pet
      * @param body order placed for purchasing the pet
      */
     public placeOrder(body: Order, extraHttpRequestParams?: any): Observable<Order> {
diff --git a/samples/client/petstore/typescript-angular2/with-interfaces/api/user.service.ts b/samples/client/petstore/typescript-angular2/with-interfaces/api/user.service.ts
index 03ab33592f6..040aede3139 100644
--- a/samples/client/petstore/typescript-angular2/with-interfaces/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular2/with-interfaces/api/user.service.ts
@@ -74,8 +74,8 @@ export class UserService implements UserServiceInterface {
     }
 
     /**
-     * Create user
      * This can only be done by the logged in user.
+     * @summary Create user
      * @param body Created user object
      */
     public createUser(body: User, extraHttpRequestParams?: any): Observable<{}> {
@@ -90,8 +90,8 @@ export class UserService implements UserServiceInterface {
     }
 
     /**
-     * Creates list of users with given input array
      * 
+     * @summary Creates list of users with given input array
      * @param body List of user object
      */
     public createUsersWithArrayInput(body: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
@@ -106,8 +106,8 @@ export class UserService implements UserServiceInterface {
     }
 
     /**
-     * Creates list of users with given input array
      * 
+     * @summary Creates list of users with given input array
      * @param body List of user object
      */
     public createUsersWithListInput(body: Array<User>, extraHttpRequestParams?: any): Observable<{}> {
@@ -122,8 +122,8 @@ export class UserService implements UserServiceInterface {
     }
 
     /**
-     * Delete user
      * This can only be done by the logged in user.
+     * @summary Delete user
      * @param username The name that needs to be deleted
      */
     public deleteUser(username: string, extraHttpRequestParams?: any): Observable<{}> {
@@ -138,8 +138,8 @@ export class UserService implements UserServiceInterface {
     }
 
     /**
-     * Get user by user name
      * 
+     * @summary Get user by user name
      * @param username The name that needs to be fetched. Use user1 for testing. 
      */
     public getUserByName(username: string, extraHttpRequestParams?: any): Observable<User> {
@@ -154,8 +154,8 @@ export class UserService implements UserServiceInterface {
     }
 
     /**
-     * Logs user into the system
      * 
+     * @summary Logs user into the system
      * @param username The user name for login
      * @param password The password for login in clear text
      */
@@ -171,8 +171,8 @@ export class UserService implements UserServiceInterface {
     }
 
     /**
-     * Logs out current logged in user session
      * 
+     * @summary Logs out current logged in user session
      */
     public logoutUser(extraHttpRequestParams?: any): Observable<{}> {
         return this.logoutUserWithHttpInfo(extraHttpRequestParams)
@@ -186,8 +186,8 @@ export class UserService implements UserServiceInterface {
     }
 
     /**
-     * Updated user
      * This can only be done by the logged in user.
+     * @summary Updated user
      * @param username name that need to be deleted
      * @param body Updated user object
      */