diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
index df02384261e..c394a87f283 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
@@ -37,7 +37,7 @@ export class {{classname}} extends BaseAPI {
      * {{&summary}}
      {{/summary}}
      */
-    {{nickname}}Raw({{#allParams.0}}requestParameters: {{operationIdCamelCase}}Request{{/allParams.0}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
+    {{nickname}}({{#allParams.0}}requestParameters: {{operationIdCamelCase}}Request{{/allParams.0}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
         {{#allParams}}
         {{#required}}
         if (requestParameters.{{paramName}} === null || requestParameters.{{paramName}} === undefined) {
@@ -186,18 +186,6 @@ export class {{classname}} extends BaseAPI {
         });
     }
 
-    /**
-     {{#notes}}
-     * {{&notes}}
-     {{/notes}}
-     {{#summary}}
-     * {{&summary}}
-     {{/summary}}
-     */
-    {{nickname}}({{#allParams.0}}requestParameters: {{operationIdCamelCase}}Request{{/allParams.0}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
-        return this.{{nickname}}Raw({{#allParams.0}}requestParameters{{/allParams.0}});
-    }
-
     {{/operation}}
 }
 {{/operations}}
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
index f057ab1e3d4..033c9bed237 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
@@ -63,7 +63,7 @@ export class PetApi extends BaseAPI {
     /**
      * Add a new pet to the store
      */
-    addPetRaw(requestParameters: AddPetRequest): Observable<void> {
+    addPet(requestParameters: AddPetRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
@@ -92,17 +92,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Add a new pet to the store
-     */
-    addPet(requestParameters: AddPetRequest): Observable<void> {
-        return this.addPetRaw(requestParameters);
-    }
-
     /**
      * Deletes a pet
      */
-    deletePetRaw(requestParameters: DeletePetRequest): Observable<void> {
+    deletePet(requestParameters: DeletePetRequest): Observable<void> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
@@ -132,18 +125,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Deletes a pet
-     */
-    deletePet(requestParameters: DeletePetRequest): Observable<void> {
-        return this.deletePetRaw(requestParameters);
-    }
-
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      */
-    findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
+    findPetsByStatus(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
         if (requestParameters.status === null || requestParameters.status === undefined) {
             throw new RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
@@ -173,19 +159,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
-    findPetsByStatus(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
-        return this.findPetsByStatusRaw(requestParameters);
-    }
-
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      */
-    findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
+    findPetsByTags(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
         if (requestParameters.tags === null || requestParameters.tags === undefined) {
             throw new RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
@@ -215,19 +193,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
-    findPetsByTags(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
-        return this.findPetsByTagsRaw(requestParameters);
-    }
-
     /**
      * Returns a single pet
      * Find pet by ID
      */
-    getPetByIdRaw(requestParameters: GetPetByIdRequest): Observable<Pet> {
+    getPetById(requestParameters: GetPetByIdRequest): Observable<Pet> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
@@ -248,18 +218,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
-    getPetById(requestParameters: GetPetByIdRequest): Observable<Pet> {
-        return this.getPetByIdRaw(requestParameters);
-    }
-
     /**
      * Update an existing pet
      */
-    updatePetRaw(requestParameters: UpdatePetRequest): Observable<void> {
+    updatePet(requestParameters: UpdatePetRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
@@ -288,17 +250,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Update an existing pet
-     */
-    updatePet(requestParameters: UpdatePetRequest): Observable<void> {
-        return this.updatePetRaw(requestParameters);
-    }
-
     /**
      * Updates a pet in the store with form data
      */
-    updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Observable<void> {
+    updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Observable<void> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
@@ -334,17 +289,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Updates a pet in the store with form data
-     */
-    updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Observable<void> {
-        return this.updatePetWithFormRaw(requestParameters);
-    }
-
     /**
      * uploads an image
      */
-    uploadFileRaw(requestParameters: UploadFileRequest): Observable<ApiResponse> {
+    uploadFile(requestParameters: UploadFileRequest): Observable<ApiResponse> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
@@ -380,13 +328,6 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * uploads an image
-     */
-    uploadFile(requestParameters: UploadFileRequest): Observable<ApiResponse> {
-        return this.uploadFileRaw(requestParameters);
-    }
-
 }
 
 /**
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
index 2fd95a36c91..7cabae3dfe9 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
@@ -38,7 +38,7 @@ export class StoreApi extends BaseAPI {
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      */
-    deleteOrderRaw(requestParameters: DeleteOrderRequest): Observable<void> {
+    deleteOrder(requestParameters: DeleteOrderRequest): Observable<void> {
         if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
             throw new RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
@@ -55,19 +55,11 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
-    deleteOrder(requestParameters: DeleteOrderRequest): Observable<void> {
-        return this.deleteOrderRaw(requestParameters);
-    }
-
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
-    getInventoryRaw(): Observable<{ [key: string]: number; }> {
+    getInventory(): Observable<{ [key: string]: number; }> {
         const queryParameters: HttpQuery = {};
 
         const headerParameters: HttpHeaders = {};
@@ -84,19 +76,11 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
-    getInventory(): Observable<{ [key: string]: number; }> {
-        return this.getInventoryRaw();
-    }
-
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      */
-    getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Observable<Order> {
+    getOrderById(requestParameters: GetOrderByIdRequest): Observable<Order> {
         if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
             throw new RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
@@ -113,18 +97,10 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
-    getOrderById(requestParameters: GetOrderByIdRequest): Observable<Order> {
-        return this.getOrderByIdRaw(requestParameters);
-    }
-
     /**
      * Place an order for a pet
      */
-    placeOrderRaw(requestParameters: PlaceOrderRequest): Observable<Order> {
+    placeOrder(requestParameters: PlaceOrderRequest): Observable<Order> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
@@ -144,11 +120,4 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * Place an order for a pet
-     */
-    placeOrder(requestParameters: PlaceOrderRequest): Observable<Order> {
-        return this.placeOrderRaw(requestParameters);
-    }
-
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
index 68926aa8fd4..72c539c2e0c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
@@ -56,7 +56,7 @@ export class UserApi extends BaseAPI {
      * This can only be done by the logged in user.
      * Create user
      */
-    createUserRaw(requestParameters: CreateUserRequest): Observable<void> {
+    createUser(requestParameters: CreateUserRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
@@ -76,18 +76,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
-    createUser(requestParameters: CreateUserRequest): Observable<void> {
-        return this.createUserRaw(requestParameters);
-    }
-
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
+    createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
@@ -110,14 +102,7 @@ export class UserApi extends BaseAPI {
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
-        return this.createUsersWithArrayInputRaw(requestParameters);
-    }
-
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
+    createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
@@ -137,18 +122,11 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
-        return this.createUsersWithListInputRaw(requestParameters);
-    }
-
     /**
      * This can only be done by the logged in user.
      * Delete user
      */
-    deleteUserRaw(requestParameters: DeleteUserRequest): Observable<void> {
+    deleteUser(requestParameters: DeleteUserRequest): Observable<void> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
@@ -165,18 +143,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
-    deleteUser(requestParameters: DeleteUserRequest): Observable<void> {
-        return this.deleteUserRaw(requestParameters);
-    }
-
     /**
      * Get user by user name
      */
-    getUserByNameRaw(requestParameters: GetUserByNameRequest): Observable<User> {
+    getUserByName(requestParameters: GetUserByNameRequest): Observable<User> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
@@ -193,17 +163,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Get user by user name
-     */
-    getUserByName(requestParameters: GetUserByNameRequest): Observable<User> {
-        return this.getUserByNameRaw(requestParameters);
-    }
-
     /**
      * Logs user into the system
      */
-    loginUserRaw(requestParameters: LoginUserRequest): Observable<string> {
+    loginUser(requestParameters: LoginUserRequest): Observable<string> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.');
         }
@@ -232,17 +195,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Logs user into the system
-     */
-    loginUser(requestParameters: LoginUserRequest): Observable<string> {
-        return this.loginUserRaw(requestParameters);
-    }
-
     /**
      * Logs out current logged in user session
      */
-    logoutUserRaw(): Observable<void> {
+    logoutUser(): Observable<void> {
         const queryParameters: HttpQuery = {};
 
         const headerParameters: HttpHeaders = {};
@@ -255,18 +211,11 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Logs out current logged in user session
-     */
-    logoutUser(): Observable<void> {
-        return this.logoutUserRaw();
-    }
-
     /**
      * This can only be done by the logged in user.
      * Updated user
      */
-    updateUserRaw(requestParameters: UpdateUserRequest): Observable<void> {
+    updateUser(requestParameters: UpdateUserRequest): Observable<void> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
         }
@@ -290,12 +239,4 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
-    updateUser(requestParameters: UpdateUserRequest): Observable<void> {
-        return this.updateUserRaw(requestParameters);
-    }
-
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
index f057ab1e3d4..033c9bed237 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
@@ -63,7 +63,7 @@ export class PetApi extends BaseAPI {
     /**
      * Add a new pet to the store
      */
-    addPetRaw(requestParameters: AddPetRequest): Observable<void> {
+    addPet(requestParameters: AddPetRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
@@ -92,17 +92,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Add a new pet to the store
-     */
-    addPet(requestParameters: AddPetRequest): Observable<void> {
-        return this.addPetRaw(requestParameters);
-    }
-
     /**
      * Deletes a pet
      */
-    deletePetRaw(requestParameters: DeletePetRequest): Observable<void> {
+    deletePet(requestParameters: DeletePetRequest): Observable<void> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
@@ -132,18 +125,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Deletes a pet
-     */
-    deletePet(requestParameters: DeletePetRequest): Observable<void> {
-        return this.deletePetRaw(requestParameters);
-    }
-
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      */
-    findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
+    findPetsByStatus(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
         if (requestParameters.status === null || requestParameters.status === undefined) {
             throw new RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
@@ -173,19 +159,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
-    findPetsByStatus(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
-        return this.findPetsByStatusRaw(requestParameters);
-    }
-
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      */
-    findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
+    findPetsByTags(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
         if (requestParameters.tags === null || requestParameters.tags === undefined) {
             throw new RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
@@ -215,19 +193,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
-    findPetsByTags(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
-        return this.findPetsByTagsRaw(requestParameters);
-    }
-
     /**
      * Returns a single pet
      * Find pet by ID
      */
-    getPetByIdRaw(requestParameters: GetPetByIdRequest): Observable<Pet> {
+    getPetById(requestParameters: GetPetByIdRequest): Observable<Pet> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
@@ -248,18 +218,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
-    getPetById(requestParameters: GetPetByIdRequest): Observable<Pet> {
-        return this.getPetByIdRaw(requestParameters);
-    }
-
     /**
      * Update an existing pet
      */
-    updatePetRaw(requestParameters: UpdatePetRequest): Observable<void> {
+    updatePet(requestParameters: UpdatePetRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
@@ -288,17 +250,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Update an existing pet
-     */
-    updatePet(requestParameters: UpdatePetRequest): Observable<void> {
-        return this.updatePetRaw(requestParameters);
-    }
-
     /**
      * Updates a pet in the store with form data
      */
-    updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Observable<void> {
+    updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Observable<void> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
@@ -334,17 +289,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Updates a pet in the store with form data
-     */
-    updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Observable<void> {
-        return this.updatePetWithFormRaw(requestParameters);
-    }
-
     /**
      * uploads an image
      */
-    uploadFileRaw(requestParameters: UploadFileRequest): Observable<ApiResponse> {
+    uploadFile(requestParameters: UploadFileRequest): Observable<ApiResponse> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
@@ -380,13 +328,6 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * uploads an image
-     */
-    uploadFile(requestParameters: UploadFileRequest): Observable<ApiResponse> {
-        return this.uploadFileRaw(requestParameters);
-    }
-
 }
 
 /**
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
index 2fd95a36c91..7cabae3dfe9 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
@@ -38,7 +38,7 @@ export class StoreApi extends BaseAPI {
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      */
-    deleteOrderRaw(requestParameters: DeleteOrderRequest): Observable<void> {
+    deleteOrder(requestParameters: DeleteOrderRequest): Observable<void> {
         if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
             throw new RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
@@ -55,19 +55,11 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
-    deleteOrder(requestParameters: DeleteOrderRequest): Observable<void> {
-        return this.deleteOrderRaw(requestParameters);
-    }
-
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
-    getInventoryRaw(): Observable<{ [key: string]: number; }> {
+    getInventory(): Observable<{ [key: string]: number; }> {
         const queryParameters: HttpQuery = {};
 
         const headerParameters: HttpHeaders = {};
@@ -84,19 +76,11 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
-    getInventory(): Observable<{ [key: string]: number; }> {
-        return this.getInventoryRaw();
-    }
-
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      */
-    getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Observable<Order> {
+    getOrderById(requestParameters: GetOrderByIdRequest): Observable<Order> {
         if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
             throw new RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
@@ -113,18 +97,10 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
-    getOrderById(requestParameters: GetOrderByIdRequest): Observable<Order> {
-        return this.getOrderByIdRaw(requestParameters);
-    }
-
     /**
      * Place an order for a pet
      */
-    placeOrderRaw(requestParameters: PlaceOrderRequest): Observable<Order> {
+    placeOrder(requestParameters: PlaceOrderRequest): Observable<Order> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
@@ -144,11 +120,4 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * Place an order for a pet
-     */
-    placeOrder(requestParameters: PlaceOrderRequest): Observable<Order> {
-        return this.placeOrderRaw(requestParameters);
-    }
-
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
index 68926aa8fd4..72c539c2e0c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
@@ -56,7 +56,7 @@ export class UserApi extends BaseAPI {
      * This can only be done by the logged in user.
      * Create user
      */
-    createUserRaw(requestParameters: CreateUserRequest): Observable<void> {
+    createUser(requestParameters: CreateUserRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
@@ -76,18 +76,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
-    createUser(requestParameters: CreateUserRequest): Observable<void> {
-        return this.createUserRaw(requestParameters);
-    }
-
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
+    createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
@@ -110,14 +102,7 @@ export class UserApi extends BaseAPI {
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
-        return this.createUsersWithArrayInputRaw(requestParameters);
-    }
-
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
+    createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
@@ -137,18 +122,11 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
-        return this.createUsersWithListInputRaw(requestParameters);
-    }
-
     /**
      * This can only be done by the logged in user.
      * Delete user
      */
-    deleteUserRaw(requestParameters: DeleteUserRequest): Observable<void> {
+    deleteUser(requestParameters: DeleteUserRequest): Observable<void> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
@@ -165,18 +143,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
-    deleteUser(requestParameters: DeleteUserRequest): Observable<void> {
-        return this.deleteUserRaw(requestParameters);
-    }
-
     /**
      * Get user by user name
      */
-    getUserByNameRaw(requestParameters: GetUserByNameRequest): Observable<User> {
+    getUserByName(requestParameters: GetUserByNameRequest): Observable<User> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
@@ -193,17 +163,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Get user by user name
-     */
-    getUserByName(requestParameters: GetUserByNameRequest): Observable<User> {
-        return this.getUserByNameRaw(requestParameters);
-    }
-
     /**
      * Logs user into the system
      */
-    loginUserRaw(requestParameters: LoginUserRequest): Observable<string> {
+    loginUser(requestParameters: LoginUserRequest): Observable<string> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.');
         }
@@ -232,17 +195,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Logs user into the system
-     */
-    loginUser(requestParameters: LoginUserRequest): Observable<string> {
-        return this.loginUserRaw(requestParameters);
-    }
-
     /**
      * Logs out current logged in user session
      */
-    logoutUserRaw(): Observable<void> {
+    logoutUser(): Observable<void> {
         const queryParameters: HttpQuery = {};
 
         const headerParameters: HttpHeaders = {};
@@ -255,18 +211,11 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Logs out current logged in user session
-     */
-    logoutUser(): Observable<void> {
-        return this.logoutUserRaw();
-    }
-
     /**
      * This can only be done by the logged in user.
      * Updated user
      */
-    updateUserRaw(requestParameters: UpdateUserRequest): Observable<void> {
+    updateUser(requestParameters: UpdateUserRequest): Observable<void> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
         }
@@ -290,12 +239,4 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
-    updateUser(requestParameters: UpdateUserRequest): Observable<void> {
-        return this.updateUserRaw(requestParameters);
-    }
-
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
index f057ab1e3d4..033c9bed237 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
@@ -63,7 +63,7 @@ export class PetApi extends BaseAPI {
     /**
      * Add a new pet to the store
      */
-    addPetRaw(requestParameters: AddPetRequest): Observable<void> {
+    addPet(requestParameters: AddPetRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
@@ -92,17 +92,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Add a new pet to the store
-     */
-    addPet(requestParameters: AddPetRequest): Observable<void> {
-        return this.addPetRaw(requestParameters);
-    }
-
     /**
      * Deletes a pet
      */
-    deletePetRaw(requestParameters: DeletePetRequest): Observable<void> {
+    deletePet(requestParameters: DeletePetRequest): Observable<void> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
@@ -132,18 +125,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Deletes a pet
-     */
-    deletePet(requestParameters: DeletePetRequest): Observable<void> {
-        return this.deletePetRaw(requestParameters);
-    }
-
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      */
-    findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
+    findPetsByStatus(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
         if (requestParameters.status === null || requestParameters.status === undefined) {
             throw new RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
@@ -173,19 +159,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
-    findPetsByStatus(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
-        return this.findPetsByStatusRaw(requestParameters);
-    }
-
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      */
-    findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
+    findPetsByTags(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
         if (requestParameters.tags === null || requestParameters.tags === undefined) {
             throw new RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
@@ -215,19 +193,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
-    findPetsByTags(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
-        return this.findPetsByTagsRaw(requestParameters);
-    }
-
     /**
      * Returns a single pet
      * Find pet by ID
      */
-    getPetByIdRaw(requestParameters: GetPetByIdRequest): Observable<Pet> {
+    getPetById(requestParameters: GetPetByIdRequest): Observable<Pet> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
@@ -248,18 +218,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
-    getPetById(requestParameters: GetPetByIdRequest): Observable<Pet> {
-        return this.getPetByIdRaw(requestParameters);
-    }
-
     /**
      * Update an existing pet
      */
-    updatePetRaw(requestParameters: UpdatePetRequest): Observable<void> {
+    updatePet(requestParameters: UpdatePetRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
@@ -288,17 +250,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Update an existing pet
-     */
-    updatePet(requestParameters: UpdatePetRequest): Observable<void> {
-        return this.updatePetRaw(requestParameters);
-    }
-
     /**
      * Updates a pet in the store with form data
      */
-    updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Observable<void> {
+    updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Observable<void> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
@@ -334,17 +289,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Updates a pet in the store with form data
-     */
-    updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Observable<void> {
-        return this.updatePetWithFormRaw(requestParameters);
-    }
-
     /**
      * uploads an image
      */
-    uploadFileRaw(requestParameters: UploadFileRequest): Observable<ApiResponse> {
+    uploadFile(requestParameters: UploadFileRequest): Observable<ApiResponse> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
@@ -380,13 +328,6 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * uploads an image
-     */
-    uploadFile(requestParameters: UploadFileRequest): Observable<ApiResponse> {
-        return this.uploadFileRaw(requestParameters);
-    }
-
 }
 
 /**
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
index 2fd95a36c91..7cabae3dfe9 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
@@ -38,7 +38,7 @@ export class StoreApi extends BaseAPI {
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      */
-    deleteOrderRaw(requestParameters: DeleteOrderRequest): Observable<void> {
+    deleteOrder(requestParameters: DeleteOrderRequest): Observable<void> {
         if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
             throw new RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
@@ -55,19 +55,11 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
-    deleteOrder(requestParameters: DeleteOrderRequest): Observable<void> {
-        return this.deleteOrderRaw(requestParameters);
-    }
-
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
-    getInventoryRaw(): Observable<{ [key: string]: number; }> {
+    getInventory(): Observable<{ [key: string]: number; }> {
         const queryParameters: HttpQuery = {};
 
         const headerParameters: HttpHeaders = {};
@@ -84,19 +76,11 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
-    getInventory(): Observable<{ [key: string]: number; }> {
-        return this.getInventoryRaw();
-    }
-
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      */
-    getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Observable<Order> {
+    getOrderById(requestParameters: GetOrderByIdRequest): Observable<Order> {
         if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
             throw new RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
@@ -113,18 +97,10 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
-    getOrderById(requestParameters: GetOrderByIdRequest): Observable<Order> {
-        return this.getOrderByIdRaw(requestParameters);
-    }
-
     /**
      * Place an order for a pet
      */
-    placeOrderRaw(requestParameters: PlaceOrderRequest): Observable<Order> {
+    placeOrder(requestParameters: PlaceOrderRequest): Observable<Order> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
@@ -144,11 +120,4 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * Place an order for a pet
-     */
-    placeOrder(requestParameters: PlaceOrderRequest): Observable<Order> {
-        return this.placeOrderRaw(requestParameters);
-    }
-
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
index 68926aa8fd4..72c539c2e0c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
@@ -56,7 +56,7 @@ export class UserApi extends BaseAPI {
      * This can only be done by the logged in user.
      * Create user
      */
-    createUserRaw(requestParameters: CreateUserRequest): Observable<void> {
+    createUser(requestParameters: CreateUserRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
@@ -76,18 +76,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
-    createUser(requestParameters: CreateUserRequest): Observable<void> {
-        return this.createUserRaw(requestParameters);
-    }
-
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
+    createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
@@ -110,14 +102,7 @@ export class UserApi extends BaseAPI {
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
-        return this.createUsersWithArrayInputRaw(requestParameters);
-    }
-
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
+    createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
@@ -137,18 +122,11 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
-        return this.createUsersWithListInputRaw(requestParameters);
-    }
-
     /**
      * This can only be done by the logged in user.
      * Delete user
      */
-    deleteUserRaw(requestParameters: DeleteUserRequest): Observable<void> {
+    deleteUser(requestParameters: DeleteUserRequest): Observable<void> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
@@ -165,18 +143,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
-    deleteUser(requestParameters: DeleteUserRequest): Observable<void> {
-        return this.deleteUserRaw(requestParameters);
-    }
-
     /**
      * Get user by user name
      */
-    getUserByNameRaw(requestParameters: GetUserByNameRequest): Observable<User> {
+    getUserByName(requestParameters: GetUserByNameRequest): Observable<User> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
@@ -193,17 +163,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Get user by user name
-     */
-    getUserByName(requestParameters: GetUserByNameRequest): Observable<User> {
-        return this.getUserByNameRaw(requestParameters);
-    }
-
     /**
      * Logs user into the system
      */
-    loginUserRaw(requestParameters: LoginUserRequest): Observable<string> {
+    loginUser(requestParameters: LoginUserRequest): Observable<string> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.');
         }
@@ -232,17 +195,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Logs user into the system
-     */
-    loginUser(requestParameters: LoginUserRequest): Observable<string> {
-        return this.loginUserRaw(requestParameters);
-    }
-
     /**
      * Logs out current logged in user session
      */
-    logoutUserRaw(): Observable<void> {
+    logoutUser(): Observable<void> {
         const queryParameters: HttpQuery = {};
 
         const headerParameters: HttpHeaders = {};
@@ -255,18 +211,11 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Logs out current logged in user session
-     */
-    logoutUser(): Observable<void> {
-        return this.logoutUserRaw();
-    }
-
     /**
      * This can only be done by the logged in user.
      * Updated user
      */
-    updateUserRaw(requestParameters: UpdateUserRequest): Observable<void> {
+    updateUser(requestParameters: UpdateUserRequest): Observable<void> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
         }
@@ -290,12 +239,4 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
-    updateUser(requestParameters: UpdateUserRequest): Observable<void> {
-        return this.updateUserRaw(requestParameters);
-    }
-
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
index f057ab1e3d4..033c9bed237 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
@@ -63,7 +63,7 @@ export class PetApi extends BaseAPI {
     /**
      * Add a new pet to the store
      */
-    addPetRaw(requestParameters: AddPetRequest): Observable<void> {
+    addPet(requestParameters: AddPetRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
         }
@@ -92,17 +92,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Add a new pet to the store
-     */
-    addPet(requestParameters: AddPetRequest): Observable<void> {
-        return this.addPetRaw(requestParameters);
-    }
-
     /**
      * Deletes a pet
      */
-    deletePetRaw(requestParameters: DeletePetRequest): Observable<void> {
+    deletePet(requestParameters: DeletePetRequest): Observable<void> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
         }
@@ -132,18 +125,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Deletes a pet
-     */
-    deletePet(requestParameters: DeletePetRequest): Observable<void> {
-        return this.deletePetRaw(requestParameters);
-    }
-
     /**
      * Multiple status values can be provided with comma separated strings
      * Finds Pets by status
      */
-    findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
+    findPetsByStatus(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
         if (requestParameters.status === null || requestParameters.status === undefined) {
             throw new RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
         }
@@ -173,19 +159,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
-    findPetsByStatus(requestParameters: FindPetsByStatusRequest): Observable<Array<Pet>> {
-        return this.findPetsByStatusRaw(requestParameters);
-    }
-
     /**
      * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
      * Finds Pets by tags
      */
-    findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
+    findPetsByTags(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
         if (requestParameters.tags === null || requestParameters.tags === undefined) {
             throw new RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
         }
@@ -215,19 +193,11 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
-    findPetsByTags(requestParameters: FindPetsByTagsRequest): Observable<Array<Pet>> {
-        return this.findPetsByTagsRaw(requestParameters);
-    }
-
     /**
      * Returns a single pet
      * Find pet by ID
      */
-    getPetByIdRaw(requestParameters: GetPetByIdRequest): Observable<Pet> {
+    getPetById(requestParameters: GetPetByIdRequest): Observable<Pet> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
         }
@@ -248,18 +218,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
-    getPetById(requestParameters: GetPetByIdRequest): Observable<Pet> {
-        return this.getPetByIdRaw(requestParameters);
-    }
-
     /**
      * Update an existing pet
      */
-    updatePetRaw(requestParameters: UpdatePetRequest): Observable<void> {
+    updatePet(requestParameters: UpdatePetRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
         }
@@ -288,17 +250,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Update an existing pet
-     */
-    updatePet(requestParameters: UpdatePetRequest): Observable<void> {
-        return this.updatePetRaw(requestParameters);
-    }
-
     /**
      * Updates a pet in the store with form data
      */
-    updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Observable<void> {
+    updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Observable<void> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
         }
@@ -334,17 +289,10 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * Updates a pet in the store with form data
-     */
-    updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Observable<void> {
-        return this.updatePetWithFormRaw(requestParameters);
-    }
-
     /**
      * uploads an image
      */
-    uploadFileRaw(requestParameters: UploadFileRequest): Observable<ApiResponse> {
+    uploadFile(requestParameters: UploadFileRequest): Observable<ApiResponse> {
         if (requestParameters.petId === null || requestParameters.petId === undefined) {
             throw new RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
         }
@@ -380,13 +328,6 @@ export class PetApi extends BaseAPI {
         });
     }
 
-    /**
-     * uploads an image
-     */
-    uploadFile(requestParameters: UploadFileRequest): Observable<ApiResponse> {
-        return this.uploadFileRaw(requestParameters);
-    }
-
 }
 
 /**
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
index 2fd95a36c91..7cabae3dfe9 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
@@ -38,7 +38,7 @@ export class StoreApi extends BaseAPI {
      * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
      * Delete purchase order by ID
      */
-    deleteOrderRaw(requestParameters: DeleteOrderRequest): Observable<void> {
+    deleteOrder(requestParameters: DeleteOrderRequest): Observable<void> {
         if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
             throw new RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
         }
@@ -55,19 +55,11 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
-    deleteOrder(requestParameters: DeleteOrderRequest): Observable<void> {
-        return this.deleteOrderRaw(requestParameters);
-    }
-
     /**
      * Returns a map of status codes to quantities
      * Returns pet inventories by status
      */
-    getInventoryRaw(): Observable<{ [key: string]: number; }> {
+    getInventory(): Observable<{ [key: string]: number; }> {
         const queryParameters: HttpQuery = {};
 
         const headerParameters: HttpHeaders = {};
@@ -84,19 +76,11 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
-    getInventory(): Observable<{ [key: string]: number; }> {
-        return this.getInventoryRaw();
-    }
-
     /**
      * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
      * Find purchase order by ID
      */
-    getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Observable<Order> {
+    getOrderById(requestParameters: GetOrderByIdRequest): Observable<Order> {
         if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
             throw new RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
         }
@@ -113,18 +97,10 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
-    getOrderById(requestParameters: GetOrderByIdRequest): Observable<Order> {
-        return this.getOrderByIdRaw(requestParameters);
-    }
-
     /**
      * Place an order for a pet
      */
-    placeOrderRaw(requestParameters: PlaceOrderRequest): Observable<Order> {
+    placeOrder(requestParameters: PlaceOrderRequest): Observable<Order> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
         }
@@ -144,11 +120,4 @@ export class StoreApi extends BaseAPI {
         });
     }
 
-    /**
-     * Place an order for a pet
-     */
-    placeOrder(requestParameters: PlaceOrderRequest): Observable<Order> {
-        return this.placeOrderRaw(requestParameters);
-    }
-
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
index 68926aa8fd4..72c539c2e0c 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
@@ -56,7 +56,7 @@ export class UserApi extends BaseAPI {
      * This can only be done by the logged in user.
      * Create user
      */
-    createUserRaw(requestParameters: CreateUserRequest): Observable<void> {
+    createUser(requestParameters: CreateUserRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
         }
@@ -76,18 +76,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
-    createUser(requestParameters: CreateUserRequest): Observable<void> {
-        return this.createUserRaw(requestParameters);
-    }
-
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
+    createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
         }
@@ -110,14 +102,7 @@ export class UserApi extends BaseAPI {
     /**
      * Creates list of users with given input array
      */
-    createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Observable<void> {
-        return this.createUsersWithArrayInputRaw(requestParameters);
-    }
-
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
+    createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
         if (requestParameters.body === null || requestParameters.body === undefined) {
             throw new RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
         }
@@ -137,18 +122,11 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Creates list of users with given input array
-     */
-    createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Observable<void> {
-        return this.createUsersWithListInputRaw(requestParameters);
-    }
-
     /**
      * This can only be done by the logged in user.
      * Delete user
      */
-    deleteUserRaw(requestParameters: DeleteUserRequest): Observable<void> {
+    deleteUser(requestParameters: DeleteUserRequest): Observable<void> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
         }
@@ -165,18 +143,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
-    deleteUser(requestParameters: DeleteUserRequest): Observable<void> {
-        return this.deleteUserRaw(requestParameters);
-    }
-
     /**
      * Get user by user name
      */
-    getUserByNameRaw(requestParameters: GetUserByNameRequest): Observable<User> {
+    getUserByName(requestParameters: GetUserByNameRequest): Observable<User> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
         }
@@ -193,17 +163,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Get user by user name
-     */
-    getUserByName(requestParameters: GetUserByNameRequest): Observable<User> {
-        return this.getUserByNameRaw(requestParameters);
-    }
-
     /**
      * Logs user into the system
      */
-    loginUserRaw(requestParameters: LoginUserRequest): Observable<string> {
+    loginUser(requestParameters: LoginUserRequest): Observable<string> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.');
         }
@@ -232,17 +195,10 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Logs user into the system
-     */
-    loginUser(requestParameters: LoginUserRequest): Observable<string> {
-        return this.loginUserRaw(requestParameters);
-    }
-
     /**
      * Logs out current logged in user session
      */
-    logoutUserRaw(): Observable<void> {
+    logoutUser(): Observable<void> {
         const queryParameters: HttpQuery = {};
 
         const headerParameters: HttpHeaders = {};
@@ -255,18 +211,11 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * Logs out current logged in user session
-     */
-    logoutUser(): Observable<void> {
-        return this.logoutUserRaw();
-    }
-
     /**
      * This can only be done by the logged in user.
      * Updated user
      */
-    updateUserRaw(requestParameters: UpdateUserRequest): Observable<void> {
+    updateUser(requestParameters: UpdateUserRequest): Observable<void> {
         if (requestParameters.username === null || requestParameters.username === undefined) {
             throw new RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
         }
@@ -290,12 +239,4 @@ export class UserApi extends BaseAPI {
         });
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
-    updateUser(requestParameters: UpdateUserRequest): Observable<void> {
-        return this.updateUserRaw(requestParameters);
-    }
-
 }