From dd16f4cc1f4413f283bcc0855185c0c4e4114b16 Mon Sep 17 00:00:00 2001
From: Yoshi Automation Bot <yoshi-automation@google.com>
Date: Mon, 22 Jun 2020 12:58:28 -0700
Subject: [PATCH] fix: migrate retry settings to grpc_service_config (#194)

This PR was generated using Autosynth. :rainbow:

Synth log will be available here:
https://source.cloud.google.com/results/invocations/8090a8db-78af-43ce-903e-cbc4378c9d99/targets

- [ ] To automatically regenerate this PR, check this box.

PiperOrigin-RevId: 317110673
Source-Link: https://github.com/googleapis/googleapis/commit/fa4d2ecd0804eb92f27a65fe65ce2a554a361b93
---
 README.md                                     |   2 +-
 .../v4beta1/ApplicationServiceClient.java     | 197 +++++++--------
 .../v4beta1/ApplicationServiceSettings.java   |  26 +-
 .../talent/v4beta1/CompanyServiceClient.java  | 197 +++++++--------
 .../v4beta1/CompanyServiceSettings.java       |  26 +-
 .../talent/v4beta1/JobServiceClient.java      | 213 ++++++++---------
 .../talent/v4beta1/JobServiceSettings.java    |  26 +-
 .../talent/v4beta1/ProfileServiceClient.java  | 197 +++++++--------
 .../v4beta1/ProfileServiceSettings.java       |  26 +-
 .../talent/v4beta1/TenantServiceClient.java   | 189 +++++++--------
 .../talent/v4beta1/TenantServiceSettings.java |  26 +-
 .../cloud/talent/v4beta1/package-info.java    |  25 +-
 .../v4beta1/stub/ApplicationServiceStub.java  |   8 +-
 .../stub/ApplicationServiceStubSettings.java  | 224 ++++++++++++++----
 .../v4beta1/stub/CompanyServiceStub.java      |   8 +-
 .../stub/CompanyServiceStubSettings.java      |  92 +++----
 .../v4beta1/stub/CompletionStubSettings.java  |  18 +-
 .../stub/EventServiceStubSettings.java        |  24 +-
 .../stub/GrpcApplicationServiceStub.java      |  64 ++---
 .../v4beta1/stub/GrpcCompanyServiceStub.java  |  56 ++---
 .../v4beta1/stub/GrpcJobServiceStub.java      |  56 ++---
 .../v4beta1/stub/GrpcProfileServiceStub.java  |  56 ++---
 .../v4beta1/stub/GrpcTenantServiceStub.java   |  56 ++---
 .../talent/v4beta1/stub/JobServiceStub.java   |   8 +-
 .../v4beta1/stub/JobServiceStubSettings.java  | 120 +++++-----
 .../v4beta1/stub/ProfileServiceStub.java      |   8 +-
 .../stub/ProfileServiceStubSettings.java      | 100 ++++----
 .../v4beta1/stub/TenantServiceStub.java       |   8 +-
 .../stub/TenantServiceStubSettings.java       | 222 +++++++++++++----
 .../v4beta1/ApplicationServiceClientTest.java |  78 +++---
 .../v4beta1/CompanyServiceClientTest.java     |  76 +++---
 .../talent/v4beta1/JobServiceClientTest.java  |  74 +++---
 .../v4beta1/ProfileServiceClientTest.java     |  74 +++---
 .../v4beta1/TenantServiceClientTest.java      |  74 +++---
 synth.metadata                                |   6 +-
 35 files changed, 1494 insertions(+), 1166 deletions(-)

diff --git a/README.md b/README.md
index 348269d4..a7bad47e 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ If you are using Maven with [BOM][libraries-bom], add this to your pom.xml file
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>libraries-bom</artifactId>
-      <version>5.7.0</version>
+      <version>7.0.0</version>
       <type>pom</type>
       <scope>import</scope>
     </dependency>
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ApplicationServiceClient.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ApplicationServiceClient.java
index 2e95fae0..f101d854 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ApplicationServiceClient.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ApplicationServiceClient.java
@@ -45,8 +45,9 @@
  * <pre>
  * <code>
  * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
- *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
- *   applicationServiceClient.deleteApplication(name);
+ *   ProfileName parent = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
+ *   Application application = Application.newBuilder().build();
+ *   Application response = applicationServiceClient.createApplication(parent, application);
  * }
  * </code>
  * </pre>
