diff --git a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceClient.java b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceClient.java
index 02c5007c..0fab76cb 100644
--- a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceClient.java
+++ b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.secretmanager.v1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -1595,7 +1594,7 @@ public final SecretVersion destroySecretVersion(DestroySecretVersionRequest requ
    *     SecretManagerServiceClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   Policy response = secretManagerServiceClient.setIamPolicy(request);
@@ -1623,7 +1622,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    *     SecretManagerServiceClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future =
@@ -1649,7 +1648,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
    *     SecretManagerServiceClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   Policy response = secretManagerServiceClient.getIamPolicy(request);
@@ -1675,7 +1674,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    *     SecretManagerServiceClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future =
@@ -1705,7 +1704,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
    *     SecretManagerServiceClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   TestIamPermissionsResponse response = secretManagerServiceClient.testIamPermissions(request);
@@ -1735,7 +1734,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    *     SecretManagerServiceClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   ApiFuture<TestIamPermissionsResponse> future =
@@ -1794,14 +1793,7 @@ public static ApiFuture<ListSecretsPagedResponse> createAsync(
       ApiFuture<ListSecretsPage> futurePage =
           ListSecretsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListSecretsPage, ListSecretsPagedResponse>() {
-            @Override
-            public ListSecretsPagedResponse apply(ListSecretsPage input) {
-              return new ListSecretsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListSecretsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListSecretsPagedResponse(ListSecretsPage page) {
@@ -1875,12 +1867,7 @@ public static ApiFuture<ListSecretVersionsPagedResponse> createAsync(
           ListSecretVersionsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListSecretVersionsPage, ListSecretVersionsPagedResponse>() {
-            @Override
-            public ListSecretVersionsPagedResponse apply(ListSecretVersionsPage input) {
-              return new ListSecretVersionsPagedResponse(input);
-            }
-          },
+          input -> new ListSecretVersionsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceSettings.java b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceSettings.java
index edf6649e..b23f9839 100644
--- a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceSettings.java
+++ b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/SecretManagerServiceSettings.java
@@ -246,14 +246,13 @@ public SecretManagerServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((SecretManagerServiceStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/stub/GrpcSecretManagerServiceStub.java b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/stub/GrpcSecretManagerServiceStub.java
index c11bcedb..ab48b40c 100644
--- a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/stub/GrpcSecretManagerServiceStub.java
+++ b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/stub/GrpcSecretManagerServiceStub.java
@@ -24,7 +24,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.secretmanager.v1.AccessSecretVersionRequest;
 import com.google.cloud.secretmanager.v1.AccessSecretVersionResponse;
@@ -54,7 +53,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -289,78 +287,60 @@ protected GrpcSecretManagerServiceStub(
         GrpcCallSettings.<ListSecretsRequest, ListSecretsResponse>newBuilder()
             .setMethodDescriptor(listSecretsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListSecretsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListSecretsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateSecretRequest, Secret> createSecretTransportSettings =
         GrpcCallSettings.<CreateSecretRequest, Secret>newBuilder()
             .setMethodDescriptor(createSecretMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateSecretRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateSecretRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<AddSecretVersionRequest, SecretVersion> addSecretVersionTransportSettings =
         GrpcCallSettings.<AddSecretVersionRequest, SecretVersion>newBuilder()
             .setMethodDescriptor(addSecretVersionMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AddSecretVersionRequest>() {
-                  @Override
-                  public Map<String, String> extract(AddSecretVersionRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetSecretRequest, Secret> getSecretTransportSettings =
         GrpcCallSettings.<GetSecretRequest, Secret>newBuilder()
             .setMethodDescriptor(getSecretMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetSecretRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetSecretRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateSecretRequest, Secret> updateSecretTransportSettings =
         GrpcCallSettings.<UpdateSecretRequest, Secret>newBuilder()
             .setMethodDescriptor(updateSecretMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateSecretRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateSecretRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("secret.name", String.valueOf(request.getSecret().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("secret.name", String.valueOf(request.getSecret().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteSecretRequest, Empty> deleteSecretTransportSettings =
         GrpcCallSettings.<DeleteSecretRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteSecretMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteSecretRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteSecretRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListSecretVersionsRequest, ListSecretVersionsResponse>
@@ -368,26 +348,20 @@ public Map<String, String> extract(DeleteSecretRequest request) {
             GrpcCallSettings.<ListSecretVersionsRequest, ListSecretVersionsResponse>newBuilder()
                 .setMethodDescriptor(listSecretVersionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListSecretVersionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListSecretVersionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetSecretVersionRequest, SecretVersion> getSecretVersionTransportSettings =
         GrpcCallSettings.<GetSecretVersionRequest, SecretVersion>newBuilder()
             .setMethodDescriptor(getSecretVersionMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetSecretVersionRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetSecretVersionRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<AccessSecretVersionRequest, AccessSecretVersionResponse>
@@ -395,13 +369,10 @@ public Map<String, String> extract(GetSecretVersionRequest request) {
             GrpcCallSettings.<AccessSecretVersionRequest, AccessSecretVersionResponse>newBuilder()
                 .setMethodDescriptor(accessSecretVersionMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<AccessSecretVersionRequest>() {
-                      @Override
-                      public Map<String, String> extract(AccessSecretVersionRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<DisableSecretVersionRequest, SecretVersion>
@@ -409,13 +380,10 @@ public Map<String, String> extract(AccessSecretVersionRequest request) {
             GrpcCallSettings.<DisableSecretVersionRequest, SecretVersion>newBuilder()
                 .setMethodDescriptor(disableSecretVersionMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DisableSecretVersionRequest>() {
-                      @Override
-                      public Map<String, String> extract(DisableSecretVersionRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<EnableSecretVersionRequest, SecretVersion>
@@ -423,13 +391,10 @@ public Map<String, String> extract(DisableSecretVersionRequest request) {
             GrpcCallSettings.<EnableSecretVersionRequest, SecretVersion>newBuilder()
                 .setMethodDescriptor(enableSecretVersionMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<EnableSecretVersionRequest>() {
-                      @Override
-                      public Map<String, String> extract(EnableSecretVersionRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<DestroySecretVersionRequest, SecretVersion>
@@ -437,39 +402,30 @@ public Map<String, String> extract(EnableSecretVersionRequest request) {
             GrpcCallSettings.<DestroySecretVersionRequest, SecretVersion>newBuilder()
                 .setMethodDescriptor(destroySecretVersionMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DestroySecretVersionRequest>() {
-                      @Override
-                      public Map<String, String> extract(DestroySecretVersionRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SetIamPolicyRequest, Policy> setIamPolicyTransportSettings =
         GrpcCallSettings.<SetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(setIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(getIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
@@ -477,13 +433,10 @@ public Map<String, String> extract(GetIamPolicyRequest request) {
             GrpcCallSettings.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
                 .setMethodDescriptor(testIamPermissionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<TestIamPermissionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(TestIamPermissionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("resource", String.valueOf(request.getResource()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("resource", String.valueOf(request.getResource()));
+                      return params.build();
                     })
                 .build();
 
@@ -652,7 +605,13 @@ public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/stub/SecretManagerServiceStubSettings.java b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/stub/SecretManagerServiceStubSettings.java
index 85423595..cbfbea38 100644
--- a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/stub/SecretManagerServiceStubSettings.java
+++ b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1/stub/SecretManagerServiceStubSettings.java
@@ -671,14 +671,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/SecretManagerServiceClient.java b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/SecretManagerServiceClient.java
index 6eba0415..a8d03803 100644
--- a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/SecretManagerServiceClient.java
+++ b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/SecretManagerServiceClient.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.secretmanager.v1beta1;
 
-import com.google.api.core.ApiFunction;
 import com.google.api.core.ApiFuture;
 import com.google.api.core.ApiFutures;
 import com.google.api.core.BetaApi;
@@ -1578,7 +1577,7 @@ public final SecretVersion destroySecretVersion(DestroySecretVersionRequest requ
    *     SecretManagerServiceClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   Policy response = secretManagerServiceClient.setIamPolicy(request);
@@ -1606,7 +1605,7 @@ public final Policy setIamPolicy(SetIamPolicyRequest request) {
    *     SecretManagerServiceClient.create()) {
    *   SetIamPolicyRequest request =
    *       SetIamPolicyRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .setPolicy(Policy.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future =
@@ -1632,7 +1631,7 @@ public final UnaryCallable<SetIamPolicyRequest, Policy> setIamPolicyCallable() {
    *     SecretManagerServiceClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   Policy response = secretManagerServiceClient.getIamPolicy(request);
@@ -1658,7 +1657,7 @@ public final Policy getIamPolicy(GetIamPolicyRequest request) {
    *     SecretManagerServiceClient.create()) {
    *   GetIamPolicyRequest request =
    *       GetIamPolicyRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .setOptions(GetPolicyOptions.newBuilder().build())
    *           .build();
    *   ApiFuture<Policy> future =
@@ -1688,7 +1687,7 @@ public final UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
    *     SecretManagerServiceClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   TestIamPermissionsResponse response = secretManagerServiceClient.testIamPermissions(request);
@@ -1718,7 +1717,7 @@ public final TestIamPermissionsResponse testIamPermissions(TestIamPermissionsReq
    *     SecretManagerServiceClient.create()) {
    *   TestIamPermissionsRequest request =
    *       TestIamPermissionsRequest.newBuilder()
-   *           .setResource(SecretName.of("[PROJECT]", "[SECRET]").toString())
+   *           .setResource(ProjectName.of("[PROJECT]").toString())
    *           .addAllPermissions(new ArrayList<String>())
    *           .build();
    *   ApiFuture<TestIamPermissionsResponse> future =
@@ -1777,14 +1776,7 @@ public static ApiFuture<ListSecretsPagedResponse> createAsync(
       ApiFuture<ListSecretsPage> futurePage =
           ListSecretsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
-          futurePage,
-          new ApiFunction<ListSecretsPage, ListSecretsPagedResponse>() {
-            @Override
-            public ListSecretsPagedResponse apply(ListSecretsPage input) {
-              return new ListSecretsPagedResponse(input);
-            }
-          },
-          MoreExecutors.directExecutor());
+          futurePage, input -> new ListSecretsPagedResponse(input), MoreExecutors.directExecutor());
     }
 
     private ListSecretsPagedResponse(ListSecretsPage page) {
@@ -1858,12 +1850,7 @@ public static ApiFuture<ListSecretVersionsPagedResponse> createAsync(
           ListSecretVersionsPage.createEmptyPage().createPageAsync(context, futureResponse);
       return ApiFutures.transform(
           futurePage,
-          new ApiFunction<ListSecretVersionsPage, ListSecretVersionsPagedResponse>() {
-            @Override
-            public ListSecretVersionsPagedResponse apply(ListSecretVersionsPage input) {
-              return new ListSecretVersionsPagedResponse(input);
-            }
-          },
+          input -> new ListSecretVersionsPagedResponse(input),
           MoreExecutors.directExecutor());
     }
 
diff --git a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/SecretManagerServiceSettings.java b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/SecretManagerServiceSettings.java
index 662a7b75..751f252d 100644
--- a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/SecretManagerServiceSettings.java
+++ b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/SecretManagerServiceSettings.java
@@ -247,14 +247,13 @@ public SecretManagerServiceStubSettings.Builder getStubSettingsBuilder() {
       return ((SecretManagerServiceStubSettings.Builder) getStubSettings());
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(
           getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater);
       return this;
diff --git a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/stub/GrpcSecretManagerServiceStub.java b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/stub/GrpcSecretManagerServiceStub.java
index 53439997..4c4ed8b3 100644
--- a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/stub/GrpcSecretManagerServiceStub.java
+++ b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/stub/GrpcSecretManagerServiceStub.java
@@ -25,7 +25,6 @@
 import com.google.api.gax.grpc.GrpcCallSettings;
 import com.google.api.gax.grpc.GrpcStubCallableFactory;
 import com.google.api.gax.rpc.ClientContext;
-import com.google.api.gax.rpc.RequestParamsExtractor;
 import com.google.api.gax.rpc.UnaryCallable;
 import com.google.cloud.secretmanager.v1beta1.AccessSecretVersionRequest;
 import com.google.cloud.secretmanager.v1beta1.AccessSecretVersionResponse;
@@ -55,7 +54,6 @@
 import io.grpc.MethodDescriptor;
 import io.grpc.protobuf.ProtoUtils;
 import java.io.IOException;
-import java.util.Map;
 import java.util.concurrent.TimeUnit;
 import javax.annotation.Generated;
 
@@ -291,78 +289,60 @@ protected GrpcSecretManagerServiceStub(
         GrpcCallSettings.<ListSecretsRequest, ListSecretsResponse>newBuilder()
             .setMethodDescriptor(listSecretsMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<ListSecretsRequest>() {
-                  @Override
-                  public Map<String, String> extract(ListSecretsRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<CreateSecretRequest, Secret> createSecretTransportSettings =
         GrpcCallSettings.<CreateSecretRequest, Secret>newBuilder()
             .setMethodDescriptor(createSecretMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<CreateSecretRequest>() {
-                  @Override
-                  public Map<String, String> extract(CreateSecretRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<AddSecretVersionRequest, SecretVersion> addSecretVersionTransportSettings =
         GrpcCallSettings.<AddSecretVersionRequest, SecretVersion>newBuilder()
             .setMethodDescriptor(addSecretVersionMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<AddSecretVersionRequest>() {
-                  @Override
-                  public Map<String, String> extract(AddSecretVersionRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("parent", String.valueOf(request.getParent()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("parent", String.valueOf(request.getParent()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetSecretRequest, Secret> getSecretTransportSettings =
         GrpcCallSettings.<GetSecretRequest, Secret>newBuilder()
             .setMethodDescriptor(getSecretMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetSecretRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetSecretRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<UpdateSecretRequest, Secret> updateSecretTransportSettings =
         GrpcCallSettings.<UpdateSecretRequest, Secret>newBuilder()
             .setMethodDescriptor(updateSecretMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<UpdateSecretRequest>() {
-                  @Override
-                  public Map<String, String> extract(UpdateSecretRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("secret.name", String.valueOf(request.getSecret().getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("secret.name", String.valueOf(request.getSecret().getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<DeleteSecretRequest, Empty> deleteSecretTransportSettings =
         GrpcCallSettings.<DeleteSecretRequest, Empty>newBuilder()
             .setMethodDescriptor(deleteSecretMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<DeleteSecretRequest>() {
-                  @Override
-                  public Map<String, String> extract(DeleteSecretRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<ListSecretVersionsRequest, ListSecretVersionsResponse>
@@ -370,26 +350,20 @@ public Map<String, String> extract(DeleteSecretRequest request) {
             GrpcCallSettings.<ListSecretVersionsRequest, ListSecretVersionsResponse>newBuilder()
                 .setMethodDescriptor(listSecretVersionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<ListSecretVersionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(ListSecretVersionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("parent", String.valueOf(request.getParent()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("parent", String.valueOf(request.getParent()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<GetSecretVersionRequest, SecretVersion> getSecretVersionTransportSettings =
         GrpcCallSettings.<GetSecretVersionRequest, SecretVersion>newBuilder()
             .setMethodDescriptor(getSecretVersionMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetSecretVersionRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetSecretVersionRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("name", String.valueOf(request.getName()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("name", String.valueOf(request.getName()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<AccessSecretVersionRequest, AccessSecretVersionResponse>
@@ -397,13 +371,10 @@ public Map<String, String> extract(GetSecretVersionRequest request) {
             GrpcCallSettings.<AccessSecretVersionRequest, AccessSecretVersionResponse>newBuilder()
                 .setMethodDescriptor(accessSecretVersionMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<AccessSecretVersionRequest>() {
-                      @Override
-                      public Map<String, String> extract(AccessSecretVersionRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<DisableSecretVersionRequest, SecretVersion>
@@ -411,13 +382,10 @@ public Map<String, String> extract(AccessSecretVersionRequest request) {
             GrpcCallSettings.<DisableSecretVersionRequest, SecretVersion>newBuilder()
                 .setMethodDescriptor(disableSecretVersionMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DisableSecretVersionRequest>() {
-                      @Override
-                      public Map<String, String> extract(DisableSecretVersionRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<EnableSecretVersionRequest, SecretVersion>
@@ -425,13 +393,10 @@ public Map<String, String> extract(DisableSecretVersionRequest request) {
             GrpcCallSettings.<EnableSecretVersionRequest, SecretVersion>newBuilder()
                 .setMethodDescriptor(enableSecretVersionMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<EnableSecretVersionRequest>() {
-                      @Override
-                      public Map<String, String> extract(EnableSecretVersionRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<DestroySecretVersionRequest, SecretVersion>
@@ -439,39 +404,30 @@ public Map<String, String> extract(EnableSecretVersionRequest request) {
             GrpcCallSettings.<DestroySecretVersionRequest, SecretVersion>newBuilder()
                 .setMethodDescriptor(destroySecretVersionMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<DestroySecretVersionRequest>() {
-                      @Override
-                      public Map<String, String> extract(DestroySecretVersionRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("name", String.valueOf(request.getName()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("name", String.valueOf(request.getName()));
+                      return params.build();
                     })
                 .build();
     GrpcCallSettings<SetIamPolicyRequest, Policy> setIamPolicyTransportSettings =
         GrpcCallSettings.<SetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(setIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<SetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(SetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<GetIamPolicyRequest, Policy> getIamPolicyTransportSettings =
         GrpcCallSettings.<GetIamPolicyRequest, Policy>newBuilder()
             .setMethodDescriptor(getIamPolicyMethodDescriptor)
             .setParamsExtractor(
-                new RequestParamsExtractor<GetIamPolicyRequest>() {
-                  @Override
-                  public Map<String, String> extract(GetIamPolicyRequest request) {
-                    ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                    params.put("resource", String.valueOf(request.getResource()));
-                    return params.build();
-                  }
+                request -> {
+                  ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                  params.put("resource", String.valueOf(request.getResource()));
+                  return params.build();
                 })
             .build();
     GrpcCallSettings<TestIamPermissionsRequest, TestIamPermissionsResponse>
@@ -479,13 +435,10 @@ public Map<String, String> extract(GetIamPolicyRequest request) {
             GrpcCallSettings.<TestIamPermissionsRequest, TestIamPermissionsResponse>newBuilder()
                 .setMethodDescriptor(testIamPermissionsMethodDescriptor)
                 .setParamsExtractor(
-                    new RequestParamsExtractor<TestIamPermissionsRequest>() {
-                      @Override
-                      public Map<String, String> extract(TestIamPermissionsRequest request) {
-                        ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
-                        params.put("resource", String.valueOf(request.getResource()));
-                        return params.build();
-                      }
+                    request -> {
+                      ImmutableMap.Builder<String, String> params = ImmutableMap.builder();
+                      params.put("resource", String.valueOf(request.getResource()));
+                      return params.build();
                     })
                 .build();
 
@@ -654,7 +607,13 @@ public UnaryCallable<GetIamPolicyRequest, Policy> getIamPolicyCallable() {
 
   @Override
   public final void close() {
-    shutdown();
+    try {
+      backgroundResources.close();
+    } catch (RuntimeException e) {
+      throw e;
+    } catch (Exception e) {
+      throw new IllegalStateException("Failed to close resource", e);
+    }
   }
 
   @Override
diff --git a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/stub/SecretManagerServiceStubSettings.java b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/stub/SecretManagerServiceStubSettings.java
index a60440b8..0e3142fe 100644
--- a/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/stub/SecretManagerServiceStubSettings.java
+++ b/google-cloud-secretmanager/src/main/java/com/google/cloud/secretmanager/v1beta1/stub/SecretManagerServiceStubSettings.java
@@ -672,14 +672,13 @@ private static Builder initDefaults(Builder builder) {
       return builder;
     }
 
-    // NEXT_MAJOR_VER: remove 'throws Exception'.
     /**
      * Applies the given settings updater function to all of the unary API methods in this service.
      *
      * <p>Note: This method does not support applying settings to streaming methods.
      */
     public Builder applyToAllUnaryMethods(
-        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) throws Exception {
+        ApiFunction<UnaryCallSettings.Builder<?, ?>, Void> settingsUpdater) {
       super.applyToAllUnaryMethods(unaryMethodSettingsBuilders, settingsUpdater);
       return this;
     }
diff --git a/proto-google-cloud-secretmanager-v1/clirr-ignored-differences.xml b/proto-google-cloud-secretmanager-v1/clirr-ignored-differences.xml
index 4229c5ab..c0744a76 100644
--- a/proto-google-cloud-secretmanager-v1/clirr-ignored-differences.xml
+++ b/proto-google-cloud-secretmanager-v1/clirr-ignored-differences.xml
@@ -16,4 +16,8 @@
     <className>com/google/cloud/secretmanager/v1/*OrBuilder</className>
     <method>boolean has*(*)</method>
   </difference>
+  <difference>
+    <differenceType>8001</differenceType>
+    <className>com/google/cloud/secretmanager/v1/TopicName*</className>
+  </difference>
 </differences>
diff --git a/proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/TopicName.java b/proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/TopicName.java
deleted file mode 100644
index 31474161..00000000
--- a/proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/TopicName.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*
- * Copyright 2021 Google LLC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.google.cloud.secretmanager.v1;
-
-import com.google.api.pathtemplate.PathTemplate;
-import com.google.api.resourcenames.ResourceName;
-import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableMap;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import javax.annotation.Generated;
-
-// AUTO-GENERATED DOCUMENTATION AND CLASS.
-@Generated("by gapic-generator-java")
-public class TopicName implements ResourceName {
-  private static final PathTemplate PROJECT_TOPIC =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/topics/{topic}");
-  private volatile Map<String, String> fieldValuesMap;
-  private final String project;
-  private final String topic;
-
-  @Deprecated
-  protected TopicName() {
-    project = null;
-    topic = null;
-  }
-
-  private TopicName(Builder builder) {
-    project = Preconditions.checkNotNull(builder.getProject());
-    topic = Preconditions.checkNotNull(builder.getTopic());
-  }
-
-  public String getProject() {
-    return project;
-  }
-
-  public String getTopic() {
-    return topic;
-  }
-
-  public static Builder newBuilder() {
-    return new Builder();
-  }
-
-  public Builder toBuilder() {
-    return new Builder(this);
-  }
-
-  public static TopicName of(String project, String topic) {
-    return newBuilder().setProject(project).setTopic(topic).build();
-  }
-
-  public static String format(String project, String topic) {
-    return newBuilder().setProject(project).setTopic(topic).build().toString();
-  }
-
-  public static TopicName parse(String formattedString) {
-    if (formattedString.isEmpty()) {
-      return null;
-    }
-    Map<String, String> matchMap =
-        PROJECT_TOPIC.validatedMatch(
-            formattedString, "TopicName.parse: formattedString not in valid format");
-    return of(matchMap.get("project"), matchMap.get("topic"));
-  }
-
-  public static List<TopicName> parseList(List<String> formattedStrings) {
-    List<TopicName> list = new ArrayList<>(formattedStrings.size());
-    for (String formattedString : formattedStrings) {
-      list.add(parse(formattedString));
-    }
-    return list;
-  }
-
-  public static List<String> toStringList(List<TopicName> values) {
-    List<String> list = new ArrayList<>(values.size());
-    for (TopicName value : values) {
-      if (value == null) {
-        list.add("");
-      } else {
-        list.add(value.toString());
-      }
-    }
-    return list;
-  }
-
-  public static boolean isParsableFrom(String formattedString) {
-    return PROJECT_TOPIC.matches(formattedString);
-  }
-
-  @Override
-  public Map<String, String> getFieldValuesMap() {
-    if (fieldValuesMap == null) {
-      synchronized (this) {
-        if (fieldValuesMap == null) {
-          ImmutableMap.Builder<String, String> fieldMapBuilder = ImmutableMap.builder();
-          if (project != null) {
-            fieldMapBuilder.put("project", project);
-          }
-          if (topic != null) {
-            fieldMapBuilder.put("topic", topic);
-          }
-          fieldValuesMap = fieldMapBuilder.build();
-        }
-      }
-    }
-    return fieldValuesMap;
-  }
-
-  public String getFieldValue(String fieldName) {
-    return getFieldValuesMap().get(fieldName);
-  }
-
-  @Override
-  public String toString() {
-    return PROJECT_TOPIC.instantiate("project", project, "topic", topic);
-  }
-
-  @Override
-  public boolean equals(Object o) {
-    if (o == this) {
-      return true;
-    }
-    if (o != null || getClass() == o.getClass()) {
-      TopicName that = ((TopicName) o);
-      return Objects.equals(this.project, that.project) && Objects.equals(this.topic, that.topic);
-    }
-    return false;
-  }
-
-  @Override
-  public int hashCode() {
-    int h = 1;
-    h *= 1000003;
-    h ^= Objects.hashCode(project);
-    h *= 1000003;
-    h ^= Objects.hashCode(topic);
-    return h;
-  }
-
-  /** Builder for projects/{project}/topics/{topic}. */
-  public static class Builder {
-    private String project;
-    private String topic;
-
-    protected Builder() {}
-
-    public String getProject() {
-      return project;
-    }
-
-    public String getTopic() {
-      return topic;
-    }
-
-    public Builder setProject(String project) {
-      this.project = project;
-      return this;
-    }
-
-    public Builder setTopic(String topic) {
-      this.topic = topic;
-      return this;
-    }
-
-    private Builder(TopicName topicName) {
-      this.project = topicName.project;
-      this.topic = topicName.topic;
-    }
-
-    public TopicName build() {
-      return new TopicName(this);
-    }
-  }
-}
diff --git a/synth.metadata b/synth.metadata
index 47a1a387..f3f7f96e 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,8 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "2948f31dd210514f87ce6e1e08bce48ecf4660d1",
-        "internalRef": "387156636"
+        "sha": "a739464cacb3aa6d375683aefe16b79c21da1bb0",
+        "internalRef": "389657692"
       }
     },
     {
@@ -189,7 +189,6 @@
     "proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/SecretVersionOrBuilder.java",
     "proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/ServiceProto.java",
     "proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/Topic.java",
-    "proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/TopicName.java",
     "proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/TopicOrBuilder.java",
     "proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/UpdateSecretRequest.java",
     "proto-google-cloud-secretmanager-v1/src/main/java/com/google/cloud/secretmanager/v1/UpdateSecretRequestOrBuilder.java",