diff --git a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/Departments.java b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/Departments.java
index fca31e4619c91..ee3ec99c8b898 100644
--- a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/Departments.java
+++ b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/Departments.java
@@ -23,7 +23,7 @@ public interface Departments extends HasInner<DepartmentsInner> {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<DepartmentListResult> listByBillingAccountAsync(String billingAccountName);
+    Observable<DepartmentListResult> listByBillingAccountNameAsync(String billingAccountName);
 
     /**
      * Get the department by id.
diff --git a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/EnrollmentAccounts.java b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/EnrollmentAccounts.java
index fd18081164f1d..223746844310e 100644
--- a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/EnrollmentAccounts.java
+++ b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/EnrollmentAccounts.java
@@ -23,7 +23,7 @@ public interface EnrollmentAccounts extends HasInner<EnrollmentAccountsInner> {
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<EnrollmentAccountListResult> listByBillingAccountAsync(String billingAccountName);
+    Observable<EnrollmentAccountListResult> listByBillingAccountNameAsync(String billingAccountName);
 
     /**
      * Get the enrollment account by id.
diff --git a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/DepartmentsImpl.java b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/DepartmentsImpl.java
index be5024abca751..e4f534ea3c37c 100644
--- a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/DepartmentsImpl.java
+++ b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/DepartmentsImpl.java
@@ -33,9 +33,9 @@ private DepartmentImpl wrapModel(DepartmentInner inner) {
     }
 
     @Override
-    public Observable<DepartmentListResult> listByBillingAccountAsync(String billingAccountName) {
+    public Observable<DepartmentListResult> listByBillingAccountNameAsync(String billingAccountName) {
         DepartmentsInner client = this.inner();
-        return client.listByBillingAccountAsync(billingAccountName)
+        return client.listByBillingAccountNameAsync(billingAccountName)
         .map(new Func1<DepartmentListResultInner, DepartmentListResult>() {
             @Override
             public DepartmentListResult call(DepartmentListResultInner inner) {
diff --git a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/DepartmentsInner.java b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/DepartmentsInner.java
index 662ab394fff20..ecc73c61fd1a9 100644
--- a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/DepartmentsInner.java
+++ b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/DepartmentsInner.java
@@ -51,9 +51,9 @@ public DepartmentsInner(Retrofit retrofit, BillingManagementClientImpl client) {
      * used by Retrofit to perform actually REST calls.
      */
     interface DepartmentsService {
-        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.billing.v2019_10_01_preview.Departments listByBillingAccount" })
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.billing.v2019_10_01_preview.Departments listByBillingAccountName" })
         @GET("providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments")
-        Observable<Response<ResponseBody>> listByBillingAccount(@Path("billingAccountName") String billingAccountName, @Query("api-version") String apiVersion, @Query("$expand") String expand, @Query("$filter") String filter, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listByBillingAccountName(@Path("billingAccountName") String billingAccountName, @Query("api-version") String apiVersion, @Query("$expand") String expand, @Query("$filter") String filter, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.billing.v2019_10_01_preview.Departments get" })
         @GET("providers/Microsoft.Billing/billingAccounts/{billingAccountName}/departments/{departmentName}")
@@ -70,8 +70,8 @@ interface DepartmentsService {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the DepartmentListResultInner object if successful.
      */
-    public DepartmentListResultInner listByBillingAccount(String billingAccountName) {
-        return listByBillingAccountWithServiceResponseAsync(billingAccountName).toBlocking().single().body();
+    public DepartmentListResultInner listByBillingAccountName(String billingAccountName) {
+        return listByBillingAccountNameWithServiceResponseAsync(billingAccountName).toBlocking().single().body();
     }
 
     /**
@@ -82,8 +82,8 @@ public DepartmentListResultInner listByBillingAccount(String billingAccountName)
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<DepartmentListResultInner> listByBillingAccountAsync(String billingAccountName, final ServiceCallback<DepartmentListResultInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listByBillingAccountWithServiceResponseAsync(billingAccountName), serviceCallback);
+    public ServiceFuture<DepartmentListResultInner> listByBillingAccountNameAsync(String billingAccountName, final ServiceCallback<DepartmentListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listByBillingAccountNameWithServiceResponseAsync(billingAccountName), serviceCallback);
     }
 
     /**
@@ -93,8 +93,8 @@ public ServiceFuture<DepartmentListResultInner> listByBillingAccountAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the DepartmentListResultInner object
      */
-    public Observable<DepartmentListResultInner> listByBillingAccountAsync(String billingAccountName) {
-        return listByBillingAccountWithServiceResponseAsync(billingAccountName).map(new Func1<ServiceResponse<DepartmentListResultInner>, DepartmentListResultInner>() {
+    public Observable<DepartmentListResultInner> listByBillingAccountNameAsync(String billingAccountName) {
+        return listByBillingAccountNameWithServiceResponseAsync(billingAccountName).map(new Func1<ServiceResponse<DepartmentListResultInner>, DepartmentListResultInner>() {
             @Override
             public DepartmentListResultInner call(ServiceResponse<DepartmentListResultInner> response) {
                 return response.body();
@@ -109,7 +109,7 @@ public DepartmentListResultInner call(ServiceResponse<DepartmentListResultInner>
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the DepartmentListResultInner object
      */
-    public Observable<ServiceResponse<DepartmentListResultInner>> listByBillingAccountWithServiceResponseAsync(String billingAccountName) {
+    public Observable<ServiceResponse<DepartmentListResultInner>> listByBillingAccountNameWithServiceResponseAsync(String billingAccountName) {
         if (billingAccountName == null) {
             throw new IllegalArgumentException("Parameter billingAccountName is required and cannot be null.");
         }
@@ -118,12 +118,12 @@ public Observable<ServiceResponse<DepartmentListResultInner>> listByBillingAccou
         }
         final String expand = null;
         final String filter = null;
-        return service.listByBillingAccount(billingAccountName, this.client.apiVersion(), expand, filter, this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByBillingAccountName(billingAccountName, this.client.apiVersion(), expand, filter, this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DepartmentListResultInner>>>() {
                 @Override
                 public Observable<ServiceResponse<DepartmentListResultInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<DepartmentListResultInner> clientResponse = listByBillingAccountDelegate(response);
+                        ServiceResponse<DepartmentListResultInner> clientResponse = listByBillingAccountNameDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -143,8 +143,8 @@ public Observable<ServiceResponse<DepartmentListResultInner>> call(Response<Resp
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the DepartmentListResultInner object if successful.
      */
-    public DepartmentListResultInner listByBillingAccount(String billingAccountName, String expand, String filter) {
-        return listByBillingAccountWithServiceResponseAsync(billingAccountName, expand, filter).toBlocking().single().body();
+    public DepartmentListResultInner listByBillingAccountName(String billingAccountName, String expand, String filter) {
+        return listByBillingAccountNameWithServiceResponseAsync(billingAccountName, expand, filter).toBlocking().single().body();
     }
 
     /**
@@ -157,8 +157,8 @@ public DepartmentListResultInner listByBillingAccount(String billingAccountName,
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<DepartmentListResultInner> listByBillingAccountAsync(String billingAccountName, String expand, String filter, final ServiceCallback<DepartmentListResultInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listByBillingAccountWithServiceResponseAsync(billingAccountName, expand, filter), serviceCallback);
+    public ServiceFuture<DepartmentListResultInner> listByBillingAccountNameAsync(String billingAccountName, String expand, String filter, final ServiceCallback<DepartmentListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listByBillingAccountNameWithServiceResponseAsync(billingAccountName, expand, filter), serviceCallback);
     }
 
     /**
@@ -170,8 +170,8 @@ public ServiceFuture<DepartmentListResultInner> listByBillingAccountAsync(String
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the DepartmentListResultInner object
      */
-    public Observable<DepartmentListResultInner> listByBillingAccountAsync(String billingAccountName, String expand, String filter) {
-        return listByBillingAccountWithServiceResponseAsync(billingAccountName, expand, filter).map(new Func1<ServiceResponse<DepartmentListResultInner>, DepartmentListResultInner>() {
+    public Observable<DepartmentListResultInner> listByBillingAccountNameAsync(String billingAccountName, String expand, String filter) {
+        return listByBillingAccountNameWithServiceResponseAsync(billingAccountName, expand, filter).map(new Func1<ServiceResponse<DepartmentListResultInner>, DepartmentListResultInner>() {
             @Override
             public DepartmentListResultInner call(ServiceResponse<DepartmentListResultInner> response) {
                 return response.body();
@@ -188,19 +188,19 @@ public DepartmentListResultInner call(ServiceResponse<DepartmentListResultInner>
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the DepartmentListResultInner object
      */
-    public Observable<ServiceResponse<DepartmentListResultInner>> listByBillingAccountWithServiceResponseAsync(String billingAccountName, String expand, String filter) {
+    public Observable<ServiceResponse<DepartmentListResultInner>> listByBillingAccountNameWithServiceResponseAsync(String billingAccountName, String expand, String filter) {
         if (billingAccountName == null) {
             throw new IllegalArgumentException("Parameter billingAccountName is required and cannot be null.");
         }
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.listByBillingAccount(billingAccountName, this.client.apiVersion(), expand, filter, this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByBillingAccountName(billingAccountName, this.client.apiVersion(), expand, filter, this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<DepartmentListResultInner>>>() {
                 @Override
                 public Observable<ServiceResponse<DepartmentListResultInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<DepartmentListResultInner> clientResponse = listByBillingAccountDelegate(response);
+                        ServiceResponse<DepartmentListResultInner> clientResponse = listByBillingAccountNameDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -209,7 +209,7 @@ public Observable<ServiceResponse<DepartmentListResultInner>> call(Response<Resp
             });
     }
 
-    private ServiceResponse<DepartmentListResultInner> listByBillingAccountDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+    private ServiceResponse<DepartmentListResultInner> listByBillingAccountNameDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<DepartmentListResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<DepartmentListResultInner>() { }.getType())
                 .registerError(ErrorResponseException.class)
diff --git a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/EnrollmentAccountsImpl.java b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/EnrollmentAccountsImpl.java
index 20d8743915a58..937bbde483b6e 100644
--- a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/EnrollmentAccountsImpl.java
+++ b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/EnrollmentAccountsImpl.java
@@ -33,9 +33,9 @@ private EnrollmentAccountImpl wrapModel(EnrollmentAccountInner inner) {
     }
 
     @Override
-    public Observable<EnrollmentAccountListResult> listByBillingAccountAsync(String billingAccountName) {
+    public Observable<EnrollmentAccountListResult> listByBillingAccountNameAsync(String billingAccountName) {
         EnrollmentAccountsInner client = this.inner();
-        return client.listByBillingAccountAsync(billingAccountName)
+        return client.listByBillingAccountNameAsync(billingAccountName)
         .map(new Func1<EnrollmentAccountListResultInner, EnrollmentAccountListResult>() {
             @Override
             public EnrollmentAccountListResult call(EnrollmentAccountListResultInner inner) {
diff --git a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/EnrollmentAccountsInner.java b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/EnrollmentAccountsInner.java
index 536f275a2d580..37e09e04fe11a 100644
--- a/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/EnrollmentAccountsInner.java
+++ b/billing/resource-manager/v2019_10_01_preview/src/main/java/com/microsoft/azure/management/billing/v2019_10_01_preview/implementation/EnrollmentAccountsInner.java
@@ -51,9 +51,9 @@ public EnrollmentAccountsInner(Retrofit retrofit, BillingManagementClientImpl cl
      * used by Retrofit to perform actually REST calls.
      */
     interface EnrollmentAccountsService {
-        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.billing.v2019_10_01_preview.EnrollmentAccounts listByBillingAccount" })
+        @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.billing.v2019_10_01_preview.EnrollmentAccounts listByBillingAccountName" })
         @GET("providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts")
-        Observable<Response<ResponseBody>> listByBillingAccount(@Path("billingAccountName") String billingAccountName, @Query("api-version") String apiVersion, @Query("$expand") String expand, @Query("$filter") String filter, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
+        Observable<Response<ResponseBody>> listByBillingAccountName(@Path("billingAccountName") String billingAccountName, @Query("api-version") String apiVersion, @Query("$expand") String expand, @Query("$filter") String filter, @Header("accept-language") String acceptLanguage, @Header("User-Agent") String userAgent);
 
         @Headers({ "Content-Type: application/json; charset=utf-8", "x-ms-logging-context: com.microsoft.azure.management.billing.v2019_10_01_preview.EnrollmentAccounts getByEnrollmentAccountId" })
         @GET("providers/Microsoft.Billing/billingAccounts/{billingAccountName}/enrollmentAccounts/{enrollmentAccountName}")
@@ -70,8 +70,8 @@ interface EnrollmentAccountsService {
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the EnrollmentAccountListResultInner object if successful.
      */
-    public EnrollmentAccountListResultInner listByBillingAccount(String billingAccountName) {
-        return listByBillingAccountWithServiceResponseAsync(billingAccountName).toBlocking().single().body();
+    public EnrollmentAccountListResultInner listByBillingAccountName(String billingAccountName) {
+        return listByBillingAccountNameWithServiceResponseAsync(billingAccountName).toBlocking().single().body();
     }
 
     /**
@@ -82,8 +82,8 @@ public EnrollmentAccountListResultInner listByBillingAccount(String billingAccou
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<EnrollmentAccountListResultInner> listByBillingAccountAsync(String billingAccountName, final ServiceCallback<EnrollmentAccountListResultInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listByBillingAccountWithServiceResponseAsync(billingAccountName), serviceCallback);
+    public ServiceFuture<EnrollmentAccountListResultInner> listByBillingAccountNameAsync(String billingAccountName, final ServiceCallback<EnrollmentAccountListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listByBillingAccountNameWithServiceResponseAsync(billingAccountName), serviceCallback);
     }
 
     /**
@@ -93,8 +93,8 @@ public ServiceFuture<EnrollmentAccountListResultInner> listByBillingAccountAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the EnrollmentAccountListResultInner object
      */
-    public Observable<EnrollmentAccountListResultInner> listByBillingAccountAsync(String billingAccountName) {
-        return listByBillingAccountWithServiceResponseAsync(billingAccountName).map(new Func1<ServiceResponse<EnrollmentAccountListResultInner>, EnrollmentAccountListResultInner>() {
+    public Observable<EnrollmentAccountListResultInner> listByBillingAccountNameAsync(String billingAccountName) {
+        return listByBillingAccountNameWithServiceResponseAsync(billingAccountName).map(new Func1<ServiceResponse<EnrollmentAccountListResultInner>, EnrollmentAccountListResultInner>() {
             @Override
             public EnrollmentAccountListResultInner call(ServiceResponse<EnrollmentAccountListResultInner> response) {
                 return response.body();
@@ -109,7 +109,7 @@ public EnrollmentAccountListResultInner call(ServiceResponse<EnrollmentAccountLi
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the EnrollmentAccountListResultInner object
      */
-    public Observable<ServiceResponse<EnrollmentAccountListResultInner>> listByBillingAccountWithServiceResponseAsync(String billingAccountName) {
+    public Observable<ServiceResponse<EnrollmentAccountListResultInner>> listByBillingAccountNameWithServiceResponseAsync(String billingAccountName) {
         if (billingAccountName == null) {
             throw new IllegalArgumentException("Parameter billingAccountName is required and cannot be null.");
         }
@@ -118,12 +118,12 @@ public Observable<ServiceResponse<EnrollmentAccountListResultInner>> listByBilli
         }
         final String expand = null;
         final String filter = null;
-        return service.listByBillingAccount(billingAccountName, this.client.apiVersion(), expand, filter, this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByBillingAccountName(billingAccountName, this.client.apiVersion(), expand, filter, this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EnrollmentAccountListResultInner>>>() {
                 @Override
                 public Observable<ServiceResponse<EnrollmentAccountListResultInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<EnrollmentAccountListResultInner> clientResponse = listByBillingAccountDelegate(response);
+                        ServiceResponse<EnrollmentAccountListResultInner> clientResponse = listByBillingAccountNameDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -143,8 +143,8 @@ public Observable<ServiceResponse<EnrollmentAccountListResultInner>> call(Respon
      * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent
      * @return the EnrollmentAccountListResultInner object if successful.
      */
-    public EnrollmentAccountListResultInner listByBillingAccount(String billingAccountName, String expand, String filter) {
-        return listByBillingAccountWithServiceResponseAsync(billingAccountName, expand, filter).toBlocking().single().body();
+    public EnrollmentAccountListResultInner listByBillingAccountName(String billingAccountName, String expand, String filter) {
+        return listByBillingAccountNameWithServiceResponseAsync(billingAccountName, expand, filter).toBlocking().single().body();
     }
 
     /**
@@ -157,8 +157,8 @@ public EnrollmentAccountListResultInner listByBillingAccount(String billingAccou
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the {@link ServiceFuture} object
      */
-    public ServiceFuture<EnrollmentAccountListResultInner> listByBillingAccountAsync(String billingAccountName, String expand, String filter, final ServiceCallback<EnrollmentAccountListResultInner> serviceCallback) {
-        return ServiceFuture.fromResponse(listByBillingAccountWithServiceResponseAsync(billingAccountName, expand, filter), serviceCallback);
+    public ServiceFuture<EnrollmentAccountListResultInner> listByBillingAccountNameAsync(String billingAccountName, String expand, String filter, final ServiceCallback<EnrollmentAccountListResultInner> serviceCallback) {
+        return ServiceFuture.fromResponse(listByBillingAccountNameWithServiceResponseAsync(billingAccountName, expand, filter), serviceCallback);
     }
 
     /**
@@ -170,8 +170,8 @@ public ServiceFuture<EnrollmentAccountListResultInner> listByBillingAccountAsync
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the EnrollmentAccountListResultInner object
      */
-    public Observable<EnrollmentAccountListResultInner> listByBillingAccountAsync(String billingAccountName, String expand, String filter) {
-        return listByBillingAccountWithServiceResponseAsync(billingAccountName, expand, filter).map(new Func1<ServiceResponse<EnrollmentAccountListResultInner>, EnrollmentAccountListResultInner>() {
+    public Observable<EnrollmentAccountListResultInner> listByBillingAccountNameAsync(String billingAccountName, String expand, String filter) {
+        return listByBillingAccountNameWithServiceResponseAsync(billingAccountName, expand, filter).map(new Func1<ServiceResponse<EnrollmentAccountListResultInner>, EnrollmentAccountListResultInner>() {
             @Override
             public EnrollmentAccountListResultInner call(ServiceResponse<EnrollmentAccountListResultInner> response) {
                 return response.body();
@@ -188,19 +188,19 @@ public EnrollmentAccountListResultInner call(ServiceResponse<EnrollmentAccountLi
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable to the EnrollmentAccountListResultInner object
      */
-    public Observable<ServiceResponse<EnrollmentAccountListResultInner>> listByBillingAccountWithServiceResponseAsync(String billingAccountName, String expand, String filter) {
+    public Observable<ServiceResponse<EnrollmentAccountListResultInner>> listByBillingAccountNameWithServiceResponseAsync(String billingAccountName, String expand, String filter) {
         if (billingAccountName == null) {
             throw new IllegalArgumentException("Parameter billingAccountName is required and cannot be null.");
         }
         if (this.client.apiVersion() == null) {
             throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.");
         }
-        return service.listByBillingAccount(billingAccountName, this.client.apiVersion(), expand, filter, this.client.acceptLanguage(), this.client.userAgent())
+        return service.listByBillingAccountName(billingAccountName, this.client.apiVersion(), expand, filter, this.client.acceptLanguage(), this.client.userAgent())
             .flatMap(new Func1<Response<ResponseBody>, Observable<ServiceResponse<EnrollmentAccountListResultInner>>>() {
                 @Override
                 public Observable<ServiceResponse<EnrollmentAccountListResultInner>> call(Response<ResponseBody> response) {
                     try {
-                        ServiceResponse<EnrollmentAccountListResultInner> clientResponse = listByBillingAccountDelegate(response);
+                        ServiceResponse<EnrollmentAccountListResultInner> clientResponse = listByBillingAccountNameDelegate(response);
                         return Observable.just(clientResponse);
                     } catch (Throwable t) {
                         return Observable.error(t);
@@ -209,7 +209,7 @@ public Observable<ServiceResponse<EnrollmentAccountListResultInner>> call(Respon
             });
     }
 
-    private ServiceResponse<EnrollmentAccountListResultInner> listByBillingAccountDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
+    private ServiceResponse<EnrollmentAccountListResultInner> listByBillingAccountNameDelegate(Response<ResponseBody> response) throws ErrorResponseException, IOException, IllegalArgumentException {
         return this.client.restClient().responseBuilderFactory().<EnrollmentAccountListResultInner, ErrorResponseException>newInstance(this.client.serializerAdapter())
                 .register(200, new TypeToken<EnrollmentAccountListResultInner>() { }.getType())
                 .registerError(ErrorResponseException.class)