@@ -156,102 +157,6 @@ public ApplicationServiceStub getStub() {
     return stub;
   }
 
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified application.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
-   *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
-   *   applicationServiceClient.deleteApplication(name);
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the application to be deleted.
-   *     <p>The format is
-   *     "projects/{project_id}/tenants/{tenant_id}/profiles/{profile_id}/applications/{application_id}".
-   *     For example, "projects/foo/tenants/bar/profiles/baz/applications/qux".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteApplication(ApplicationName name) {
-    DeleteApplicationRequest request =
-        DeleteApplicationRequest.newBuilder()
-            .setName(name == null ? null : name.toString())
-            .build();
-    deleteApplication(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified application.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
-   *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
-   *   applicationServiceClient.deleteApplication(name.toString());
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the application to be deleted.
-   *     <p>The format is
-   *     "projects/{project_id}/tenants/{tenant_id}/profiles/{profile_id}/applications/{application_id}".
-   *     For example, "projects/foo/tenants/bar/profiles/baz/applications/qux".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteApplication(String name) {
-    DeleteApplicationRequest request = DeleteApplicationRequest.newBuilder().setName(name).build();
-    deleteApplication(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified application.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
-   *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
-   *   DeleteApplicationRequest request = DeleteApplicationRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   applicationServiceClient.deleteApplication(request);
-   * }
-   * </code></pre>
-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteApplication(DeleteApplicationRequest request) {
-    deleteApplicationCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified application.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
-   *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
-   *   DeleteApplicationRequest request = DeleteApplicationRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = applicationServiceClient.deleteApplicationCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteApplicationRequest, Empty> deleteApplicationCallable() {
-    return stub.deleteApplicationCallable();
-  }
-
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Creates a new application entity.
@@ -518,6 +423,102 @@ public final UnaryCallable<UpdateApplicationRequest, Application> updateApplicat
     return stub.updateApplicationCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified application.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
+   *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
+   *   applicationServiceClient.deleteApplication(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The resource name of the application to be deleted.
+   *     <p>The format is
+   *     "projects/{project_id}/tenants/{tenant_id}/profiles/{profile_id}/applications/{application_id}".
+   *     For example, "projects/foo/tenants/bar/profiles/baz/applications/qux".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteApplication(ApplicationName name) {
+    DeleteApplicationRequest request =
+        DeleteApplicationRequest.newBuilder()
+            .setName(name == null ? null : name.toString())
+            .build();
+    deleteApplication(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified application.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
+   *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
+   *   applicationServiceClient.deleteApplication(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The resource name of the application to be deleted.
+   *     <p>The format is
+   *     "projects/{project_id}/tenants/{tenant_id}/profiles/{profile_id}/applications/{application_id}".
+   *     For example, "projects/foo/tenants/bar/profiles/baz/applications/qux".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteApplication(String name) {
+    DeleteApplicationRequest request = DeleteApplicationRequest.newBuilder().setName(name).build();
+    deleteApplication(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified application.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
+   *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
+   *   DeleteApplicationRequest request = DeleteApplicationRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   applicationServiceClient.deleteApplication(request);
+   * }
+   * </code></pre>
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteApplication(DeleteApplicationRequest request) {
+    deleteApplicationCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified application.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
+   *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
+   *   DeleteApplicationRequest request = DeleteApplicationRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = applicationServiceClient.deleteApplicationCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteApplicationRequest, Empty> deleteApplicationCallable() {
+    return stub.deleteApplicationCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Lists all applications associated with the profile.
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ApplicationServiceSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ApplicationServiceSettings.java
index 53e393c1..c219b525 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ApplicationServiceSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ApplicationServiceSettings.java
@@ -49,16 +49,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteApplication to 30 seconds:
+ * <p>For example, to set the total timeout of createApplication to 30 seconds:
  *
  * <pre>
  * <code>
  * ApplicationServiceSettings.Builder applicationServiceSettingsBuilder =
  *     ApplicationServiceSettings.newBuilder();
  * applicationServiceSettingsBuilder
- *     .deleteApplicationSettings()
+ *     .createApplicationSettings()
  *     .setRetrySettings(
- *         applicationServiceSettingsBuilder.deleteApplicationSettings().getRetrySettings().toBuilder()
+ *         applicationServiceSettingsBuilder.createApplicationSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * ApplicationServiceSettings applicationServiceSettings = applicationServiceSettingsBuilder.build();
@@ -68,11 +68,6 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class ApplicationServiceSettings extends ClientSettings<ApplicationServiceSettings> {
-  /** Returns the object with the settings used for calls to deleteApplication. */
-  public UnaryCallSettings<DeleteApplicationRequest, Empty> deleteApplicationSettings() {
-    return ((ApplicationServiceStubSettings) getStubSettings()).deleteApplicationSettings();
-  }
-
   /** Returns the object with the settings used for calls to createApplication. */
   public UnaryCallSettings<CreateApplicationRequest, Application> createApplicationSettings() {
     return ((ApplicationServiceStubSettings) getStubSettings()).createApplicationSettings();
@@ -88,6 +83,11 @@ public UnaryCallSettings<UpdateApplicationRequest, Application> updateApplicatio
     return ((ApplicationServiceStubSettings) getStubSettings()).updateApplicationSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteApplication. */
+  public UnaryCallSettings<DeleteApplicationRequest, Empty> deleteApplicationSettings() {
+    return ((ApplicationServiceStubSettings) getStubSettings()).deleteApplicationSettings();
+  }
+
   /** Returns the object with the settings used for calls to listApplications. */
   public PagedCallSettings<
           ListApplicationsRequest, ListApplicationsResponse, ListApplicationsPagedResponse>
@@ -192,11 +192,6 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
-    /** Returns the builder for the settings used for calls to deleteApplication. */
-    public UnaryCallSettings.Builder<DeleteApplicationRequest, Empty> deleteApplicationSettings() {
-      return getStubSettingsBuilder().deleteApplicationSettings();
-    }
-
     /** Returns the builder for the settings used for calls to createApplication. */
     public UnaryCallSettings.Builder<CreateApplicationRequest, Application>
         createApplicationSettings() {
@@ -214,6 +209,11 @@ public UnaryCallSettings.Builder<GetApplicationRequest, Application> getApplicat
       return getStubSettingsBuilder().updateApplicationSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteApplication. */
+    public UnaryCallSettings.Builder<DeleteApplicationRequest, Empty> deleteApplicationSettings() {
+      return getStubSettingsBuilder().deleteApplicationSettings();
+    }
+
     /** Returns the builder for the settings used for calls to listApplications. */
     public PagedCallSettings.Builder<
             ListApplicationsRequest, ListApplicationsResponse, ListApplicationsPagedResponse>
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java
index b462751a..023197f7 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceClient.java
@@ -44,8 +44,9 @@
  * <pre>
  * <code>
  * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
- *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
- *   companyServiceClient.deleteCompany(name);
+ *   TenantName parent = TenantName.of("[PROJECT]", "[TENANT]");
+ *   Company company = Company.newBuilder().build();
+ *   Company response = companyServiceClient.createCompany(parent, company);
  * }
  * </code>
  * </pre>
@@ -154,102 +155,6 @@ public CompanyServiceStub getStub() {
     return stub;
   }
 
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified company. Prerequisite: The company has no jobs associated with it.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
-   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
-   *   companyServiceClient.deleteCompany(name);
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the company to be deleted.
-   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/companies/{company_id}", for
-   *     example, "projects/foo/tenants/bar/companies/baz".
-   *     <p>If tenant id is unspecified, the default tenant is used, for example,
-   *     "projects/foo/companies/bar".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteCompany(CompanyName name) {
-    DeleteCompanyRequest request =
-        DeleteCompanyRequest.newBuilder().setName(name == null ? null : name.toString()).build();
-    deleteCompany(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified company. Prerequisite: The company has no jobs associated with it.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
-   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
-   *   companyServiceClient.deleteCompany(name.toString());
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the company to be deleted.
-   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/companies/{company_id}", for
-   *     example, "projects/foo/tenants/bar/companies/baz".
-   *     <p>If tenant id is unspecified, the default tenant is used, for example,
-   *     "projects/foo/companies/bar".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteCompany(String name) {
-    DeleteCompanyRequest request = DeleteCompanyRequest.newBuilder().setName(name).build();
-    deleteCompany(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified company. Prerequisite: The company has no jobs associated with it.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
-   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
-   *   DeleteCompanyRequest request = DeleteCompanyRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   companyServiceClient.deleteCompany(request);
-   * }
-   * </code></pre>
-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteCompany(DeleteCompanyRequest request) {
-    deleteCompanyCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified company. Prerequisite: The company has no jobs associated with it.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
-   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
-   *   DeleteCompanyRequest request = DeleteCompanyRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = companyServiceClient.deleteCompanyCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteCompanyRequest, Empty> deleteCompanyCallable() {
-    return stub.deleteCompanyCallable();
-  }
-
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Creates a new company entity.
@@ -548,6 +453,102 @@ public final UnaryCallable<UpdateCompanyRequest, Company> updateCompanyCallable(
     return stub.updateCompanyCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified company. Prerequisite: The company has no jobs associated with it.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
+   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
+   *   companyServiceClient.deleteCompany(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The resource name of the company to be deleted.
+   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/companies/{company_id}", for
+   *     example, "projects/foo/tenants/bar/companies/baz".
+   *     <p>If tenant id is unspecified, the default tenant is used, for example,
+   *     "projects/foo/companies/bar".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteCompany(CompanyName name) {
+    DeleteCompanyRequest request =
+        DeleteCompanyRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteCompany(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified company. Prerequisite: The company has no jobs associated with it.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
+   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
+   *   companyServiceClient.deleteCompany(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The resource name of the company to be deleted.
+   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/companies/{company_id}", for
+   *     example, "projects/foo/tenants/bar/companies/baz".
+   *     <p>If tenant id is unspecified, the default tenant is used, for example,
+   *     "projects/foo/companies/bar".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteCompany(String name) {
+    DeleteCompanyRequest request = DeleteCompanyRequest.newBuilder().setName(name).build();
+    deleteCompany(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified company. Prerequisite: The company has no jobs associated with it.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
+   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
+   *   DeleteCompanyRequest request = DeleteCompanyRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   companyServiceClient.deleteCompany(request);
+   * }
+   * </code></pre>
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteCompany(DeleteCompanyRequest request) {
+    deleteCompanyCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified company. Prerequisite: The company has no jobs associated with it.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
+   *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
+   *   DeleteCompanyRequest request = DeleteCompanyRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = companyServiceClient.deleteCompanyCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteCompanyRequest, Empty> deleteCompanyCallable() {
+    return stub.deleteCompanyCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Lists all companies associated with the project.
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceSettings.java
index 57ca428f..7a7c2703 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/CompanyServiceSettings.java
@@ -49,16 +49,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteCompany to 30 seconds:
+ * <p>For example, to set the total timeout of createCompany to 30 seconds:
  *
  * <pre>
  * <code>
  * CompanyServiceSettings.Builder companyServiceSettingsBuilder =
  *     CompanyServiceSettings.newBuilder();
  * companyServiceSettingsBuilder
- *     .deleteCompanySettings()
+ *     .createCompanySettings()
  *     .setRetrySettings(
- *         companyServiceSettingsBuilder.deleteCompanySettings().getRetrySettings().toBuilder()
+ *         companyServiceSettingsBuilder.createCompanySettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * CompanyServiceSettings companyServiceSettings = companyServiceSettingsBuilder.build();
@@ -68,11 +68,6 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class CompanyServiceSettings extends ClientSettings<CompanyServiceSettings> {
-  /** Returns the object with the settings used for calls to deleteCompany. */
-  public UnaryCallSettings<DeleteCompanyRequest, Empty> deleteCompanySettings() {
-    return ((CompanyServiceStubSettings) getStubSettings()).deleteCompanySettings();
-  }
-
   /** Returns the object with the settings used for calls to createCompany. */
   public UnaryCallSettings<CreateCompanyRequest, Company> createCompanySettings() {
     return ((CompanyServiceStubSettings) getStubSettings()).createCompanySettings();
@@ -88,6 +83,11 @@ public UnaryCallSettings<UpdateCompanyRequest, Company> updateCompanySettings()
     return ((CompanyServiceStubSettings) getStubSettings()).updateCompanySettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteCompany. */
+  public UnaryCallSettings<DeleteCompanyRequest, Empty> deleteCompanySettings() {
+    return ((CompanyServiceStubSettings) getStubSettings()).deleteCompanySettings();
+  }
+
   /** Returns the object with the settings used for calls to listCompanies. */
   public PagedCallSettings<ListCompaniesRequest, ListCompaniesResponse, ListCompaniesPagedResponse>
       listCompaniesSettings() {
@@ -191,11 +191,6 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
-    /** Returns the builder for the settings used for calls to deleteCompany. */
-    public UnaryCallSettings.Builder<DeleteCompanyRequest, Empty> deleteCompanySettings() {
-      return getStubSettingsBuilder().deleteCompanySettings();
-    }
-
     /** Returns the builder for the settings used for calls to createCompany. */
     public UnaryCallSettings.Builder<CreateCompanyRequest, Company> createCompanySettings() {
       return getStubSettingsBuilder().createCompanySettings();
@@ -211,6 +206,11 @@ public UnaryCallSettings.Builder<UpdateCompanyRequest, Company> updateCompanySet
       return getStubSettingsBuilder().updateCompanySettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteCompany. */
+    public UnaryCallSettings.Builder<DeleteCompanyRequest, Empty> deleteCompanySettings() {
+      return getStubSettingsBuilder().deleteCompanySettings();
+    }
+
     /** Returns the builder for the settings used for calls to listCompanies. */
     public PagedCallSettings.Builder<
             ListCompaniesRequest, ListCompaniesResponse, ListCompaniesPagedResponse>
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java
index c62d25d6..327c8221 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceClient.java
@@ -49,8 +49,9 @@
  * <pre>
  * <code>
  * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
- *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
- *   jobServiceClient.deleteJob(name);
+ *   TenantName parent = TenantName.of("[PROJECT]", "[TENANT]");
+ *   Job job = Job.newBuilder().build();
+ *   Job response = jobServiceClient.createJob(parent, job);
  * }
  * </code>
  * </pre>
@@ -170,110 +171,6 @@ public final OperationsClient getOperationsClient() {
     return operationsClient;
   }
 
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified job.
-   *
-   * <p>Typically, the job becomes unsearchable within 10 seconds, but it may take up to 5 minutes.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
-   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
-   *   jobServiceClient.deleteJob(name);
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the job to be deleted.
-   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/jobs/{job_id}". For example,
-   *     "projects/foo/tenants/bar/jobs/baz".
-   *     <p>If tenant id is unspecified, the default tenant is used. For example,
-   *     "projects/foo/jobs/bar".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteJob(JobName name) {
-    DeleteJobRequest request =
-        DeleteJobRequest.newBuilder().setName(name == null ? null : name.toString()).build();
-    deleteJob(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified job.
-   *
-   * <p>Typically, the job becomes unsearchable within 10 seconds, but it may take up to 5 minutes.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
-   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
-   *   jobServiceClient.deleteJob(name.toString());
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the job to be deleted.
-   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/jobs/{job_id}". For example,
-   *     "projects/foo/tenants/bar/jobs/baz".
-   *     <p>If tenant id is unspecified, the default tenant is used. For example,
-   *     "projects/foo/jobs/bar".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteJob(String name) {
-    DeleteJobRequest request = DeleteJobRequest.newBuilder().setName(name).build();
-    deleteJob(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified job.
-   *
-   * <p>Typically, the job becomes unsearchable within 10 seconds, but it may take up to 5 minutes.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
-   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
-   *   DeleteJobRequest request = DeleteJobRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   jobServiceClient.deleteJob(request);
-   * }
-   * </code></pre>
-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteJob(DeleteJobRequest request) {
-    deleteJobCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified job.
-   *
-   * <p>Typically, the job becomes unsearchable within 10 seconds, but it may take up to 5 minutes.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
-   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
-   *   DeleteJobRequest request = DeleteJobRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = jobServiceClient.deleteJobCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteJobRequest, Empty> deleteJobCallable() {
-    return stub.deleteJobCallable();
-  }
-
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Creates a new job.
@@ -938,6 +835,110 @@ public final UnaryCallable<BatchUpdateJobsRequest, Operation> batchUpdateJobsCal
     return stub.batchUpdateJobsCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified job.
+   *
+   * <p>Typically, the job becomes unsearchable within 10 seconds, but it may take up to 5 minutes.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
+   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
+   *   jobServiceClient.deleteJob(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The resource name of the job to be deleted.
+   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/jobs/{job_id}". For example,
+   *     "projects/foo/tenants/bar/jobs/baz".
+   *     <p>If tenant id is unspecified, the default tenant is used. For example,
+   *     "projects/foo/jobs/bar".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteJob(JobName name) {
+    DeleteJobRequest request =
+        DeleteJobRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteJob(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified job.
+   *
+   * <p>Typically, the job becomes unsearchable within 10 seconds, but it may take up to 5 minutes.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
+   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
+   *   jobServiceClient.deleteJob(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The resource name of the job to be deleted.
+   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/jobs/{job_id}". For example,
+   *     "projects/foo/tenants/bar/jobs/baz".
+   *     <p>If tenant id is unspecified, the default tenant is used. For example,
+   *     "projects/foo/jobs/bar".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteJob(String name) {
+    DeleteJobRequest request = DeleteJobRequest.newBuilder().setName(name).build();
+    deleteJob(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified job.
+   *
+   * <p>Typically, the job becomes unsearchable within 10 seconds, but it may take up to 5 minutes.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
+   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
+   *   DeleteJobRequest request = DeleteJobRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   jobServiceClient.deleteJob(request);
+   * }
+   * </code></pre>
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteJob(DeleteJobRequest request) {
+    deleteJobCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified job.
+   *
+   * <p>Typically, the job becomes unsearchable within 10 seconds, but it may take up to 5 minutes.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
+   *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
+   *   DeleteJobRequest request = DeleteJobRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = jobServiceClient.deleteJobCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteJobRequest, Empty> deleteJobCallable() {
+    return stub.deleteJobCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Deletes a list of [Job][google.cloud.talent.v4beta1.Job]s by filter.
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceSettings.java
index 19cd20a0..723e1742 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/JobServiceSettings.java
@@ -53,16 +53,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteJob to 30 seconds:
+ * <p>For example, to set the total timeout of createJob to 30 seconds:
  *
  * <pre>
  * <code>
  * JobServiceSettings.Builder jobServiceSettingsBuilder =
  *     JobServiceSettings.newBuilder();
  * jobServiceSettingsBuilder
- *     .deleteJobSettings()
+ *     .createJobSettings()
  *     .setRetrySettings(
- *         jobServiceSettingsBuilder.deleteJobSettings().getRetrySettings().toBuilder()
+ *         jobServiceSettingsBuilder.createJobSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * JobServiceSettings jobServiceSettings = jobServiceSettingsBuilder.build();
@@ -72,11 +72,6 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class JobServiceSettings extends ClientSettings<JobServiceSettings> {
-  /** Returns the object with the settings used for calls to deleteJob. */
-  public UnaryCallSettings<DeleteJobRequest, Empty> deleteJobSettings() {
-    return ((JobServiceStubSettings) getStubSettings()).deleteJobSettings();
-  }
-
   /** Returns the object with the settings used for calls to createJob. */
   public UnaryCallSettings<CreateJobRequest, Job> createJobSettings() {
     return ((JobServiceStubSettings) getStubSettings()).createJobSettings();
@@ -118,6 +113,11 @@ public UnaryCallSettings<BatchUpdateJobsRequest, Operation> batchUpdateJobsSetti
     return ((JobServiceStubSettings) getStubSettings()).batchUpdateJobsOperationSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteJob. */
+  public UnaryCallSettings<DeleteJobRequest, Empty> deleteJobSettings() {
+    return ((JobServiceStubSettings) getStubSettings()).deleteJobSettings();
+  }
+
   /** Returns the object with the settings used for calls to batchDeleteJobs. */
   public UnaryCallSettings<BatchDeleteJobsRequest, Empty> batchDeleteJobsSettings() {
     return ((JobServiceStubSettings) getStubSettings()).batchDeleteJobsSettings();
@@ -237,11 +237,6 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
-    /** Returns the builder for the settings used for calls to deleteJob. */
-    public UnaryCallSettings.Builder<DeleteJobRequest, Empty> deleteJobSettings() {
-      return getStubSettingsBuilder().deleteJobSettings();
-    }
-
     /** Returns the builder for the settings used for calls to createJob. */
     public UnaryCallSettings.Builder<CreateJobRequest, Job> createJobSettings() {
       return getStubSettingsBuilder().createJobSettings();
@@ -285,6 +280,11 @@ public UnaryCallSettings.Builder<BatchUpdateJobsRequest, Operation> batchUpdateJ
       return getStubSettingsBuilder().batchUpdateJobsOperationSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteJob. */
+    public UnaryCallSettings.Builder<DeleteJobRequest, Empty> deleteJobSettings() {
+      return getStubSettingsBuilder().deleteJobSettings();
+    }
+
     /** Returns the builder for the settings used for calls to batchDeleteJobs. */
     public UnaryCallSettings.Builder<BatchDeleteJobsRequest, Empty> batchDeleteJobsSettings() {
       return getStubSettingsBuilder().batchDeleteJobsSettings();
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ProfileServiceClient.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ProfileServiceClient.java
index e8525094..daacaf1d 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ProfileServiceClient.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ProfileServiceClient.java
@@ -45,8 +45,9 @@
  * <pre>
  * <code>
  * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
- *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
- *   profileServiceClient.deleteProfile(name);
+ *   TenantName parent = TenantName.of("[PROJECT]", "[TENANT]");
+ *   Profile profile = Profile.newBuilder().build();
+ *   Profile response = profileServiceClient.createProfile(parent, profile);
  * }
  * </code>
  * </pre>
@@ -155,102 +156,6 @@ public ProfileServiceStub getStub() {
     return stub;
   }
 
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified profile. Prerequisite: The profile has no associated applications or
-   * assignments associated.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
-   *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
-   *   profileServiceClient.deleteProfile(name);
-   * }
-   * </code></pre>
-   *
-   * @param name Required. Resource name of the profile to be deleted.
-   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/profiles/{profile_id}". For
-   *     example, "projects/foo/tenants/bar/profiles/baz".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteProfile(ProfileName name) {
-    DeleteProfileRequest request =
-        DeleteProfileRequest.newBuilder().setName(name == null ? null : name.toString()).build();
-    deleteProfile(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified profile. Prerequisite: The profile has no associated applications or
-   * assignments associated.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
-   *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
-   *   profileServiceClient.deleteProfile(name.toString());
-   * }
-   * </code></pre>
-   *
-   * @param name Required. Resource name of the profile to be deleted.
-   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/profiles/{profile_id}". For
-   *     example, "projects/foo/tenants/bar/profiles/baz".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteProfile(String name) {
-    DeleteProfileRequest request = DeleteProfileRequest.newBuilder().setName(name).build();
-    deleteProfile(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified profile. Prerequisite: The profile has no associated applications or
-   * assignments associated.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
-   *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
-   *   DeleteProfileRequest request = DeleteProfileRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   profileServiceClient.deleteProfile(request);
-   * }
-   * </code></pre>
-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteProfile(DeleteProfileRequest request) {
-    deleteProfileCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes the specified profile. Prerequisite: The profile has no associated applications or
-   * assignments associated.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
-   *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
-   *   DeleteProfileRequest request = DeleteProfileRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = profileServiceClient.deleteProfileCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteProfileRequest, Empty> deleteProfileCallable() {
-    return stub.deleteProfileCallable();
-  }
-
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Searches for profiles within a tenant.
@@ -753,6 +658,102 @@ public final UnaryCallable<UpdateProfileRequest, Profile> updateProfileCallable(
     return stub.updateProfileCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified profile. Prerequisite: The profile has no associated applications or
+   * assignments associated.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
+   *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
+   *   profileServiceClient.deleteProfile(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the profile to be deleted.
+   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/profiles/{profile_id}". For
+   *     example, "projects/foo/tenants/bar/profiles/baz".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteProfile(ProfileName name) {
+    DeleteProfileRequest request =
+        DeleteProfileRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteProfile(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified profile. Prerequisite: The profile has no associated applications or
+   * assignments associated.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
+   *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
+   *   profileServiceClient.deleteProfile(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. Resource name of the profile to be deleted.
+   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}/profiles/{profile_id}". For
+   *     example, "projects/foo/tenants/bar/profiles/baz".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteProfile(String name) {
+    DeleteProfileRequest request = DeleteProfileRequest.newBuilder().setName(name).build();
+    deleteProfile(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified profile. Prerequisite: The profile has no associated applications or
+   * assignments associated.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
+   *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
+   *   DeleteProfileRequest request = DeleteProfileRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   profileServiceClient.deleteProfile(request);
+   * }
+   * </code></pre>
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteProfile(DeleteProfileRequest request) {
+    deleteProfileCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes the specified profile. Prerequisite: The profile has no associated applications or
+   * assignments associated.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
+   *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
+   *   DeleteProfileRequest request = DeleteProfileRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = profileServiceClient.deleteProfileCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteProfileRequest, Empty> deleteProfileCallable() {
+    return stub.deleteProfileCallable();
+  }
+
   @Override
   public final void close() {
     stub.close();
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ProfileServiceSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ProfileServiceSettings.java
index 2c67fb44..e795aa53 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ProfileServiceSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/ProfileServiceSettings.java
@@ -50,16 +50,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteProfile to 30 seconds:
+ * <p>For example, to set the total timeout of createProfile to 30 seconds:
  *
  * <pre>
  * <code>
  * ProfileServiceSettings.Builder profileServiceSettingsBuilder =
  *     ProfileServiceSettings.newBuilder();
  * profileServiceSettingsBuilder
- *     .deleteProfileSettings()
+ *     .createProfileSettings()
  *     .setRetrySettings(
- *         profileServiceSettingsBuilder.deleteProfileSettings().getRetrySettings().toBuilder()
+ *         profileServiceSettingsBuilder.createProfileSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * ProfileServiceSettings profileServiceSettings = profileServiceSettingsBuilder.build();
@@ -69,11 +69,6 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class ProfileServiceSettings extends ClientSettings<ProfileServiceSettings> {
-  /** Returns the object with the settings used for calls to deleteProfile. */
-  public UnaryCallSettings<DeleteProfileRequest, Empty> deleteProfileSettings() {
-    return ((ProfileServiceStubSettings) getStubSettings()).deleteProfileSettings();
-  }
-
   /** Returns the object with the settings used for calls to searchProfiles. */
   public PagedCallSettings<
           SearchProfilesRequest, SearchProfilesResponse, SearchProfilesPagedResponse>
@@ -102,6 +97,11 @@ public UnaryCallSettings<UpdateProfileRequest, Profile> updateProfileSettings()
     return ((ProfileServiceStubSettings) getStubSettings()).updateProfileSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteProfile. */
+  public UnaryCallSettings<DeleteProfileRequest, Empty> deleteProfileSettings() {
+    return ((ProfileServiceStubSettings) getStubSettings()).deleteProfileSettings();
+  }
+
   public static final ProfileServiceSettings create(ProfileServiceStubSettings stub)
       throws IOException {
     return new ProfileServiceSettings.Builder(stub.toBuilder()).build();
@@ -199,11 +199,6 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
-    /** Returns the builder for the settings used for calls to deleteProfile. */
-    public UnaryCallSettings.Builder<DeleteProfileRequest, Empty> deleteProfileSettings() {
-      return getStubSettingsBuilder().deleteProfileSettings();
-    }
-
     /** Returns the builder for the settings used for calls to searchProfiles. */
     public PagedCallSettings.Builder<
             SearchProfilesRequest, SearchProfilesResponse, SearchProfilesPagedResponse>
@@ -233,6 +228,11 @@ public UnaryCallSettings.Builder<UpdateProfileRequest, Profile> updateProfileSet
       return getStubSettingsBuilder().updateProfileSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteProfile. */
+    public UnaryCallSettings.Builder<DeleteProfileRequest, Empty> deleteProfileSettings() {
+      return getStubSettingsBuilder().deleteProfileSettings();
+    }
+
     @Override
     public ProfileServiceSettings build() throws IOException {
       return new ProfileServiceSettings(this);
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/TenantServiceClient.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/TenantServiceClient.java
index 423df444..cbd5dccb 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/TenantServiceClient.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/TenantServiceClient.java
@@ -44,8 +44,9 @@
  * <pre>
  * <code>
  * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
- *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
- *   tenantServiceClient.deleteTenant(name);
+ *   ProjectName parent = ProjectName.of("[PROJECT]");
+ *   Tenant tenant = Tenant.newBuilder().build();
+ *   Tenant response = tenantServiceClient.createTenant(parent, tenant);
  * }
  * </code>
  * </pre>
@@ -154,98 +155,6 @@ public TenantServiceStub getStub() {
     return stub;
   }
 
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified tenant.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
-   *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
-   *   tenantServiceClient.deleteTenant(name);
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the tenant to be deleted.
-   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}", for example,
-   *     "projects/foo/tenants/bar".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteTenant(TenantName name) {
-    DeleteTenantRequest request =
-        DeleteTenantRequest.newBuilder().setName(name == null ? null : name.toString()).build();
-    deleteTenant(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified tenant.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
-   *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
-   *   tenantServiceClient.deleteTenant(name.toString());
-   * }
-   * </code></pre>
-   *
-   * @param name Required. The resource name of the tenant to be deleted.
-   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}", for example,
-   *     "projects/foo/tenants/bar".
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteTenant(String name) {
-    DeleteTenantRequest request = DeleteTenantRequest.newBuilder().setName(name).build();
-    deleteTenant(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified tenant.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
-   *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
-   *   DeleteTenantRequest request = DeleteTenantRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   tenantServiceClient.deleteTenant(request);
-   * }
-   * </code></pre>
-   *
-   * @param request The request object containing all of the parameters for the API call.
-   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
-   */
-  public final void deleteTenant(DeleteTenantRequest request) {
-    deleteTenantCallable().call(request);
-  }
-
-  // AUTO-GENERATED DOCUMENTATION AND METHOD
-  /**
-   * Deletes specified tenant.
-   *
-   * <p>Sample code:
-   *
-   * <pre><code>
-   * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
-   *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
-   *   DeleteTenantRequest request = DeleteTenantRequest.newBuilder()
-   *     .setName(name.toString())
-   *     .build();
-   *   ApiFuture&lt;Void&gt; future = tenantServiceClient.deleteTenantCallable().futureCall(request);
-   *   // Do something
-   *   future.get();
-   * }
-   * </code></pre>
-   */
-  public final UnaryCallable<DeleteTenantRequest, Empty> deleteTenantCallable() {
-    return stub.deleteTenantCallable();
-  }
-
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Creates a new tenant entity.
@@ -506,6 +415,98 @@ public final UnaryCallable<UpdateTenantRequest, Tenant> updateTenantCallable() {
     return stub.updateTenantCallable();
   }
 
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified tenant.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
+   *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
+   *   tenantServiceClient.deleteTenant(name);
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The resource name of the tenant to be deleted.
+   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}", for example,
+   *     "projects/foo/tenants/bar".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteTenant(TenantName name) {
+    DeleteTenantRequest request =
+        DeleteTenantRequest.newBuilder().setName(name == null ? null : name.toString()).build();
+    deleteTenant(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified tenant.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
+   *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
+   *   tenantServiceClient.deleteTenant(name.toString());
+   * }
+   * </code></pre>
+   *
+   * @param name Required. The resource name of the tenant to be deleted.
+   *     <p>The format is "projects/{project_id}/tenants/{tenant_id}", for example,
+   *     "projects/foo/tenants/bar".
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteTenant(String name) {
+    DeleteTenantRequest request = DeleteTenantRequest.newBuilder().setName(name).build();
+    deleteTenant(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified tenant.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
+   *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
+   *   DeleteTenantRequest request = DeleteTenantRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   tenantServiceClient.deleteTenant(request);
+   * }
+   * </code></pre>
+   *
+   * @param request The request object containing all of the parameters for the API call.
+   * @throws com.google.api.gax.rpc.ApiException if the remote call fails
+   */
+  public final void deleteTenant(DeleteTenantRequest request) {
+    deleteTenantCallable().call(request);
+  }
+
+  // AUTO-GENERATED DOCUMENTATION AND METHOD
+  /**
+   * Deletes specified tenant.
+   *
+   * <p>Sample code:
+   *
+   * <pre><code>
+   * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
+   *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
+   *   DeleteTenantRequest request = DeleteTenantRequest.newBuilder()
+   *     .setName(name.toString())
+   *     .build();
+   *   ApiFuture&lt;Void&gt; future = tenantServiceClient.deleteTenantCallable().futureCall(request);
+   *   // Do something
+   *   future.get();
+   * }
+   * </code></pre>
+   */
+  public final UnaryCallable<DeleteTenantRequest, Empty> deleteTenantCallable() {
+    return stub.deleteTenantCallable();
+  }
+
   // AUTO-GENERATED DOCUMENTATION AND METHOD
   /**
    * Lists all tenants associated with the project.
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/TenantServiceSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/TenantServiceSettings.java
index cc6eba9d..154f2c45 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/TenantServiceSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/TenantServiceSettings.java
@@ -49,16 +49,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteTenant to 30 seconds:
+ * <p>For example, to set the total timeout of createTenant to 30 seconds:
  *
  * <pre>
  * <code>
  * TenantServiceSettings.Builder tenantServiceSettingsBuilder =
  *     TenantServiceSettings.newBuilder();
  * tenantServiceSettingsBuilder
- *     .deleteTenantSettings()
+ *     .createTenantSettings()
  *     .setRetrySettings(
- *         tenantServiceSettingsBuilder.deleteTenantSettings().getRetrySettings().toBuilder()
+ *         tenantServiceSettingsBuilder.createTenantSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * TenantServiceSettings tenantServiceSettings = tenantServiceSettingsBuilder.build();
@@ -68,11 +68,6 @@
 @Generated("by gapic-generator")
 @BetaApi
 public class TenantServiceSettings extends ClientSettings<TenantServiceSettings> {
-  /** Returns the object with the settings used for calls to deleteTenant. */
-  public UnaryCallSettings<DeleteTenantRequest, Empty> deleteTenantSettings() {
-    return ((TenantServiceStubSettings) getStubSettings()).deleteTenantSettings();
-  }
-
   /** Returns the object with the settings used for calls to createTenant. */
   public UnaryCallSettings<CreateTenantRequest, Tenant> createTenantSettings() {
     return ((TenantServiceStubSettings) getStubSettings()).createTenantSettings();
@@ -88,6 +83,11 @@ public UnaryCallSettings<UpdateTenantRequest, Tenant> updateTenantSettings() {
     return ((TenantServiceStubSettings) getStubSettings()).updateTenantSettings();
   }
 
+  /** Returns the object with the settings used for calls to deleteTenant. */
+  public UnaryCallSettings<DeleteTenantRequest, Empty> deleteTenantSettings() {
+    return ((TenantServiceStubSettings) getStubSettings()).deleteTenantSettings();
+  }
+
   /** Returns the object with the settings used for calls to listTenants. */
   public PagedCallSettings<ListTenantsRequest, ListTenantsResponse, ListTenantsPagedResponse>
       listTenantsSettings() {
@@ -191,11 +191,6 @@ public Builder applyToAllUnaryMethods(
       return this;
     }
 
-    /** Returns the builder for the settings used for calls to deleteTenant. */
-    public UnaryCallSettings.Builder<DeleteTenantRequest, Empty> deleteTenantSettings() {
-      return getStubSettingsBuilder().deleteTenantSettings();
-    }
-
     /** Returns the builder for the settings used for calls to createTenant. */
     public UnaryCallSettings.Builder<CreateTenantRequest, Tenant> createTenantSettings() {
       return getStubSettingsBuilder().createTenantSettings();
@@ -211,6 +206,11 @@ public UnaryCallSettings.Builder<UpdateTenantRequest, Tenant> updateTenantSettin
       return getStubSettingsBuilder().updateTenantSettings();
     }
 
+    /** Returns the builder for the settings used for calls to deleteTenant. */
+    public UnaryCallSettings.Builder<DeleteTenantRequest, Empty> deleteTenantSettings() {
+      return getStubSettingsBuilder().deleteTenantSettings();
+    }
+
     /** Returns the builder for the settings used for calls to listTenants. */
     public PagedCallSettings.Builder<
             ListTenantsRequest, ListTenantsResponse, ListTenantsPagedResponse>
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java
index 7c905953..1f42c866 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/package-info.java
@@ -29,8 +29,9 @@
  * <pre>
  * <code>
  * try (ApplicationServiceClient applicationServiceClient = ApplicationServiceClient.create()) {
- *   ApplicationName name = ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
- *   applicationServiceClient.deleteApplication(name);
+ *   ProfileName parent = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
+ *   Application application = Application.newBuilder().build();
+ *   Application response = applicationServiceClient.createApplication(parent, application);
  * }
  * </code>
  * </pre>
@@ -45,8 +46,9 @@
  * <pre>
  * <code>
  * try (CompanyServiceClient companyServiceClient = CompanyServiceClient.create()) {
- *   CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
- *   companyServiceClient.deleteCompany(name);
+ *   TenantName parent = TenantName.of("[PROJECT]", "[TENANT]");
+ *   Company company = Company.newBuilder().build();
+ *   Company response = companyServiceClient.createCompany(parent, company);
  * }
  * </code>
  * </pre>
@@ -99,8 +101,9 @@
  * <pre>
  * <code>
  * try (JobServiceClient jobServiceClient = JobServiceClient.create()) {
- *   JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
- *   jobServiceClient.deleteJob(name);
+ *   TenantName parent = TenantName.of("[PROJECT]", "[TENANT]");
+ *   Job job = Job.newBuilder().build();
+ *   Job response = jobServiceClient.createJob(parent, job);
  * }
  * </code>
  * </pre>
@@ -115,8 +118,9 @@
  * <pre>
  * <code>
  * try (ProfileServiceClient profileServiceClient = ProfileServiceClient.create()) {
- *   ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
- *   profileServiceClient.deleteProfile(name);
+ *   TenantName parent = TenantName.of("[PROJECT]", "[TENANT]");
+ *   Profile profile = Profile.newBuilder().build();
+ *   Profile response = profileServiceClient.createProfile(parent, profile);
  * }
  * </code>
  * </pre>
@@ -130,8 +134,9 @@
  * <pre>
  * <code>
  * try (TenantServiceClient tenantServiceClient = TenantServiceClient.create()) {
- *   TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
- *   tenantServiceClient.deleteTenant(name);
+ *   ProjectName parent = ProjectName.of("[PROJECT]");
+ *   Tenant tenant = Tenant.newBuilder().build();
+ *   Tenant response = tenantServiceClient.createTenant(parent, tenant);
  * }
  * </code>
  * </pre>
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ApplicationServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ApplicationServiceStub.java
index 0ed41fdc..e40e3186 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ApplicationServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ApplicationServiceStub.java
@@ -40,10 +40,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class ApplicationServiceStub implements BackgroundResource {
 
-  public UnaryCallable<DeleteApplicationRequest, Empty> deleteApplicationCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteApplicationCallable()");
-  }
-
   public UnaryCallable<CreateApplicationRequest, Application> createApplicationCallable() {
     throw new UnsupportedOperationException("Not implemented: createApplicationCallable()");
   }
@@ -56,6 +52,10 @@ public UnaryCallable<UpdateApplicationRequest, Application> updateApplicationCal
     throw new UnsupportedOperationException("Not implemented: updateApplicationCallable()");
   }
 
+  public UnaryCallable<DeleteApplicationRequest, Empty> deleteApplicationCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteApplicationCallable()");
+  }
+
   public UnaryCallable<ListApplicationsRequest, ListApplicationsPagedResponse>
       listApplicationsPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: listApplicationsPagedCallable()");
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ApplicationServiceStubSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ApplicationServiceStubSettings.java
index b18811e4..95a69471 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ApplicationServiceStubSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ApplicationServiceStubSettings.java
@@ -71,16 +71,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteApplication to 30 seconds:
+ * <p>For example, to set the total timeout of createApplication to 30 seconds:
  *
  * <pre>
  * <code>
  * ApplicationServiceStubSettings.Builder applicationServiceSettingsBuilder =
  *     ApplicationServiceStubSettings.newBuilder();
  * applicationServiceSettingsBuilder
- *     .deleteApplicationSettings()
+ *     .createApplicationSettings()
  *     .setRetrySettings(
- *         applicationServiceSettingsBuilder.deleteApplicationSettings().getRetrySettings().toBuilder()
+ *         applicationServiceSettingsBuilder.createApplicationSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * ApplicationServiceStubSettings applicationServiceSettings = applicationServiceSettingsBuilder.build();
@@ -97,19 +97,14 @@ public class ApplicationServiceStubSettings extends StubSettings<ApplicationServ
           .add("https://www.googleapis.com/auth/jobs")
           .build();
 
-  private final UnaryCallSettings<DeleteApplicationRequest, Empty> deleteApplicationSettings;
   private final UnaryCallSettings<CreateApplicationRequest, Application> createApplicationSettings;
   private final UnaryCallSettings<GetApplicationRequest, Application> getApplicationSettings;
   private final UnaryCallSettings<UpdateApplicationRequest, Application> updateApplicationSettings;
+  private final UnaryCallSettings<DeleteApplicationRequest, Empty> deleteApplicationSettings;
   private final PagedCallSettings<
           ListApplicationsRequest, ListApplicationsResponse, ListApplicationsPagedResponse>
       listApplicationsSettings;
 
-  /** Returns the object with the settings used for calls to deleteApplication. */
-  public UnaryCallSettings<DeleteApplicationRequest, Empty> deleteApplicationSettings() {
-    return deleteApplicationSettings;
-  }
-
   /** Returns the object with the settings used for calls to createApplication. */
   public UnaryCallSettings<CreateApplicationRequest, Application> createApplicationSettings() {
     return createApplicationSettings;
@@ -125,6 +120,11 @@ public UnaryCallSettings<UpdateApplicationRequest, Application> updateApplicatio
     return updateApplicationSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteApplication. */
+  public UnaryCallSettings<DeleteApplicationRequest, Empty> deleteApplicationSettings() {
+    return deleteApplicationSettings;
+  }
+
   /** Returns the object with the settings used for calls to listApplications. */
   public PagedCallSettings<
           ListApplicationsRequest, ListApplicationsResponse, ListApplicationsPagedResponse>
@@ -201,10 +201,10 @@ public Builder toBuilder() {
   protected ApplicationServiceStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
-    deleteApplicationSettings = settingsBuilder.deleteApplicationSettings().build();
     createApplicationSettings = settingsBuilder.createApplicationSettings().build();
     getApplicationSettings = settingsBuilder.getApplicationSettings().build();
     updateApplicationSettings = settingsBuilder.updateApplicationSettings().build();
+    deleteApplicationSettings = settingsBuilder.deleteApplicationSettings().build();
     listApplicationsSettings = settingsBuilder.listApplicationsSettings().build();
   }
 
@@ -272,14 +272,14 @@ public static class Builder
       extends StubSettings.Builder<ApplicationServiceStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
-    private final UnaryCallSettings.Builder<DeleteApplicationRequest, Empty>
-        deleteApplicationSettings;
     private final UnaryCallSettings.Builder<CreateApplicationRequest, Application>
         createApplicationSettings;
     private final UnaryCallSettings.Builder<GetApplicationRequest, Application>
         getApplicationSettings;
     private final UnaryCallSettings.Builder<UpdateApplicationRequest, Application>
         updateApplicationSettings;
+    private final UnaryCallSettings.Builder<DeleteApplicationRequest, Empty>
+        deleteApplicationSettings;
     private final PagedCallSettings.Builder<
             ListApplicationsRequest, ListApplicationsResponse, ListApplicationsPagedResponse>
         listApplicationsSettings;
@@ -291,11 +291,48 @@ public static class Builder
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_2_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_6_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_4_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_4_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_6_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_5_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_5_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -304,17 +341,122 @@ public static class Builder
     static {
       ImmutableMap.Builder<String, RetrySettings> definitions = ImmutableMap.builder();
       RetrySettings settings = null;
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_3_params", settings);
       settings =
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_6_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_5_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_2_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_4_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_6_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_4_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_5_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -325,22 +467,22 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
-      deleteApplicationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       createApplicationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       getApplicationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       updateApplicationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
+      deleteApplicationSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       listApplicationsSettings = PagedCallSettings.newBuilder(LIST_APPLICATIONS_PAGE_STR_FACT);
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteApplicationSettings,
               createApplicationSettings,
               getApplicationSettings,
               updateApplicationSettings,
+              deleteApplicationSettings,
               listApplicationsSettings);
 
       initDefaults(this);
@@ -357,30 +499,30 @@ private static Builder createDefault() {
 
     private static Builder initDefaults(Builder builder) {
 
-      builder
-          .deleteApplicationSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .createApplicationSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_5_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_5_params"));
 
       builder
           .getApplicationSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
 
       builder
           .updateApplicationSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_5_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_5_params"));
+
+      builder
+          .deleteApplicationSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
 
       builder
           .listApplicationsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_2_params"));
 
       return builder;
     }
@@ -388,18 +530,18 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(ApplicationServiceStubSettings settings) {
       super(settings);
 
-      deleteApplicationSettings = settings.deleteApplicationSettings.toBuilder();
       createApplicationSettings = settings.createApplicationSettings.toBuilder();
       getApplicationSettings = settings.getApplicationSettings.toBuilder();
       updateApplicationSettings = settings.updateApplicationSettings.toBuilder();
+      deleteApplicationSettings = settings.deleteApplicationSettings.toBuilder();
       listApplicationsSettings = settings.listApplicationsSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteApplicationSettings,
               createApplicationSettings,
               getApplicationSettings,
               updateApplicationSettings,
+              deleteApplicationSettings,
               listApplicationsSettings);
     }
 
@@ -419,11 +561,6 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
-    /** Returns the builder for the settings used for calls to deleteApplication. */
-    public UnaryCallSettings.Builder<DeleteApplicationRequest, Empty> deleteApplicationSettings() {
-      return deleteApplicationSettings;
-    }
-
     /** Returns the builder for the settings used for calls to createApplication. */
     public UnaryCallSettings.Builder<CreateApplicationRequest, Application>
         createApplicationSettings() {
@@ -441,6 +578,11 @@ public UnaryCallSettings.Builder<GetApplicationRequest, Application> getApplicat
       return updateApplicationSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteApplication. */
+    public UnaryCallSettings.Builder<DeleteApplicationRequest, Empty> deleteApplicationSettings() {
+      return deleteApplicationSettings;
+    }
+
     /** Returns the builder for the settings used for calls to listApplications. */
     public PagedCallSettings.Builder<
             ListApplicationsRequest, ListApplicationsResponse, ListApplicationsPagedResponse>
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompanyServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompanyServiceStub.java
index c781800f..263eb1d6 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompanyServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompanyServiceStub.java
@@ -40,10 +40,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class CompanyServiceStub implements BackgroundResource {
 
-  public UnaryCallable<DeleteCompanyRequest, Empty> deleteCompanyCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteCompanyCallable()");
-  }
-
   public UnaryCallable<CreateCompanyRequest, Company> createCompanyCallable() {
     throw new UnsupportedOperationException("Not implemented: createCompanyCallable()");
   }
@@ -56,6 +52,10 @@ public UnaryCallable<UpdateCompanyRequest, Company> updateCompanyCallable() {
     throw new UnsupportedOperationException("Not implemented: updateCompanyCallable()");
   }
 
+  public UnaryCallable<DeleteCompanyRequest, Empty> deleteCompanyCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteCompanyCallable()");
+  }
+
   public UnaryCallable<ListCompaniesRequest, ListCompaniesPagedResponse>
       listCompaniesPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: listCompaniesPagedCallable()");
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompanyServiceStubSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompanyServiceStubSettings.java
index 55b73fd6..e6f5c29e 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompanyServiceStubSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompanyServiceStubSettings.java
@@ -71,16 +71,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteCompany to 30 seconds:
+ * <p>For example, to set the total timeout of createCompany to 30 seconds:
  *
  * <pre>
  * <code>
  * CompanyServiceStubSettings.Builder companyServiceSettingsBuilder =
  *     CompanyServiceStubSettings.newBuilder();
  * companyServiceSettingsBuilder
- *     .deleteCompanySettings()
+ *     .createCompanySettings()
  *     .setRetrySettings(
- *         companyServiceSettingsBuilder.deleteCompanySettings().getRetrySettings().toBuilder()
+ *         companyServiceSettingsBuilder.createCompanySettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * CompanyServiceStubSettings companyServiceSettings = companyServiceSettingsBuilder.build();
@@ -97,19 +97,14 @@ public class CompanyServiceStubSettings extends StubSettings<CompanyServiceStubS
           .add("https://www.googleapis.com/auth/jobs")
           .build();
 
-  private final UnaryCallSettings<DeleteCompanyRequest, Empty> deleteCompanySettings;
   private final UnaryCallSettings<CreateCompanyRequest, Company> createCompanySettings;
   private final UnaryCallSettings<GetCompanyRequest, Company> getCompanySettings;
   private final UnaryCallSettings<UpdateCompanyRequest, Company> updateCompanySettings;
+  private final UnaryCallSettings<DeleteCompanyRequest, Empty> deleteCompanySettings;
   private final PagedCallSettings<
           ListCompaniesRequest, ListCompaniesResponse, ListCompaniesPagedResponse>
       listCompaniesSettings;
 
-  /** Returns the object with the settings used for calls to deleteCompany. */
-  public UnaryCallSettings<DeleteCompanyRequest, Empty> deleteCompanySettings() {
-    return deleteCompanySettings;
-  }
-
   /** Returns the object with the settings used for calls to createCompany. */
   public UnaryCallSettings<CreateCompanyRequest, Company> createCompanySettings() {
     return createCompanySettings;
@@ -125,6 +120,11 @@ public UnaryCallSettings<UpdateCompanyRequest, Company> updateCompanySettings()
     return updateCompanySettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteCompany. */
+  public UnaryCallSettings<DeleteCompanyRequest, Empty> deleteCompanySettings() {
+    return deleteCompanySettings;
+  }
+
   /** Returns the object with the settings used for calls to listCompanies. */
   public PagedCallSettings<ListCompaniesRequest, ListCompaniesResponse, ListCompaniesPagedResponse>
       listCompaniesSettings() {
@@ -200,10 +200,10 @@ public Builder toBuilder() {
   protected CompanyServiceStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
-    deleteCompanySettings = settingsBuilder.deleteCompanySettings().build();
     createCompanySettings = settingsBuilder.createCompanySettings().build();
     getCompanySettings = settingsBuilder.getCompanySettings().build();
     updateCompanySettings = settingsBuilder.updateCompanySettings().build();
+    deleteCompanySettings = settingsBuilder.deleteCompanySettings().build();
     listCompaniesSettings = settingsBuilder.listCompaniesSettings().build();
   }
 
@@ -264,10 +264,10 @@ public ApiFuture<ListCompaniesPagedResponse> getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder<CompanyServiceStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
-    private final UnaryCallSettings.Builder<DeleteCompanyRequest, Empty> deleteCompanySettings;
     private final UnaryCallSettings.Builder<CreateCompanyRequest, Company> createCompanySettings;
     private final UnaryCallSettings.Builder<GetCompanyRequest, Company> getCompanySettings;
     private final UnaryCallSettings.Builder<UpdateCompanyRequest, Company> updateCompanySettings;
+    private final UnaryCallSettings.Builder<DeleteCompanyRequest, Empty> deleteCompanySettings;
     private final PagedCallSettings.Builder<
             ListCompaniesRequest, ListCompaniesResponse, ListCompaniesPagedResponse>
         listCompaniesSettings;
@@ -279,11 +279,13 @@ public static class Builder extends StubSettings.Builder<CompanyServiceStubSetti
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "no_retry_6_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_5_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -297,12 +299,22 @@ public static class Builder extends StubSettings.Builder<CompanyServiceStubSetti
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_5_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_6_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -313,22 +325,22 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
-      deleteCompanySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       createCompanySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       getCompanySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       updateCompanySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
+      deleteCompanySettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       listCompaniesSettings = PagedCallSettings.newBuilder(LIST_COMPANIES_PAGE_STR_FACT);
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteCompanySettings,
               createCompanySettings,
               getCompanySettings,
               updateCompanySettings,
+              deleteCompanySettings,
               listCompaniesSettings);
 
       initDefaults(this);
@@ -345,30 +357,30 @@ private static Builder createDefault() {
 
     private static Builder initDefaults(Builder builder) {
 
-      builder
-          .deleteCompanySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .createCompanySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"));
 
       builder
           .getCompanySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
 
       builder
           .updateCompanySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_6_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_6_params"));
+
+      builder
+          .deleteCompanySettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
 
       builder
           .listCompaniesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_5_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_5_params"));
 
       return builder;
     }
@@ -376,18 +388,18 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(CompanyServiceStubSettings settings) {
       super(settings);
 
-      deleteCompanySettings = settings.deleteCompanySettings.toBuilder();
       createCompanySettings = settings.createCompanySettings.toBuilder();
       getCompanySettings = settings.getCompanySettings.toBuilder();
       updateCompanySettings = settings.updateCompanySettings.toBuilder();
+      deleteCompanySettings = settings.deleteCompanySettings.toBuilder();
       listCompaniesSettings = settings.listCompaniesSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteCompanySettings,
               createCompanySettings,
               getCompanySettings,
               updateCompanySettings,
+              deleteCompanySettings,
               listCompaniesSettings);
     }
 
@@ -407,11 +419,6 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
-    /** Returns the builder for the settings used for calls to deleteCompany. */
-    public UnaryCallSettings.Builder<DeleteCompanyRequest, Empty> deleteCompanySettings() {
-      return deleteCompanySettings;
-    }
-
     /** Returns the builder for the settings used for calls to createCompany. */
     public UnaryCallSettings.Builder<CreateCompanyRequest, Company> createCompanySettings() {
       return createCompanySettings;
@@ -427,6 +434,11 @@ public UnaryCallSettings.Builder<UpdateCompanyRequest, Company> updateCompanySet
       return updateCompanySettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteCompany. */
+    public UnaryCallSettings.Builder<DeleteCompanyRequest, Empty> deleteCompanySettings() {
+      return deleteCompanySettings;
+    }
+
     /** Returns the builder for the settings used for calls to listCompanies. */
     public PagedCallSettings.Builder<
             ListCompaniesRequest, ListCompaniesResponse, ListCompaniesPagedResponse>
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompletionStubSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompletionStubSettings.java
index 03c3bcb4..c495de34 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompletionStubSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/CompletionStubSettings.java
@@ -176,11 +176,11 @@ public static class Builder extends StubSettings.Builder<CompletionStubSettings,
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_6_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -194,12 +194,14 @@ public static class Builder extends StubSettings.Builder<CompletionStubSettings,
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("retry_policy_6_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -231,8 +233,8 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .completeQuerySettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_6_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_6_params"));
 
       return builder;
     }
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/EventServiceStubSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/EventServiceStubSettings.java
index 133405e1..d29b05d6 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/EventServiceStubSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/EventServiceStubSettings.java
@@ -174,12 +174,9 @@ public static class Builder extends StubSettings.Builder<EventServiceStubSetting
     static {
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       definitions.put(
-          "idempotent",
-          ImmutableSet.copyOf(
-              Lists.<StatusCode.Code>newArrayList(
-                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -188,17 +185,16 @@ public static class Builder extends StubSettings.Builder<EventServiceStubSetting
     static {
       ImmutableMap.Builder<String, RetrySettings> definitions = ImmutableMap.builder();
       RetrySettings settings = null;
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
       settings =
           RetrySettings.newBuilder()
-              .setInitialRetryDelay(Duration.ofMillis(100L))
-              .setRetryDelayMultiplier(1.3)
-              .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_1_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -230,8 +226,8 @@ private static Builder initDefaults(Builder builder) {
 
       builder
           .createClientEventSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_1_params"));
 
       return builder;
     }
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcApplicationServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcApplicationServiceStub.java
index 90293fb2..7d0cfb68 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcApplicationServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcApplicationServiceStub.java
@@ -51,15 +51,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcApplicationServiceStub extends ApplicationServiceStub {
 
-  private static final MethodDescriptor<DeleteApplicationRequest, Empty>
-      deleteApplicationMethodDescriptor =
-          MethodDescriptor.<DeleteApplicationRequest, Empty>newBuilder()
-              .setType(MethodDescriptor.MethodType.UNARY)
-              .setFullMethodName("google.cloud.talent.v4beta1.ApplicationService/DeleteApplication")
-              .setRequestMarshaller(
-                  ProtoUtils.marshaller(DeleteApplicationRequest.getDefaultInstance()))
-              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-              .build();
   private static final MethodDescriptor<CreateApplicationRequest, Application>
       createApplicationMethodDescriptor =
           MethodDescriptor.<CreateApplicationRequest, Application>newBuilder()
@@ -87,6 +78,15 @@ public class GrpcApplicationServiceStub extends ApplicationServiceStub {
                   ProtoUtils.marshaller(UpdateApplicationRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Application.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor<DeleteApplicationRequest, Empty>
+      deleteApplicationMethodDescriptor =
+          MethodDescriptor.<DeleteApplicationRequest, Empty>newBuilder()
+              .setType(MethodDescriptor.MethodType.UNARY)
+              .setFullMethodName("google.cloud.talent.v4beta1.ApplicationService/DeleteApplication")
+              .setRequestMarshaller(
+                  ProtoUtils.marshaller(DeleteApplicationRequest.getDefaultInstance()))
+              .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+              .build();
   private static final MethodDescriptor<ListApplicationsRequest, ListApplicationsResponse>
       listApplicationsMethodDescriptor =
           MethodDescriptor.<ListApplicationsRequest, ListApplicationsResponse>newBuilder()
@@ -100,10 +100,10 @@ public class GrpcApplicationServiceStub extends ApplicationServiceStub {
 
   private final BackgroundResource backgroundResources;
 
-  private final UnaryCallable<DeleteApplicationRequest, Empty> deleteApplicationCallable;
   private final UnaryCallable<CreateApplicationRequest, Application> createApplicationCallable;
   private final UnaryCallable<GetApplicationRequest, Application> getApplicationCallable;
   private final UnaryCallable<UpdateApplicationRequest, Application> updateApplicationCallable;
+  private final UnaryCallable<DeleteApplicationRequest, Empty> deleteApplicationCallable;
   private final UnaryCallable<ListApplicationsRequest, ListApplicationsResponse>
       listApplicationsCallable;
   private final UnaryCallable<ListApplicationsRequest, ListApplicationsPagedResponse>
@@ -150,19 +150,6 @@ protected GrpcApplicationServiceStub(
       throws IOException {
     this.callableFactory = callableFactory;
 
-    GrpcCallSettings<DeleteApplicationRequest, Empty> deleteApplicationTransportSettings =
-        GrpcCallSettings.<DeleteApplicationRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteApplicationMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteApplicationRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteApplicationRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<CreateApplicationRequest, Application> createApplicationTransportSettings =
         GrpcCallSettings.<CreateApplicationRequest, Application>newBuilder()
             .setMethodDescriptor(createApplicationMethodDescriptor)
@@ -203,6 +190,19 @@ public Map<String, String> extract(UpdateApplicationRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings<DeleteApplicationRequest, Empty> deleteApplicationTransportSettings =
+        GrpcCallSettings.<DeleteApplicationRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteApplicationMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteApplicationRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteApplicationRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<ListApplicationsRequest, ListApplicationsResponse>
         listApplicationsTransportSettings =
             GrpcCallSettings.<ListApplicationsRequest, ListApplicationsResponse>newBuilder()
@@ -218,11 +218,6 @@ public Map<String, String> extract(ListApplicationsRequest request) {
                     })
                 .build();
 
-    this.deleteApplicationCallable =
-        callableFactory.createUnaryCallable(
-            deleteApplicationTransportSettings,
-            settings.deleteApplicationSettings(),
-            clientContext);
     this.createApplicationCallable =
         callableFactory.createUnaryCallable(
             createApplicationTransportSettings,
@@ -236,6 +231,11 @@ public Map<String, String> extract(ListApplicationsRequest request) {
             updateApplicationTransportSettings,
             settings.updateApplicationSettings(),
             clientContext);
+    this.deleteApplicationCallable =
+        callableFactory.createUnaryCallable(
+            deleteApplicationTransportSettings,
+            settings.deleteApplicationSettings(),
+            clientContext);
     this.listApplicationsCallable =
         callableFactory.createUnaryCallable(
             listApplicationsTransportSettings, settings.listApplicationsSettings(), clientContext);
@@ -246,10 +246,6 @@ public Map<String, String> extract(ListApplicationsRequest request) {
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
-  public UnaryCallable<DeleteApplicationRequest, Empty> deleteApplicationCallable() {
-    return deleteApplicationCallable;
-  }
-
   public UnaryCallable<CreateApplicationRequest, Application> createApplicationCallable() {
     return createApplicationCallable;
   }
@@ -262,6 +258,10 @@ public UnaryCallable<UpdateApplicationRequest, Application> updateApplicationCal
     return updateApplicationCallable;
   }
 
+  public UnaryCallable<DeleteApplicationRequest, Empty> deleteApplicationCallable() {
+    return deleteApplicationCallable;
+  }
+
   public UnaryCallable<ListApplicationsRequest, ListApplicationsPagedResponse>
       listApplicationsPagedCallable() {
     return listApplicationsPagedCallable;
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcCompanyServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcCompanyServiceStub.java
index 2beeb69b..732ae646 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcCompanyServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcCompanyServiceStub.java
@@ -51,13 +51,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcCompanyServiceStub extends CompanyServiceStub {
 
-  private static final MethodDescriptor<DeleteCompanyRequest, Empty> deleteCompanyMethodDescriptor =
-      MethodDescriptor.<DeleteCompanyRequest, Empty>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.talent.v4beta1.CompanyService/DeleteCompany")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteCompanyRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<CreateCompanyRequest, Company>
       createCompanyMethodDescriptor =
           MethodDescriptor.<CreateCompanyRequest, Company>newBuilder()
@@ -83,6 +76,13 @@ public class GrpcCompanyServiceStub extends CompanyServiceStub {
                   ProtoUtils.marshaller(UpdateCompanyRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Company.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor<DeleteCompanyRequest, Empty> deleteCompanyMethodDescriptor =
+      MethodDescriptor.<DeleteCompanyRequest, Empty>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.talent.v4beta1.CompanyService/DeleteCompany")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteCompanyRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+          .build();
   private static final MethodDescriptor<ListCompaniesRequest, ListCompaniesResponse>
       listCompaniesMethodDescriptor =
           MethodDescriptor.<ListCompaniesRequest, ListCompaniesResponse>newBuilder()
@@ -96,10 +96,10 @@ public class GrpcCompanyServiceStub extends CompanyServiceStub {
 
   private final BackgroundResource backgroundResources;
 
-  private final UnaryCallable<DeleteCompanyRequest, Empty> deleteCompanyCallable;
   private final UnaryCallable<CreateCompanyRequest, Company> createCompanyCallable;
   private final UnaryCallable<GetCompanyRequest, Company> getCompanyCallable;
   private final UnaryCallable<UpdateCompanyRequest, Company> updateCompanyCallable;
+  private final UnaryCallable<DeleteCompanyRequest, Empty> deleteCompanyCallable;
   private final UnaryCallable<ListCompaniesRequest, ListCompaniesResponse> listCompaniesCallable;
   private final UnaryCallable<ListCompaniesRequest, ListCompaniesPagedResponse>
       listCompaniesPagedCallable;
@@ -145,19 +145,6 @@ protected GrpcCompanyServiceStub(
       throws IOException {
     this.callableFactory = callableFactory;
 
-    GrpcCallSettings<DeleteCompanyRequest, Empty> deleteCompanyTransportSettings =
-        GrpcCallSettings.<DeleteCompanyRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteCompanyMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteCompanyRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteCompanyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<CreateCompanyRequest, Company> createCompanyTransportSettings =
         GrpcCallSettings.<CreateCompanyRequest, Company>newBuilder()
             .setMethodDescriptor(createCompanyMethodDescriptor)
@@ -197,6 +184,19 @@ public Map<String, String> extract(UpdateCompanyRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings<DeleteCompanyRequest, Empty> deleteCompanyTransportSettings =
+        GrpcCallSettings.<DeleteCompanyRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteCompanyMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteCompanyRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteCompanyRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<ListCompaniesRequest, ListCompaniesResponse> listCompaniesTransportSettings =
         GrpcCallSettings.<ListCompaniesRequest, ListCompaniesResponse>newBuilder()
             .setMethodDescriptor(listCompaniesMethodDescriptor)
@@ -211,9 +211,6 @@ public Map<String, String> extract(ListCompaniesRequest request) {
                 })
             .build();
 
-    this.deleteCompanyCallable =
-        callableFactory.createUnaryCallable(
-            deleteCompanyTransportSettings, settings.deleteCompanySettings(), clientContext);
     this.createCompanyCallable =
         callableFactory.createUnaryCallable(
             createCompanyTransportSettings, settings.createCompanySettings(), clientContext);
@@ -223,6 +220,9 @@ public Map<String, String> extract(ListCompaniesRequest request) {
     this.updateCompanyCallable =
         callableFactory.createUnaryCallable(
             updateCompanyTransportSettings, settings.updateCompanySettings(), clientContext);
+    this.deleteCompanyCallable =
+        callableFactory.createUnaryCallable(
+            deleteCompanyTransportSettings, settings.deleteCompanySettings(), clientContext);
     this.listCompaniesCallable =
         callableFactory.createUnaryCallable(
             listCompaniesTransportSettings, settings.listCompaniesSettings(), clientContext);
@@ -233,10 +233,6 @@ public Map<String, String> extract(ListCompaniesRequest request) {
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
-  public UnaryCallable<DeleteCompanyRequest, Empty> deleteCompanyCallable() {
-    return deleteCompanyCallable;
-  }
-
   public UnaryCallable<CreateCompanyRequest, Company> createCompanyCallable() {
     return createCompanyCallable;
   }
@@ -249,6 +245,10 @@ public UnaryCallable<UpdateCompanyRequest, Company> updateCompanyCallable() {
     return updateCompanyCallable;
   }
 
+  public UnaryCallable<DeleteCompanyRequest, Empty> deleteCompanyCallable() {
+    return deleteCompanyCallable;
+  }
+
   public UnaryCallable<ListCompaniesRequest, ListCompaniesPagedResponse>
       listCompaniesPagedCallable() {
     return listCompaniesPagedCallable;
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcJobServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcJobServiceStub.java
index c605e6d4..f4199699 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcJobServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcJobServiceStub.java
@@ -63,13 +63,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcJobServiceStub extends JobServiceStub {
 
-  private static final MethodDescriptor<DeleteJobRequest, Empty> deleteJobMethodDescriptor =
-      MethodDescriptor.<DeleteJobRequest, Empty>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.talent.v4beta1.JobService/DeleteJob")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteJobRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<CreateJobRequest, Job> createJobMethodDescriptor =
       MethodDescriptor.<CreateJobRequest, Job>newBuilder()
           .setType(MethodDescriptor.MethodType.UNARY)
@@ -109,6 +102,13 @@ public class GrpcJobServiceStub extends JobServiceStub {
                   ProtoUtils.marshaller(BatchUpdateJobsRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Operation.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor<DeleteJobRequest, Empty> deleteJobMethodDescriptor =
+      MethodDescriptor.<DeleteJobRequest, Empty>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.talent.v4beta1.JobService/DeleteJob")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteJobRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+          .build();
   private static final MethodDescriptor<BatchDeleteJobsRequest, Empty>
       batchDeleteJobsMethodDescriptor =
           MethodDescriptor.<BatchDeleteJobsRequest, Empty>newBuilder()
@@ -146,7 +146,6 @@ public class GrpcJobServiceStub extends JobServiceStub {
   private final BackgroundResource backgroundResources;
   private final GrpcOperationsStub operationsStub;
 
-  private final UnaryCallable<DeleteJobRequest, Empty> deleteJobCallable;
   private final UnaryCallable<CreateJobRequest, Job> createJobCallable;
   private final UnaryCallable<BatchCreateJobsRequest, Operation> batchCreateJobsCallable;
   private final OperationCallable<
@@ -158,6 +157,7 @@ public class GrpcJobServiceStub extends JobServiceStub {
   private final OperationCallable<
           BatchUpdateJobsRequest, JobOperationResult, BatchOperationMetadata>
       batchUpdateJobsOperationCallable;
+  private final UnaryCallable<DeleteJobRequest, Empty> deleteJobCallable;
   private final UnaryCallable<BatchDeleteJobsRequest, Empty> batchDeleteJobsCallable;
   private final UnaryCallable<ListJobsRequest, ListJobsResponse> listJobsCallable;
   private final UnaryCallable<ListJobsRequest, ListJobsPagedResponse> listJobsPagedCallable;
@@ -207,19 +207,6 @@ protected GrpcJobServiceStub(
     this.callableFactory = callableFactory;
     this.operationsStub = GrpcOperationsStub.create(clientContext, callableFactory);
 
-    GrpcCallSettings<DeleteJobRequest, Empty> deleteJobTransportSettings =
-        GrpcCallSettings.<DeleteJobRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteJobMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteJobRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteJobRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<CreateJobRequest, Job> createJobTransportSettings =
         GrpcCallSettings.<CreateJobRequest, Job>newBuilder()
             .setMethodDescriptor(createJobMethodDescriptor)
@@ -285,6 +272,19 @@ public Map<String, String> extract(BatchUpdateJobsRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings<DeleteJobRequest, Empty> deleteJobTransportSettings =
+        GrpcCallSettings.<DeleteJobRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteJobMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteJobRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteJobRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<BatchDeleteJobsRequest, Empty> batchDeleteJobsTransportSettings =
         GrpcCallSettings.<BatchDeleteJobsRequest, Empty>newBuilder()
             .setMethodDescriptor(batchDeleteJobsMethodDescriptor)
@@ -338,9 +338,6 @@ public Map<String, String> extract(SearchJobsRequest request) {
                 })
             .build();
 
-    this.deleteJobCallable =
-        callableFactory.createUnaryCallable(
-            deleteJobTransportSettings, settings.deleteJobSettings(), clientContext);
     this.createJobCallable =
         callableFactory.createUnaryCallable(
             createJobTransportSettings, settings.createJobSettings(), clientContext);
@@ -368,6 +365,9 @@ public Map<String, String> extract(SearchJobsRequest request) {
             settings.batchUpdateJobsOperationSettings(),
             clientContext,
             this.operationsStub);
+    this.deleteJobCallable =
+        callableFactory.createUnaryCallable(
+            deleteJobTransportSettings, settings.deleteJobSettings(), clientContext);
     this.batchDeleteJobsCallable =
         callableFactory.createUnaryCallable(
             batchDeleteJobsTransportSettings, settings.batchDeleteJobsSettings(), clientContext);
@@ -402,10 +402,6 @@ public GrpcOperationsStub getOperationsStub() {
     return operationsStub;
   }
 
-  public UnaryCallable<DeleteJobRequest, Empty> deleteJobCallable() {
-    return deleteJobCallable;
-  }
-
   public UnaryCallable<CreateJobRequest, Job> createJobCallable() {
     return createJobCallable;
   }
@@ -438,6 +434,10 @@ public UnaryCallable<BatchUpdateJobsRequest, Operation> batchUpdateJobsCallable(
     return batchUpdateJobsCallable;
   }
 
+  public UnaryCallable<DeleteJobRequest, Empty> deleteJobCallable() {
+    return deleteJobCallable;
+  }
+
   public UnaryCallable<BatchDeleteJobsRequest, Empty> batchDeleteJobsCallable() {
     return batchDeleteJobsCallable;
   }
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcProfileServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcProfileServiceStub.java
index 3224b2b4..646753e1 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcProfileServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcProfileServiceStub.java
@@ -54,13 +54,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcProfileServiceStub extends ProfileServiceStub {
 
-  private static final MethodDescriptor<DeleteProfileRequest, Empty> deleteProfileMethodDescriptor =
-      MethodDescriptor.<DeleteProfileRequest, Empty>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.talent.v4beta1.ProfileService/DeleteProfile")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteProfileRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<SearchProfilesRequest, SearchProfilesResponse>
       searchProfilesMethodDescriptor =
           MethodDescriptor.<SearchProfilesRequest, SearchProfilesResponse>newBuilder()
@@ -105,10 +98,16 @@ public class GrpcProfileServiceStub extends ProfileServiceStub {
                   ProtoUtils.marshaller(UpdateProfileRequest.getDefaultInstance()))
               .setResponseMarshaller(ProtoUtils.marshaller(Profile.getDefaultInstance()))
               .build();
+  private static final MethodDescriptor<DeleteProfileRequest, Empty> deleteProfileMethodDescriptor =
+      MethodDescriptor.<DeleteProfileRequest, Empty>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.talent.v4beta1.ProfileService/DeleteProfile")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteProfileRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+          .build();
 
   private final BackgroundResource backgroundResources;
 
-  private final UnaryCallable<DeleteProfileRequest, Empty> deleteProfileCallable;
   private final UnaryCallable<SearchProfilesRequest, SearchProfilesResponse> searchProfilesCallable;
   private final UnaryCallable<SearchProfilesRequest, SearchProfilesPagedResponse>
       searchProfilesPagedCallable;
@@ -118,6 +117,7 @@ public class GrpcProfileServiceStub extends ProfileServiceStub {
   private final UnaryCallable<CreateProfileRequest, Profile> createProfileCallable;
   private final UnaryCallable<GetProfileRequest, Profile> getProfileCallable;
   private final UnaryCallable<UpdateProfileRequest, Profile> updateProfileCallable;
+  private final UnaryCallable<DeleteProfileRequest, Empty> deleteProfileCallable;
 
   private final GrpcStubCallableFactory callableFactory;
 
@@ -160,19 +160,6 @@ protected GrpcProfileServiceStub(
       throws IOException {
     this.callableFactory = callableFactory;
 
-    GrpcCallSettings<DeleteProfileRequest, Empty> deleteProfileTransportSettings =
-        GrpcCallSettings.<DeleteProfileRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteProfileMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteProfileRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteProfileRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<SearchProfilesRequest, SearchProfilesResponse>
         searchProfilesTransportSettings =
             GrpcCallSettings.<SearchProfilesRequest, SearchProfilesResponse>newBuilder()
@@ -239,10 +226,20 @@ public Map<String, String> extract(UpdateProfileRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings<DeleteProfileRequest, Empty> deleteProfileTransportSettings =
+        GrpcCallSettings.<DeleteProfileRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteProfileMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteProfileRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteProfileRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
 
-    this.deleteProfileCallable =
-        callableFactory.createUnaryCallable(
-            deleteProfileTransportSettings, settings.deleteProfileSettings(), clientContext);
     this.searchProfilesCallable =
         callableFactory.createUnaryCallable(
             searchProfilesTransportSettings, settings.searchProfilesSettings(), clientContext);
@@ -264,14 +261,13 @@ public Map<String, String> extract(UpdateProfileRequest request) {
     this.updateProfileCallable =
         callableFactory.createUnaryCallable(
             updateProfileTransportSettings, settings.updateProfileSettings(), clientContext);
+    this.deleteProfileCallable =
+        callableFactory.createUnaryCallable(
+            deleteProfileTransportSettings, settings.deleteProfileSettings(), clientContext);
 
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
-  public UnaryCallable<DeleteProfileRequest, Empty> deleteProfileCallable() {
-    return deleteProfileCallable;
-  }
-
   public UnaryCallable<SearchProfilesRequest, SearchProfilesPagedResponse>
       searchProfilesPagedCallable() {
     return searchProfilesPagedCallable;
@@ -301,6 +297,10 @@ public UnaryCallable<UpdateProfileRequest, Profile> updateProfileCallable() {
     return updateProfileCallable;
   }
 
+  public UnaryCallable<DeleteProfileRequest, Empty> deleteProfileCallable() {
+    return deleteProfileCallable;
+  }
+
   @Override
   public final void close() {
     shutdown();
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcTenantServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcTenantServiceStub.java
index 60fadda0..92821cdf 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcTenantServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/GrpcTenantServiceStub.java
@@ -51,13 +51,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public class GrpcTenantServiceStub extends TenantServiceStub {
 
-  private static final MethodDescriptor<DeleteTenantRequest, Empty> deleteTenantMethodDescriptor =
-      MethodDescriptor.<DeleteTenantRequest, Empty>newBuilder()
-          .setType(MethodDescriptor.MethodType.UNARY)
-          .setFullMethodName("google.cloud.talent.v4beta1.TenantService/DeleteTenant")
-          .setRequestMarshaller(ProtoUtils.marshaller(DeleteTenantRequest.getDefaultInstance()))
-          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
-          .build();
   private static final MethodDescriptor<CreateTenantRequest, Tenant> createTenantMethodDescriptor =
       MethodDescriptor.<CreateTenantRequest, Tenant>newBuilder()
           .setType(MethodDescriptor.MethodType.UNARY)
@@ -79,6 +72,13 @@ public class GrpcTenantServiceStub extends TenantServiceStub {
           .setRequestMarshaller(ProtoUtils.marshaller(UpdateTenantRequest.getDefaultInstance()))
           .setResponseMarshaller(ProtoUtils.marshaller(Tenant.getDefaultInstance()))
           .build();
+  private static final MethodDescriptor<DeleteTenantRequest, Empty> deleteTenantMethodDescriptor =
+      MethodDescriptor.<DeleteTenantRequest, Empty>newBuilder()
+          .setType(MethodDescriptor.MethodType.UNARY)
+          .setFullMethodName("google.cloud.talent.v4beta1.TenantService/DeleteTenant")
+          .setRequestMarshaller(ProtoUtils.marshaller(DeleteTenantRequest.getDefaultInstance()))
+          .setResponseMarshaller(ProtoUtils.marshaller(Empty.getDefaultInstance()))
+          .build();
   private static final MethodDescriptor<ListTenantsRequest, ListTenantsResponse>
       listTenantsMethodDescriptor =
           MethodDescriptor.<ListTenantsRequest, ListTenantsResponse>newBuilder()
@@ -91,10 +91,10 @@ public class GrpcTenantServiceStub extends TenantServiceStub {
 
   private final BackgroundResource backgroundResources;
 
-  private final UnaryCallable<DeleteTenantRequest, Empty> deleteTenantCallable;
   private final UnaryCallable<CreateTenantRequest, Tenant> createTenantCallable;
   private final UnaryCallable<GetTenantRequest, Tenant> getTenantCallable;
   private final UnaryCallable<UpdateTenantRequest, Tenant> updateTenantCallable;
+  private final UnaryCallable<DeleteTenantRequest, Empty> deleteTenantCallable;
   private final UnaryCallable<ListTenantsRequest, ListTenantsResponse> listTenantsCallable;
   private final UnaryCallable<ListTenantsRequest, ListTenantsPagedResponse>
       listTenantsPagedCallable;
@@ -138,19 +138,6 @@ protected GrpcTenantServiceStub(
       throws IOException {
     this.callableFactory = callableFactory;
 
-    GrpcCallSettings<DeleteTenantRequest, Empty> deleteTenantTransportSettings =
-        GrpcCallSettings.<DeleteTenantRequest, Empty>newBuilder()
-            .setMethodDescriptor(deleteTenantMethodDescriptor)
-            .setParamsExtractor(
-                new RequestParamsExtractor<DeleteTenantRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteTenantRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
-                })
-            .build();
     GrpcCallSettings<CreateTenantRequest, Tenant> createTenantTransportSettings =
         GrpcCallSettings.<CreateTenantRequest, Tenant>newBuilder()
             .setMethodDescriptor(createTenantMethodDescriptor)
@@ -190,6 +177,19 @@ public Map<String, String> extract(UpdateTenantRequest request) {
                   }
                 })
             .build();
+    GrpcCallSettings<DeleteTenantRequest, Empty> deleteTenantTransportSettings =
+        GrpcCallSettings.<DeleteTenantRequest, Empty>newBuilder()
+            .setMethodDescriptor(deleteTenantMethodDescriptor)
+            .setParamsExtractor(
+                new RequestParamsExtractor<DeleteTenantRequest>() {
+                  @Override
+                  public Map<String, String> extract(DeleteTenantRequest request) {
+                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                    params.put("name", String.valueOf(request.getName()));
+                    return params.build();
+                  }
+                })
+            .build();
     GrpcCallSettings<ListTenantsRequest, ListTenantsResponse> listTenantsTransportSettings =
         GrpcCallSettings.<ListTenantsRequest, ListTenantsResponse>newBuilder()
             .setMethodDescriptor(listTenantsMethodDescriptor)
@@ -204,9 +204,6 @@ public Map<String, String> extract(ListTenantsRequest request) {
                 })
             .build();
 
-    this.deleteTenantCallable =
-        callableFactory.createUnaryCallable(
-            deleteTenantTransportSettings, settings.deleteTenantSettings(), clientContext);
     this.createTenantCallable =
         callableFactory.createUnaryCallable(
             createTenantTransportSettings, settings.createTenantSettings(), clientContext);
@@ -216,6 +213,9 @@ public Map<String, String> extract(ListTenantsRequest request) {
     this.updateTenantCallable =
         callableFactory.createUnaryCallable(
             updateTenantTransportSettings, settings.updateTenantSettings(), clientContext);
+    this.deleteTenantCallable =
+        callableFactory.createUnaryCallable(
+            deleteTenantTransportSettings, settings.deleteTenantSettings(), clientContext);
     this.listTenantsCallable =
         callableFactory.createUnaryCallable(
             listTenantsTransportSettings, settings.listTenantsSettings(), clientContext);
@@ -226,10 +226,6 @@ public Map<String, String> extract(ListTenantsRequest request) {
     backgroundResources = new BackgroundResourceAggregation(clientContext.getBackgroundResources());
   }
 
-  public UnaryCallable<DeleteTenantRequest, Empty> deleteTenantCallable() {
-    return deleteTenantCallable;
-  }
-
   public UnaryCallable<CreateTenantRequest, Tenant> createTenantCallable() {
     return createTenantCallable;
   }
@@ -242,6 +238,10 @@ public UnaryCallable<UpdateTenantRequest, Tenant> updateTenantCallable() {
     return updateTenantCallable;
   }
 
+  public UnaryCallable<DeleteTenantRequest, Empty> deleteTenantCallable() {
+    return deleteTenantCallable;
+  }
+
   public UnaryCallable<ListTenantsRequest, ListTenantsPagedResponse> listTenantsPagedCallable() {
     return listTenantsPagedCallable;
   }
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/JobServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/JobServiceStub.java
index 0e14e039..86474e0e 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/JobServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/JobServiceStub.java
@@ -57,10 +57,6 @@ public OperationsStub getOperationsStub() {
     throw new UnsupportedOperationException("Not implemented: getOperationsStub()");
   }
 
-  public UnaryCallable<DeleteJobRequest, Empty> deleteJobCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteJobCallable()");
-  }
-
   public UnaryCallable<CreateJobRequest, Job> createJobCallable() {
     throw new UnsupportedOperationException("Not implemented: createJobCallable()");
   }
@@ -93,6 +89,10 @@ public UnaryCallable<BatchUpdateJobsRequest, Operation> batchUpdateJobsCallable(
     throw new UnsupportedOperationException("Not implemented: batchUpdateJobsCallable()");
   }
 
+  public UnaryCallable<DeleteJobRequest, Empty> deleteJobCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteJobCallable()");
+  }
+
   public UnaryCallable<BatchDeleteJobsRequest, Empty> batchDeleteJobsCallable() {
     throw new UnsupportedOperationException("Not implemented: batchDeleteJobsCallable()");
   }
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/JobServiceStubSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/JobServiceStubSettings.java
index dde89e8b..f3cf4158 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/JobServiceStubSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/JobServiceStubSettings.java
@@ -85,16 +85,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteJob to 30 seconds:
+ * <p>For example, to set the total timeout of createJob to 30 seconds:
  *
  * <pre>
  * <code>
  * JobServiceStubSettings.Builder jobServiceSettingsBuilder =
  *     JobServiceStubSettings.newBuilder();
  * jobServiceSettingsBuilder
- *     .deleteJobSettings()
+ *     .createJobSettings()
  *     .setRetrySettings(
- *         jobServiceSettingsBuilder.deleteJobSettings().getRetrySettings().toBuilder()
+ *         jobServiceSettingsBuilder.createJobSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * JobServiceStubSettings jobServiceSettings = jobServiceSettingsBuilder.build();
@@ -111,7 +111,6 @@ public class JobServiceStubSettings extends StubSettings<JobServiceStubSettings>
           .add("https://www.googleapis.com/auth/jobs")
           .build();
 
-  private final UnaryCallSettings<DeleteJobRequest, Empty> deleteJobSettings;
   private final UnaryCallSettings<CreateJobRequest, Job> createJobSettings;
   private final UnaryCallSettings<BatchCreateJobsRequest, Operation> batchCreateJobsSettings;
   private final OperationCallSettings<
@@ -123,6 +122,7 @@ public class JobServiceStubSettings extends StubSettings<JobServiceStubSettings>
   private final OperationCallSettings<
           BatchUpdateJobsRequest, JobOperationResult, BatchOperationMetadata>
       batchUpdateJobsOperationSettings;
+  private final UnaryCallSettings<DeleteJobRequest, Empty> deleteJobSettings;
   private final UnaryCallSettings<BatchDeleteJobsRequest, Empty> batchDeleteJobsSettings;
   private final PagedCallSettings<ListJobsRequest, ListJobsResponse, ListJobsPagedResponse>
       listJobsSettings;
@@ -132,11 +132,6 @@ public class JobServiceStubSettings extends StubSettings<JobServiceStubSettings>
           SearchJobsRequest, SearchJobsResponse, SearchJobsForAlertPagedResponse>
       searchJobsForAlertSettings;
 
-  /** Returns the object with the settings used for calls to deleteJob. */
-  public UnaryCallSettings<DeleteJobRequest, Empty> deleteJobSettings() {
-    return deleteJobSettings;
-  }
-
   /** Returns the object with the settings used for calls to createJob. */
   public UnaryCallSettings<CreateJobRequest, Job> createJobSettings() {
     return createJobSettings;
@@ -176,6 +171,11 @@ public UnaryCallSettings<BatchUpdateJobsRequest, Operation> batchUpdateJobsSetti
     return batchUpdateJobsOperationSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteJob. */
+  public UnaryCallSettings<DeleteJobRequest, Empty> deleteJobSettings() {
+    return deleteJobSettings;
+  }
+
   /** Returns the object with the settings used for calls to batchDeleteJobs. */
   public UnaryCallSettings<BatchDeleteJobsRequest, Empty> batchDeleteJobsSettings() {
     return batchDeleteJobsSettings;
@@ -268,7 +268,6 @@ public Builder toBuilder() {
   protected JobServiceStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
-    deleteJobSettings = settingsBuilder.deleteJobSettings().build();
     createJobSettings = settingsBuilder.createJobSettings().build();
     batchCreateJobsSettings = settingsBuilder.batchCreateJobsSettings().build();
     batchCreateJobsOperationSettings = settingsBuilder.batchCreateJobsOperationSettings().build();
@@ -276,6 +275,7 @@ protected JobServiceStubSettings(Builder settingsBuilder) throws IOException {
     updateJobSettings = settingsBuilder.updateJobSettings().build();
     batchUpdateJobsSettings = settingsBuilder.batchUpdateJobsSettings().build();
     batchUpdateJobsOperationSettings = settingsBuilder.batchUpdateJobsOperationSettings().build();
+    deleteJobSettings = settingsBuilder.deleteJobSettings().build();
     batchDeleteJobsSettings = settingsBuilder.batchDeleteJobsSettings().build();
     listJobsSettings = settingsBuilder.listJobsSettings().build();
     searchJobsSettings = settingsBuilder.searchJobsSettings().build();
@@ -453,7 +453,6 @@ public ApiFuture<SearchJobsForAlertPagedResponse> getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder<JobServiceStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
-    private final UnaryCallSettings.Builder<DeleteJobRequest, Empty> deleteJobSettings;
     private final UnaryCallSettings.Builder<CreateJobRequest, Job> createJobSettings;
     private final UnaryCallSettings.Builder<BatchCreateJobsRequest, Operation>
         batchCreateJobsSettings;
@@ -467,6 +466,7 @@ public static class Builder extends StubSettings.Builder<JobServiceStubSettings,
     private final OperationCallSettings.Builder<
             BatchUpdateJobsRequest, JobOperationResult, BatchOperationMetadata>
         batchUpdateJobsOperationSettings;
+    private final UnaryCallSettings.Builder<DeleteJobRequest, Empty> deleteJobSettings;
     private final UnaryCallSettings.Builder<BatchDeleteJobsRequest, Empty> batchDeleteJobsSettings;
     private final PagedCallSettings.Builder<
             ListJobsRequest, ListJobsResponse, ListJobsPagedResponse>
@@ -484,12 +484,14 @@ public static class Builder extends StubSettings.Builder<JobServiceStubSettings,
     static {
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       definitions.put(
-          "idempotent",
+          "retry_policy_3_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -498,17 +500,27 @@ public static class Builder extends StubSettings.Builder<JobServiceStubSettings,
     static {
       ImmutableMap.Builder<String, RetrySettings> definitions = ImmutableMap.builder();
       RetrySettings settings = null;
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_3_params", settings);
       settings =
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("retry_policy_3_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -519,8 +531,6 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
-      deleteJobSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       createJobSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       batchCreateJobsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
@@ -535,6 +545,8 @@ protected Builder(ClientContext clientContext) {
 
       batchUpdateJobsOperationSettings = OperationCallSettings.newBuilder();
 
+      deleteJobSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       batchDeleteJobsSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       listJobsSettings = PagedCallSettings.newBuilder(LIST_JOBS_PAGE_STR_FACT);
@@ -546,12 +558,12 @@ protected Builder(ClientContext clientContext) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteJobSettings,
               createJobSettings,
               batchCreateJobsSettings,
               getJobSettings,
               updateJobSettings,
               batchUpdateJobsSettings,
+              deleteJobSettings,
               batchDeleteJobsSettings,
               listJobsSettings,
               searchJobsSettings,
@@ -571,62 +583,62 @@ private static Builder createDefault() {
 
     private static Builder initDefaults(Builder builder) {
 
-      builder
-          .deleteJobSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .createJobSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
 
       builder
           .batchCreateJobsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
 
       builder
           .getJobSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
 
       builder
           .updateJobSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
 
       builder
           .batchUpdateJobsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
+
+      builder
+          .deleteJobSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
 
       builder
           .batchDeleteJobsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
 
       builder
           .listJobsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_3_params"));
 
       builder
           .searchJobsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
 
       builder
           .searchJobsForAlertSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"));
       builder
           .batchCreateJobsOperationSettings()
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchCreateJobsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(JobOperationResult.class))
@@ -648,8 +660,8 @@ private static Builder initDefaults(Builder builder) {
           .setInitialCallSettings(
               UnaryCallSettings
                   .<BatchUpdateJobsRequest, OperationSnapshot>newUnaryCallSettingsBuilder()
-                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"))
+                  .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_3_codes"))
+                  .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_3_params"))
                   .build())
           .setResponseTransformer(
               ProtoOperationTransformers.ResponseTransformer.create(JobOperationResult.class))
@@ -673,7 +685,6 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(JobServiceStubSettings settings) {
       super(settings);
 
-      deleteJobSettings = settings.deleteJobSettings.toBuilder();
       createJobSettings = settings.createJobSettings.toBuilder();
       batchCreateJobsSettings = settings.batchCreateJobsSettings.toBuilder();
       batchCreateJobsOperationSettings = settings.batchCreateJobsOperationSettings.toBuilder();
@@ -681,6 +692,7 @@ protected Builder(JobServiceStubSettings settings) {
       updateJobSettings = settings.updateJobSettings.toBuilder();
       batchUpdateJobsSettings = settings.batchUpdateJobsSettings.toBuilder();
       batchUpdateJobsOperationSettings = settings.batchUpdateJobsOperationSettings.toBuilder();
+      deleteJobSettings = settings.deleteJobSettings.toBuilder();
       batchDeleteJobsSettings = settings.batchDeleteJobsSettings.toBuilder();
       listJobsSettings = settings.listJobsSettings.toBuilder();
       searchJobsSettings = settings.searchJobsSettings.toBuilder();
@@ -688,12 +700,12 @@ protected Builder(JobServiceStubSettings settings) {
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteJobSettings,
               createJobSettings,
               batchCreateJobsSettings,
               getJobSettings,
               updateJobSettings,
               batchUpdateJobsSettings,
+              deleteJobSettings,
               batchDeleteJobsSettings,
               listJobsSettings,
               searchJobsSettings,
@@ -716,11 +728,6 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
-    /** Returns the builder for the settings used for calls to deleteJob. */
-    public UnaryCallSettings.Builder<DeleteJobRequest, Empty> deleteJobSettings() {
-      return deleteJobSettings;
-    }
-
     /** Returns the builder for the settings used for calls to createJob. */
     public UnaryCallSettings.Builder<CreateJobRequest, Job> createJobSettings() {
       return createJobSettings;
@@ -764,6 +771,11 @@ public UnaryCallSettings.Builder<BatchUpdateJobsRequest, Operation> batchUpdateJ
       return batchUpdateJobsOperationSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteJob. */
+    public UnaryCallSettings.Builder<DeleteJobRequest, Empty> deleteJobSettings() {
+      return deleteJobSettings;
+    }
+
     /** Returns the builder for the settings used for calls to batchDeleteJobs. */
     public UnaryCallSettings.Builder<BatchDeleteJobsRequest, Empty> batchDeleteJobsSettings() {
       return batchDeleteJobsSettings;
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ProfileServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ProfileServiceStub.java
index 5dec1a12..556089e8 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ProfileServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ProfileServiceStub.java
@@ -43,10 +43,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class ProfileServiceStub implements BackgroundResource {
 
-  public UnaryCallable<DeleteProfileRequest, Empty> deleteProfileCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteProfileCallable()");
-  }
-
   public UnaryCallable<SearchProfilesRequest, SearchProfilesPagedResponse>
       searchProfilesPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: searchProfilesPagedCallable()");
@@ -76,6 +72,10 @@ public UnaryCallable<UpdateProfileRequest, Profile> updateProfileCallable() {
     throw new UnsupportedOperationException("Not implemented: updateProfileCallable()");
   }
 
+  public UnaryCallable<DeleteProfileRequest, Empty> deleteProfileCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteProfileCallable()");
+  }
+
   @Override
   public abstract void close();
 }
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ProfileServiceStubSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ProfileServiceStubSettings.java
index 8c706b12..7c3c8c78 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ProfileServiceStubSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/ProfileServiceStubSettings.java
@@ -75,16 +75,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteProfile to 30 seconds:
+ * <p>For example, to set the total timeout of createProfile to 30 seconds:
  *
  * <pre>
  * <code>
  * ProfileServiceStubSettings.Builder profileServiceSettingsBuilder =
  *     ProfileServiceStubSettings.newBuilder();
  * profileServiceSettingsBuilder
- *     .deleteProfileSettings()
+ *     .createProfileSettings()
  *     .setRetrySettings(
- *         profileServiceSettingsBuilder.deleteProfileSettings().getRetrySettings().toBuilder()
+ *         profileServiceSettingsBuilder.createProfileSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * ProfileServiceStubSettings profileServiceSettings = profileServiceSettingsBuilder.build();
@@ -101,7 +101,6 @@ public class ProfileServiceStubSettings extends StubSettings<ProfileServiceStubS
           .add("https://www.googleapis.com/auth/jobs")
           .build();
 
-  private final UnaryCallSettings<DeleteProfileRequest, Empty> deleteProfileSettings;
   private final PagedCallSettings<
           SearchProfilesRequest, SearchProfilesResponse, SearchProfilesPagedResponse>
       searchProfilesSettings;
@@ -111,11 +110,7 @@ public class ProfileServiceStubSettings extends StubSettings<ProfileServiceStubS
   private final UnaryCallSettings<CreateProfileRequest, Profile> createProfileSettings;
   private final UnaryCallSettings<GetProfileRequest, Profile> getProfileSettings;
   private final UnaryCallSettings<UpdateProfileRequest, Profile> updateProfileSettings;
-
-  /** Returns the object with the settings used for calls to deleteProfile. */
-  public UnaryCallSettings<DeleteProfileRequest, Empty> deleteProfileSettings() {
-    return deleteProfileSettings;
-  }
+  private final UnaryCallSettings<DeleteProfileRequest, Empty> deleteProfileSettings;
 
   /** Returns the object with the settings used for calls to searchProfiles. */
   public PagedCallSettings<
@@ -145,6 +140,11 @@ public UnaryCallSettings<UpdateProfileRequest, Profile> updateProfileSettings()
     return updateProfileSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteProfile. */
+  public UnaryCallSettings<DeleteProfileRequest, Empty> deleteProfileSettings() {
+    return deleteProfileSettings;
+  }
+
   @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
   public ProfileServiceStub createStub() throws IOException {
     if (getTransportChannelProvider()
@@ -214,12 +214,12 @@ public Builder toBuilder() {
   protected ProfileServiceStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
-    deleteProfileSettings = settingsBuilder.deleteProfileSettings().build();
     searchProfilesSettings = settingsBuilder.searchProfilesSettings().build();
     listProfilesSettings = settingsBuilder.listProfilesSettings().build();
     createProfileSettings = settingsBuilder.createProfileSettings().build();
     getProfileSettings = settingsBuilder.getProfileSettings().build();
     updateProfileSettings = settingsBuilder.updateProfileSettings().build();
+    deleteProfileSettings = settingsBuilder.deleteProfileSettings().build();
   }
 
   private static final PagedListDescriptor<
@@ -336,7 +336,6 @@ public ApiFuture<ListProfilesPagedResponse> getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder<ProfileServiceStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
-    private final UnaryCallSettings.Builder<DeleteProfileRequest, Empty> deleteProfileSettings;
     private final PagedCallSettings.Builder<
             SearchProfilesRequest, SearchProfilesResponse, SearchProfilesPagedResponse>
         searchProfilesSettings;
@@ -346,6 +345,7 @@ public static class Builder extends StubSettings.Builder<ProfileServiceStubSetti
     private final UnaryCallSettings.Builder<CreateProfileRequest, Profile> createProfileSettings;
     private final UnaryCallSettings.Builder<GetProfileRequest, Profile> getProfileSettings;
     private final UnaryCallSettings.Builder<UpdateProfileRequest, Profile> updateProfileSettings;
+    private final UnaryCallSettings.Builder<DeleteProfileRequest, Empty> deleteProfileSettings;
 
     private static final ImmutableMap<String, ImmutableSet<StatusCode.Code>>
         RETRYABLE_CODE_DEFINITIONS;
@@ -354,11 +354,13 @@ public static class Builder extends StubSettings.Builder<ProfileServiceStubSetti
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_4_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_2_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -372,12 +374,22 @@ public static class Builder extends StubSettings.Builder<ProfileServiceStubSetti
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(600000L))
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("retry_policy_4_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_2_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -388,8 +400,6 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
-      deleteProfileSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       searchProfilesSettings = PagedCallSettings.newBuilder(SEARCH_PROFILES_PAGE_STR_FACT);
 
       listProfilesSettings = PagedCallSettings.newBuilder(LIST_PROFILES_PAGE_STR_FACT);
@@ -400,14 +410,16 @@ protected Builder(ClientContext clientContext) {
 
       updateProfileSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
+      deleteProfileSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteProfileSettings,
               searchProfilesSettings,
               listProfilesSettings,
               createProfileSettings,
               getProfileSettings,
-              updateProfileSettings);
+              updateProfileSettings,
+              deleteProfileSettings);
 
       initDefaults(this);
     }
@@ -423,35 +435,35 @@ private static Builder createDefault() {
 
     private static Builder initDefaults(Builder builder) {
 
-      builder
-          .deleteProfileSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .searchProfilesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
 
       builder
           .listProfilesSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_4_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_4_params"));
 
       builder
           .createProfileSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
 
       builder
           .getProfileSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_4_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_4_params"));
 
       builder
           .updateProfileSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_2_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_2_params"));
+
+      builder
+          .deleteProfileSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_4_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_4_params"));
 
       return builder;
     }
@@ -459,21 +471,21 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(ProfileServiceStubSettings settings) {
       super(settings);
 
-      deleteProfileSettings = settings.deleteProfileSettings.toBuilder();
       searchProfilesSettings = settings.searchProfilesSettings.toBuilder();
       listProfilesSettings = settings.listProfilesSettings.toBuilder();
       createProfileSettings = settings.createProfileSettings.toBuilder();
       getProfileSettings = settings.getProfileSettings.toBuilder();
       updateProfileSettings = settings.updateProfileSettings.toBuilder();
+      deleteProfileSettings = settings.deleteProfileSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteProfileSettings,
               searchProfilesSettings,
               listProfilesSettings,
               createProfileSettings,
               getProfileSettings,
-              updateProfileSettings);
+              updateProfileSettings,
+              deleteProfileSettings);
     }
 
     // NEXT_MAJOR_VER: remove 'throws Exception'
@@ -492,11 +504,6 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
-    /** Returns the builder for the settings used for calls to deleteProfile. */
-    public UnaryCallSettings.Builder<DeleteProfileRequest, Empty> deleteProfileSettings() {
-      return deleteProfileSettings;
-    }
-
     /** Returns the builder for the settings used for calls to searchProfiles. */
     public PagedCallSettings.Builder<
             SearchProfilesRequest, SearchProfilesResponse, SearchProfilesPagedResponse>
@@ -526,6 +533,11 @@ public UnaryCallSettings.Builder<UpdateProfileRequest, Profile> updateProfileSet
       return updateProfileSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteProfile. */
+    public UnaryCallSettings.Builder<DeleteProfileRequest, Empty> deleteProfileSettings() {
+      return deleteProfileSettings;
+    }
+
     @Override
     public ProfileServiceStubSettings build() throws IOException {
       return new ProfileServiceStubSettings(this);
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/TenantServiceStub.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/TenantServiceStub.java
index 94bd7eca..9d8528c8 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/TenantServiceStub.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/TenantServiceStub.java
@@ -40,10 +40,6 @@
 @BetaApi("A restructuring of stub classes is planned, so this may break in the future")
 public abstract class TenantServiceStub implements BackgroundResource {
 
-  public UnaryCallable<DeleteTenantRequest, Empty> deleteTenantCallable() {
-    throw new UnsupportedOperationException("Not implemented: deleteTenantCallable()");
-  }
-
   public UnaryCallable<CreateTenantRequest, Tenant> createTenantCallable() {
     throw new UnsupportedOperationException("Not implemented: createTenantCallable()");
   }
@@ -56,6 +52,10 @@ public UnaryCallable<UpdateTenantRequest, Tenant> updateTenantCallable() {
     throw new UnsupportedOperationException("Not implemented: updateTenantCallable()");
   }
 
+  public UnaryCallable<DeleteTenantRequest, Empty> deleteTenantCallable() {
+    throw new UnsupportedOperationException("Not implemented: deleteTenantCallable()");
+  }
+
   public UnaryCallable<ListTenantsRequest, ListTenantsPagedResponse> listTenantsPagedCallable() {
     throw new UnsupportedOperationException("Not implemented: listTenantsPagedCallable()");
   }
diff --git a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/TenantServiceStubSettings.java b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/TenantServiceStubSettings.java
index 5878504d..2f8b99a8 100644
--- a/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/TenantServiceStubSettings.java
+++ b/google-cloud-talent/src/main/java/com/google/cloud/talent/v4beta1/stub/TenantServiceStubSettings.java
@@ -71,16 +71,16 @@
  * <p>The builder of this class is recursive, so contained classes are themselves builders. When
  * build() is called, the tree of builders is called to create the complete settings object.
  *
- * <p>For example, to set the total timeout of deleteTenant to 30 seconds:
+ * <p>For example, to set the total timeout of createTenant to 30 seconds:
  *
  * <pre>
  * <code>
  * TenantServiceStubSettings.Builder tenantServiceSettingsBuilder =
  *     TenantServiceStubSettings.newBuilder();
  * tenantServiceSettingsBuilder
- *     .deleteTenantSettings()
+ *     .createTenantSettings()
  *     .setRetrySettings(
- *         tenantServiceSettingsBuilder.deleteTenantSettings().getRetrySettings().toBuilder()
+ *         tenantServiceSettingsBuilder.createTenantSettings().getRetrySettings().toBuilder()
  *             .setTotalTimeout(Duration.ofSeconds(30))
  *             .build());
  * TenantServiceStubSettings tenantServiceSettings = tenantServiceSettingsBuilder.build();
@@ -97,18 +97,13 @@ public class TenantServiceStubSettings extends StubSettings<TenantServiceStubSet
           .add("https://www.googleapis.com/auth/jobs")
           .build();
 
-  private final UnaryCallSettings<DeleteTenantRequest, Empty> deleteTenantSettings;
   private final UnaryCallSettings<CreateTenantRequest, Tenant> createTenantSettings;
   private final UnaryCallSettings<GetTenantRequest, Tenant> getTenantSettings;
   private final UnaryCallSettings<UpdateTenantRequest, Tenant> updateTenantSettings;
+  private final UnaryCallSettings<DeleteTenantRequest, Empty> deleteTenantSettings;
   private final PagedCallSettings<ListTenantsRequest, ListTenantsResponse, ListTenantsPagedResponse>
       listTenantsSettings;
 
-  /** Returns the object with the settings used for calls to deleteTenant. */
-  public UnaryCallSettings<DeleteTenantRequest, Empty> deleteTenantSettings() {
-    return deleteTenantSettings;
-  }
-
   /** Returns the object with the settings used for calls to createTenant. */
   public UnaryCallSettings<CreateTenantRequest, Tenant> createTenantSettings() {
     return createTenantSettings;
@@ -124,6 +119,11 @@ public UnaryCallSettings<UpdateTenantRequest, Tenant> updateTenantSettings() {
     return updateTenantSettings;
   }
 
+  /** Returns the object with the settings used for calls to deleteTenant. */
+  public UnaryCallSettings<DeleteTenantRequest, Empty> deleteTenantSettings() {
+    return deleteTenantSettings;
+  }
+
   /** Returns the object with the settings used for calls to listTenants. */
   public PagedCallSettings<ListTenantsRequest, ListTenantsResponse, ListTenantsPagedResponse>
       listTenantsSettings() {
@@ -199,10 +199,10 @@ public Builder toBuilder() {
   protected TenantServiceStubSettings(Builder settingsBuilder) throws IOException {
     super(settingsBuilder);
 
-    deleteTenantSettings = settingsBuilder.deleteTenantSettings().build();
     createTenantSettings = settingsBuilder.createTenantSettings().build();
     getTenantSettings = settingsBuilder.getTenantSettings().build();
     updateTenantSettings = settingsBuilder.updateTenantSettings().build();
+    deleteTenantSettings = settingsBuilder.deleteTenantSettings().build();
     listTenantsSettings = settingsBuilder.listTenantsSettings().build();
   }
 
@@ -263,10 +263,10 @@ public ApiFuture<ListTenantsPagedResponse> getFuturePagedResponse(
   public static class Builder extends StubSettings.Builder<TenantServiceStubSettings, Builder> {
     private final ImmutableList<UnaryCallSettings.Builder<?, ?>> unaryMethodSettingsBuilders;
 
-    private final UnaryCallSettings.Builder<DeleteTenantRequest, Empty> deleteTenantSettings;
     private final UnaryCallSettings.Builder<CreateTenantRequest, Tenant> createTenantSettings;
     private final UnaryCallSettings.Builder<GetTenantRequest, Tenant> getTenantSettings;
     private final UnaryCallSettings.Builder<UpdateTenantRequest, Tenant> updateTenantSettings;
+    private final UnaryCallSettings.Builder<DeleteTenantRequest, Empty> deleteTenantSettings;
     private final PagedCallSettings.Builder<
             ListTenantsRequest, ListTenantsResponse, ListTenantsPagedResponse>
         listTenantsSettings;
@@ -278,11 +278,48 @@ public static class Builder extends StubSettings.Builder<TenantServiceStubSettin
       ImmutableMap.Builder<String, ImmutableSet<StatusCode.Code>> definitions =
           ImmutableMap.builder();
       definitions.put(
-          "idempotent",
+          "retry_policy_1_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_2_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_6_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put("no_retry_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_3_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_3_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_2_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "retry_policy_4_codes",
+          ImmutableSet.copyOf(
+              Lists.<StatusCode.Code>newArrayList(
+                  StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
+      definitions.put(
+          "no_retry_4_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_6_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_1_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "retry_policy_5_codes",
           ImmutableSet.copyOf(
               Lists.<StatusCode.Code>newArrayList(
                   StatusCode.Code.DEADLINE_EXCEEDED, StatusCode.Code.UNAVAILABLE)));
-      definitions.put("non_idempotent", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
+      definitions.put(
+          "no_retry_5_codes", ImmutableSet.copyOf(Lists.<StatusCode.Code>newArrayList()));
       RETRYABLE_CODE_DEFINITIONS = definitions.build();
     }
 
@@ -291,17 +328,122 @@ public static class Builder extends StubSettings.Builder<TenantServiceStubSettin
     static {
       ImmutableMap.Builder<String, RetrySettings> definitions = ImmutableMap.builder();
       RetrySettings settings = null;
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_3_params", settings);
       settings =
           RetrySettings.newBuilder()
               .setInitialRetryDelay(Duration.ofMillis(100L))
               .setRetryDelayMultiplier(1.3)
               .setMaxRetryDelay(Duration.ofMillis(60000L))
-              .setInitialRpcTimeout(Duration.ofMillis(20000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_6_params", settings);
+      settings = RetrySettings.newBuilder().setRpcTimeoutMultiplier(1.0).build();
+      definitions.put("no_retry_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_5_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_2_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
               .setRpcTimeoutMultiplier(1.0)
-              .setMaxRpcTimeout(Duration.ofMillis(20000L))
-              .setTotalTimeout(Duration.ofMillis(300000L))
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
               .build();
-      definitions.put("default", settings);
+      definitions.put("no_retry_4_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("no_retry_6_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_1_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_3_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_2_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_4_params", settings);
+      settings =
+          RetrySettings.newBuilder()
+              .setInitialRetryDelay(Duration.ofMillis(100L))
+              .setRetryDelayMultiplier(1.3)
+              .setMaxRetryDelay(Duration.ofMillis(60000L))
+              .setInitialRpcTimeout(Duration.ofMillis(30000L))
+              .setRpcTimeoutMultiplier(1.0)
+              .setMaxRpcTimeout(Duration.ofMillis(30000L))
+              .setTotalTimeout(Duration.ofMillis(30000L))
+              .build();
+      definitions.put("retry_policy_5_params", settings);
       RETRY_PARAM_DEFINITIONS = definitions.build();
     }
 
@@ -312,22 +454,22 @@ protected Builder() {
     protected Builder(ClientContext clientContext) {
       super(clientContext);
 
-      deleteTenantSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
-
       createTenantSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       getTenantSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
       updateTenantSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
 
+      deleteTenantSettings = UnaryCallSettings.newUnaryCallSettingsBuilder();
+
       listTenantsSettings = PagedCallSettings.newBuilder(LIST_TENANTS_PAGE_STR_FACT);
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteTenantSettings,
               createTenantSettings,
               getTenantSettings,
               updateTenantSettings,
+              deleteTenantSettings,
               listTenantsSettings);
 
       initDefaults(this);
@@ -344,30 +486,30 @@ private static Builder createDefault() {
 
     private static Builder initDefaults(Builder builder) {
 
-      builder
-          .deleteTenantSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
-
       builder
           .createTenantSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_4_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_4_params"));
 
       builder
           .getTenantSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .updateTenantSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("non_idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("no_retry_4_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("no_retry_4_params"));
+
+      builder
+          .deleteTenantSettings()
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       builder
           .listTenantsSettings()
-          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
-          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
+          .setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("retry_policy_1_codes"))
+          .setRetrySettings(RETRY_PARAM_DEFINITIONS.get("retry_policy_1_params"));
 
       return builder;
     }
@@ -375,18 +517,18 @@ private static Builder initDefaults(Builder builder) {
     protected Builder(TenantServiceStubSettings settings) {
       super(settings);
 
-      deleteTenantSettings = settings.deleteTenantSettings.toBuilder();
       createTenantSettings = settings.createTenantSettings.toBuilder();
       getTenantSettings = settings.getTenantSettings.toBuilder();
       updateTenantSettings = settings.updateTenantSettings.toBuilder();
+      deleteTenantSettings = settings.deleteTenantSettings.toBuilder();
       listTenantsSettings = settings.listTenantsSettings.toBuilder();
 
       unaryMethodSettingsBuilders =
           ImmutableList.<UnaryCallSettings.Builder<?, ?>>of(
-              deleteTenantSettings,
               createTenantSettings,
               getTenantSettings,
               updateTenantSettings,
+              deleteTenantSettings,
               listTenantsSettings);
     }
 
@@ -406,11 +548,6 @@ public Builder applyToAllUnaryMethods(
       return unaryMethodSettingsBuilders;
     }
 
-    /** Returns the builder for the settings used for calls to deleteTenant. */
-    public UnaryCallSettings.Builder<DeleteTenantRequest, Empty> deleteTenantSettings() {
-      return deleteTenantSettings;
-    }
-
     /** Returns the builder for the settings used for calls to createTenant. */
     public UnaryCallSettings.Builder<CreateTenantRequest, Tenant> createTenantSettings() {
       return createTenantSettings;
@@ -426,6 +563,11 @@ public UnaryCallSettings.Builder<UpdateTenantRequest, Tenant> updateTenantSettin
       return updateTenantSettings;
     }
 
+    /** Returns the builder for the settings used for calls to deleteTenant. */
+    public UnaryCallSettings.Builder<DeleteTenantRequest, Empty> deleteTenantSettings() {
+      return deleteTenantSettings;
+    }
+
     /** Returns the builder for the settings used for calls to listTenants. */
     public PagedCallSettings.Builder<
             ListTenantsRequest, ListTenantsResponse, ListTenantsPagedResponse>
diff --git a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java
index e3fef508..830dec31 100644
--- a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java
+++ b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ApplicationServiceClientTest.java
@@ -98,45 +98,6 @@ public void tearDown() throws Exception {
     client.close();
   }
 
-  @Test
-  @SuppressWarnings("all")
-  public void deleteApplicationTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
-    mockApplicationService.addResponse(expectedResponse);
-
-    ApplicationName name =
-        ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
-
-    client.deleteApplication(name);
-
-    List<AbstractMessage> actualRequests = mockApplicationService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteApplicationRequest actualRequest = (DeleteApplicationRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, ApplicationName.parse(actualRequest.getName()));
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteApplicationExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockApplicationService.addException(exception);
-
-    try {
-      ApplicationName name =
-          ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
-
-      client.deleteApplication(name);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
   @Test
   @SuppressWarnings("all")
   public void createApplicationTest() {
@@ -310,6 +271,45 @@ public void updateApplicationExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteApplicationTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockApplicationService.addResponse(expectedResponse);
+
+    ApplicationName name =
+        ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
+
+    client.deleteApplication(name);
+
+    List<AbstractMessage> actualRequests = mockApplicationService.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteApplicationRequest actualRequest = (DeleteApplicationRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, ApplicationName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteApplicationExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockApplicationService.addException(exception);
+
+    try {
+      ApplicationName name =
+          ApplicationName.of("[PROJECT]", "[TENANT]", "[PROFILE]", "[APPLICATION]");
+
+      client.deleteApplication(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void listApplicationsTest() {
diff --git a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java
index 35d3c84d..cd68ca61 100644
--- a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java
+++ b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/CompanyServiceClientTest.java
@@ -98,44 +98,6 @@ public void tearDown() throws Exception {
     client.close();
   }
 
-  @Test
-  @SuppressWarnings("all")
-  public void deleteCompanyTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
-    mockCompanyService.addResponse(expectedResponse);
-
-    CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
-
-    client.deleteCompany(name);
-
-    List<AbstractMessage> actualRequests = mockCompanyService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteCompanyRequest actualRequest = (DeleteCompanyRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, CompanyName.parse(actualRequest.getName()));
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteCompanyExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockCompanyService.addException(exception);
-
-    try {
-      CompanyName name =
-          CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
-
-      client.deleteCompany(name);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
   @Test
   @SuppressWarnings("all")
   public void createCompanyTest() {
@@ -321,6 +283,44 @@ public void updateCompanyExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteCompanyTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockCompanyService.addResponse(expectedResponse);
+
+    CompanyName name = CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
+
+    client.deleteCompany(name);
+
+    List<AbstractMessage> actualRequests = mockCompanyService.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteCompanyRequest actualRequest = (DeleteCompanyRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, CompanyName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteCompanyExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockCompanyService.addException(exception);
+
+    try {
+      CompanyName name =
+          CompanyName.ofProjectTenantCompanyName("[PROJECT]", "[TENANT]", "[COMPANY]");
+
+      client.deleteCompany(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void listCompaniesTest() {
diff --git a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java
index 66e34e1c..5463124c 100644
--- a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java
+++ b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/JobServiceClientTest.java
@@ -105,43 +105,6 @@ public void tearDown() throws Exception {
     client.close();
   }
 
-  @Test
-  @SuppressWarnings("all")
-  public void deleteJobTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
-    mockJobService.addResponse(expectedResponse);
-
-    JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
-
-    client.deleteJob(name);
-
-    List<AbstractMessage> actualRequests = mockJobService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteJobRequest actualRequest = (DeleteJobRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, JobName.parse(actualRequest.getName()));
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteJobExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockJobService.addException(exception);
-
-    try {
-      JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
-
-      client.deleteJob(name);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
   @Test
   @SuppressWarnings("all")
   public void createJobTest() {
@@ -438,6 +401,43 @@ public void batchUpdateJobsExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteJobTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockJobService.addResponse(expectedResponse);
+
+    JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
+
+    client.deleteJob(name);
+
+    List<AbstractMessage> actualRequests = mockJobService.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteJobRequest actualRequest = (DeleteJobRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, JobName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteJobExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockJobService.addException(exception);
+
+    try {
+      JobName name = JobName.ofProjectTenantJobName("[PROJECT]", "[TENANT]", "[JOB]");
+
+      client.deleteJob(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void batchDeleteJobsTest() {
diff --git a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ProfileServiceClientTest.java b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ProfileServiceClientTest.java
index e132ca74..10ef9f39 100644
--- a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ProfileServiceClientTest.java
+++ b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/ProfileServiceClientTest.java
@@ -99,43 +99,6 @@ public void tearDown() throws Exception {
     client.close();
   }
 
-  @Test
-  @SuppressWarnings("all")
-  public void deleteProfileTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
-    mockProfileService.addResponse(expectedResponse);
-
-    ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
-
-    client.deleteProfile(name);
-
-    List<AbstractMessage> actualRequests = mockProfileService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteProfileRequest actualRequest = (DeleteProfileRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, ProfileName.parse(actualRequest.getName()));
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteProfileExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockProfileService.addException(exception);
-
-    try {
-      ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
-
-      client.deleteProfile(name);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
   @Test
   @SuppressWarnings("all")
   public void searchProfilesTest() {
@@ -413,4 +376,41 @@ public void updateProfileExceptionTest() throws Exception {
       // Expected exception
     }
   }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteProfileTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockProfileService.addResponse(expectedResponse);
+
+    ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
+
+    client.deleteProfile(name);
+
+    List<AbstractMessage> actualRequests = mockProfileService.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteProfileRequest actualRequest = (DeleteProfileRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, ProfileName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteProfileExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockProfileService.addException(exception);
+
+    try {
+      ProfileName name = ProfileName.of("[PROJECT]", "[TENANT]", "[PROFILE]");
+
+      client.deleteProfile(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
 }
diff --git a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/TenantServiceClientTest.java b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/TenantServiceClientTest.java
index ae8c0db1..25d0f8d2 100644
--- a/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/TenantServiceClientTest.java
+++ b/google-cloud-talent/src/test/java/com/google/cloud/talent/v4beta1/TenantServiceClientTest.java
@@ -98,43 +98,6 @@ public void tearDown() throws Exception {
     client.close();
   }
 
-  @Test
-  @SuppressWarnings("all")
-  public void deleteTenantTest() {
-    Empty expectedResponse = Empty.newBuilder().build();
-    mockTenantService.addResponse(expectedResponse);
-
-    TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
-
-    client.deleteTenant(name);
-
-    List<AbstractMessage> actualRequests = mockTenantService.getRequests();
-    Assert.assertEquals(1, actualRequests.size());
-    DeleteTenantRequest actualRequest = (DeleteTenantRequest) actualRequests.get(0);
-
-    Assert.assertEquals(name, TenantName.parse(actualRequest.getName()));
-    Assert.assertTrue(
-        channelProvider.isHeaderSent(
-            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
-            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
-  }
-
-  @Test
-  @SuppressWarnings("all")
-  public void deleteTenantExceptionTest() throws Exception {
-    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
-    mockTenantService.addException(exception);
-
-    try {
-      TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
-
-      client.deleteTenant(name);
-      Assert.fail("No exception raised");
-    } catch (InvalidArgumentException e) {
-      // Expected exception
-    }
-  }
-
   @Test
   @SuppressWarnings("all")
   public void createTenantTest() {
@@ -261,6 +224,43 @@ public void updateTenantExceptionTest() throws Exception {
     }
   }
 
+  @Test
+  @SuppressWarnings("all")
+  public void deleteTenantTest() {
+    Empty expectedResponse = Empty.newBuilder().build();
+    mockTenantService.addResponse(expectedResponse);
+
+    TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
+
+    client.deleteTenant(name);
+
+    List<AbstractMessage> actualRequests = mockTenantService.getRequests();
+    Assert.assertEquals(1, actualRequests.size());
+    DeleteTenantRequest actualRequest = (DeleteTenantRequest) actualRequests.get(0);
+
+    Assert.assertEquals(name, TenantName.parse(actualRequest.getName()));
+    Assert.assertTrue(
+        channelProvider.isHeaderSent(
+            ApiClientHeaderProvider.getDefaultApiClientHeaderKey(),
+            GaxGrpcProperties.getDefaultApiClientHeaderPattern()));
+  }
+
+  @Test
+  @SuppressWarnings("all")
+  public void deleteTenantExceptionTest() throws Exception {
+    StatusRuntimeException exception = new StatusRuntimeException(Status.INVALID_ARGUMENT);
+    mockTenantService.addException(exception);
+
+    try {
+      TenantName name = TenantName.of("[PROJECT]", "[TENANT]");
+
+      client.deleteTenant(name);
+      Assert.fail("No exception raised");
+    } catch (InvalidArgumentException e) {
+      // Expected exception
+    }
+  }
+
   @Test
   @SuppressWarnings("all")
   public void listTenantsTest() {
diff --git a/synth.metadata b/synth.metadata
index e79c3cc8..43bc7d33 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -4,15 +4,15 @@
       "git": {
         "name": ".",
         "remote": "https://github.com/googleapis/java-talent.git",
-        "sha": "30b36788ec5754bc4dc9d7935f0e8a3b59b0b917"
+        "sha": "9ccd8a51047e0d869b410adc688c52fd430328dd"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "8070bcb140b06991a636d4ba7d665c5adab1675d",
-        "internalRef": "314792023"
+        "sha": "fa4d2ecd0804eb92f27a65fe65ce2a554a361b93",
+        "internalRef": "317110673"
       }
     },
     {