diff --git a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java
index ec5232b4e..af9b20244 100644
--- a/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java
+++ b/proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java
@@ -108,6 +108,12 @@ public static Builder newBuilder() {
   }
 
   @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
+  public static Builder newProjectBuilder() {
+    return new Builder();
+  }
+
+  /** @deprecated Please use {@link #newProjectBuilder()} instead */
+  @Deprecated
   public static Builder newProjectCmekSettingsBuilder() {
     return new Builder();
   }
@@ -136,21 +142,45 @@ public static CmekSettingsName of(String project) {
   }
 
   @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static CmekSettingsName ofProjectName(String project) {
+    return newBuilder().setProject(project).build();
+  }
+
+  /** @deprecated Please use {@link #ofProjectName()} instead */
+  @Deprecated
   public static CmekSettingsName ofProjectCmekSettingsName(String project) {
     return newBuilder().setProject(project).build();
   }
 
   @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static CmekSettingsName ofOrganizationName(String organization) {
+    return newOrganizationCmekSettingsBuilder().setOrganization(organization).build();
+  }
+
+  /** @deprecated Please use {@link #ofOrganizationName()} instead */
+  @Deprecated
   public static CmekSettingsName ofOrganizationCmekSettingsName(String organization) {
     return newOrganizationCmekSettingsBuilder().setOrganization(organization).build();
   }
 
   @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static CmekSettingsName ofFolderName(String folder) {
+    return newFolderCmekSettingsBuilder().setFolder(folder).build();
+  }
+
+  /** @deprecated Please use {@link #ofFolderName()} instead */
+  @Deprecated
   public static CmekSettingsName ofFolderCmekSettingsName(String folder) {
     return newFolderCmekSettingsBuilder().setFolder(folder).build();
   }
 
   @BetaApi("The static create methods are not stable yet and may be changed in the future.")
+  public static CmekSettingsName ofBillingAccountName(String billingAccount) {
+    return newBillingAccountCmekSettingsBuilder().setBillingAccount(billingAccount).build();
+  }
+
+  /** @deprecated Please use {@link #ofBillingAccountName()} instead */
+  @Deprecated
   public static CmekSettingsName ofBillingAccountCmekSettingsName(String billingAccount) {
     return newBillingAccountCmekSettingsBuilder().setBillingAccount(billingAccount).build();
   }
@@ -160,21 +190,48 @@ public static String format(String project) {
   }
 
   @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatProjectName(String project) {
+    return newBuilder().setProject(project).build().toString();
+  }
+
+  /** @deprecated Please use {@link #formatProjectName()} instead */
+  @Deprecated
   public static String formatProjectCmekSettingsName(String project) {
     return newBuilder().setProject(project).build().toString();
   }
 
   @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatOrganizationName(String organization) {
+    return newOrganizationCmekSettingsBuilder().setOrganization(organization).build().toString();
+  }
+
+  /** @deprecated Please use {@link #formatOrganizationName()} instead */
+  @Deprecated
   public static String formatOrganizationCmekSettingsName(String organization) {
     return newOrganizationCmekSettingsBuilder().setOrganization(organization).build().toString();
   }
 
   @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatFolderName(String folder) {
+    return newFolderCmekSettingsBuilder().setFolder(folder).build().toString();
+  }
+
+  /** @deprecated Please use {@link #formatFolderName()} instead */
+  @Deprecated
   public static String formatFolderCmekSettingsName(String folder) {
     return newFolderCmekSettingsBuilder().setFolder(folder).build().toString();
   }
 
   @BetaApi("The static format methods are not stable yet and may be changed in the future.")
+  public static String formatBillingAccountName(String billingAccount) {
+    return newBillingAccountCmekSettingsBuilder()
+        .setBillingAccount(billingAccount)
+        .build()
+        .toString();
+  }
+
+  /** @deprecated Please use {@link #formatBillingAccountName()} instead */
+  @Deprecated
   public static String formatBillingAccountCmekSettingsName(String billingAccount) {
     return newBillingAccountCmekSettingsBuilder()
         .setBillingAccount(billingAccount)
diff --git a/synth.metadata b/synth.metadata
index 808e07e49..7bd7813e2 100644
--- a/synth.metadata
+++ b/synth.metadata
@@ -11,8 +11,7 @@
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "551681f25e36b11829e87e580281350461f4f3f5",
-        "internalRef": "379784268"
+        "sha": "c3b8283ae6a67b575ee863764312645ec8b2d60f"
       }
     },
     {
@@ -33,245 +32,5 @@
         "generator": "bazel"
       }
     }
-  ],
-  "generatedFiles": [
-    ".github/ISSUE_TEMPLATE/bug_report.md",
-    ".github/ISSUE_TEMPLATE/feature_request.md",
-    ".github/ISSUE_TEMPLATE/support_request.md",
-    ".github/PULL_REQUEST_TEMPLATE.md",
-    ".github/generated-files-bot.yml",
-    ".github/readme/synth.py",
-    ".github/release-please.yml",
-    ".github/snippet-bot.yml",
-    ".github/sync-repo-settings.yaml",
-    ".github/trusted-contribution.yml",
-    ".github/workflows/approve-readme.yaml",
-    ".github/workflows/auto-release.yaml",
-    ".github/workflows/ci.yaml",
-    ".github/workflows/samples.yaml",
-    ".kokoro/build.bat",
-    ".kokoro/build.sh",
-    ".kokoro/coerce_logs.sh",
-    ".kokoro/common.cfg",
-    ".kokoro/common.sh",
-    ".kokoro/continuous/common.cfg",
-    ".kokoro/continuous/java8.cfg",
-    ".kokoro/continuous/readme.cfg",
-    ".kokoro/dependencies.sh",
-    ".kokoro/nightly/common.cfg",
-    ".kokoro/nightly/integration.cfg",
-    ".kokoro/nightly/java11.cfg",
-    ".kokoro/nightly/java7.cfg",
-    ".kokoro/nightly/java8-osx.cfg",
-    ".kokoro/nightly/java8-win.cfg",
-    ".kokoro/nightly/java8.cfg",
-    ".kokoro/nightly/samples.cfg",
-    ".kokoro/populate-secrets.sh",
-    ".kokoro/presubmit/clirr.cfg",
-    ".kokoro/presubmit/common.cfg",
-    ".kokoro/presubmit/dependencies.cfg",
-    ".kokoro/presubmit/integration.cfg",
-    ".kokoro/presubmit/java11.cfg",
-    ".kokoro/presubmit/java7.cfg",
-    ".kokoro/presubmit/java8-osx.cfg",
-    ".kokoro/presubmit/java8-win.cfg",
-    ".kokoro/presubmit/java8.cfg",
-    ".kokoro/presubmit/linkage-monitor.cfg",
-    ".kokoro/presubmit/lint.cfg",
-    ".kokoro/presubmit/samples.cfg",
-    ".kokoro/readme.sh",
-    ".kokoro/release/bump_snapshot.cfg",
-    ".kokoro/release/common.cfg",
-    ".kokoro/release/common.sh",
-    ".kokoro/release/drop.cfg",
-    ".kokoro/release/drop.sh",
-    ".kokoro/release/promote.cfg",
-    ".kokoro/release/promote.sh",
-    ".kokoro/release/publish_javadoc.cfg",
-    ".kokoro/release/publish_javadoc.sh",
-    ".kokoro/release/publish_javadoc11.cfg",
-    ".kokoro/release/publish_javadoc11.sh",
-    ".kokoro/release/snapshot.cfg",
-    ".kokoro/release/snapshot.sh",
-    ".kokoro/release/stage.cfg",
-    ".kokoro/release/stage.sh",
-    ".kokoro/trampoline.sh",
-    "CODE_OF_CONDUCT.md",
-    "LICENSE",
-    "SECURITY.md",
-    "codecov.yaml",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigClient.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/ConfigSettings.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingClient.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/LoggingSettings.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsClient.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/MetricsSettings.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/gapic_metadata.json",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/package-info.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2Stub.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2CallableFactory.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcConfigServiceV2Stub.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2CallableFactory.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcLoggingServiceV2Stub.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2CallableFactory.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/GrpcMetricsServiceV2Stub.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2Stub.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2Stub.java",
-    "google-cloud-logging/src/main/java/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/ConfigClientTest.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/LoggingClientTest.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MetricsClientTest.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2.java",
-    "google-cloud-logging/src/test/java/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java",
-    "grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ConfigServiceV2Grpc.java",
-    "grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingServiceV2Grpc.java",
-    "grpc-google-cloud-logging-v2/src/main/java/com/google/logging/v2/MetricsServiceV2Grpc.java",
-    "java.header",
-    "license-checks.xml",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BigQueryOptions.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BigQueryOptionsOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountLocationName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/BillingAccountName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettings.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateBucketRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateBucketRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateExclusionRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateLogMetricRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateSinkRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateViewRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CreateViewRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteBucketRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteBucketRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteExclusionRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogMetricRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteLogRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteSinkRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteViewRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/DeleteViewRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderLocationName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/FolderName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetBucketRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetBucketRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetCmekSettingsRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetCmekSettingsRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetExclusionRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetLogMetricRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetSinkRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetViewRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/GetViewRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LifecycleState.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListBucketsResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListExclusionsResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogEntriesResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogMetricsResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListLogsResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListMonitoredResourceDescriptorsResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListSinksResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ListViewsResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LocationName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucket.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogBucketOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntry.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperation.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOperationOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntryProto.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocation.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogEntrySourceLocationOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusion.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogExclusionOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetric.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogMetricOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSink.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogSinkOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogView.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LogViewOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingConfigProto.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingMetricsProto.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/LoggingProto.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationLocationName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/OrganizationName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/ProjectName.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/TailLogEntriesResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UndeleteBucketRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UndeleteBucketRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateBucketRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateBucketRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateCmekSettingsRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateCmekSettingsRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateExclusionRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateLogMetricRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateSinkRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateViewRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/UpdateViewRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrors.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesPartialErrorsOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequest.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesRequestOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponse.java",
-    "proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/WriteLogEntriesResponseOrBuilder.java",
-    "proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/log_entry.proto",
-    "proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging.proto",
-    "proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_config.proto",
-    "proto-google-cloud-logging-v2/src/main/proto/google/logging/v2/logging_metrics.proto",
-    "renovate.json",
-    "samples/install-without-bom/pom.xml",
-    "samples/pom.xml",
-    "samples/snapshot/pom.xml",
-    "samples/snippets/pom.xml"
   ]
 }
\ No newline at end of file
diff --git a/synth.py b/synth.py
index 9ab8d3847..096f989a0 100644
--- a/synth.py
+++ b/synth.py
@@ -31,18 +31,66 @@
   )
 
   # The method renamings will be removed in the next major release(lines 34 - 51)
-  s.replace('**/CmekSettingsName.java', 'formatBillingAccountName', 'formatBillingAccountCmekSettingsName')
-  s.replace('**/CmekSettingsName.java', 'formatFolderName', 'formatFolderCmekSettingsName')
-  s.replace('**/CmekSettingsName.java', 'formatOrganizationName', 'formatOrganizationCmekSettingsName')
-  s.replace('**/CmekSettingsName.java', 'formatProjectName', 'formatProjectCmekSettingsName')
-  s.replace('**/CmekSettingsName.java', 'newBillingAccountBuilder', 'newBillingAccountCmekSettingsBuilder')
-  s.replace('**/CmekSettingsName.java', 'newFolderBuilder', 'newFolderCmekSettingsBuilder')
-  s.replace('**/CmekSettingsName.java', 'newOrganizationBuilder', 'newOrganizationCmekSettingsBuilder')
-  s.replace('**/CmekSettingsName.java', 'newProjectBuilder', 'newProjectCmekSettingsBuilder')
-  s.replace('**/CmekSettingsName.java', 'ofBillingAccountName', 'ofBillingAccountCmekSettingsName')
-  s.replace('**/CmekSettingsName.java', 'ofFolderName', 'ofFolderCmekSettingsName')
-  s.replace('**/CmekSettingsName.java', 'ofOrganizationName', 'ofOrganizationCmekSettingsName')
-  s.replace('**/CmekSettingsName.java', 'ofProjectName', 'ofProjectCmekSettingsName')
+  #s.replace('**/CmekSettingsName.java', 'formatBillingAccountName', 'formatBillingAccountCmekSettingsName')
+  DEPRECATION_JAVADOC = """Please use {{@link #{new_method}()}} instead"""
+
+  java.copy_and_rename_method(
+    'proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java',
+    'public static String formatBillingAccountName(String billingAccount)', 
+    'formatBillingAccountName', 
+    'formatBillingAccountCmekSettingsName'
+  )
+
+  java.deprecate_method(
+    'proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java',
+    'public static String formatBillingAccountCmekSettingsName(String billingAccount)', 
+    DEPRECATION_JAVADOC.format(new_method='formatBillingAccountName')
+  )
+
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static String formatFolderName(String folder)', 'formatFolderName', 'formatFolderCmekSettingsName')
+  java.deprecate_method(
+    'proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java',
+    'public static String formatFolderCmekSettingsName(String folder)', 
+    DEPRECATION_JAVADOC.format(new_method='formatFolderName')
+    )
+
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static String formatOrganizationName(String organization)', 'formatOrganizationName', 'formatOrganizationCmekSettingsName')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static String formatOrganizationCmekSettingsName(String organization)', DEPRECATION_JAVADOC.format(new_method='formatOrganizationName'))
+ 
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static String formatProjectName(String project)', 'formatProjectName', 'formatProjectCmekSettingsName')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static String formatProjectCmekSettingsName(String project)', DEPRECATION_JAVADOC.format(new_method='formatProjectName'))
+
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static BillingAccountCmekSettingsBuilder newBillingAccountBuilder()', 'newBillingAccountBuilder', 'newBillingAccountCmekSettingsBuilder')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static BillingAccountCmekSettingsBuilder newBillingAccountCmekSettingsBuilder()', DEPRECATION_JAVADOC.format(new_method='newBillingAccountBuilder'))
+  s.replace('**/CmekSettingsName', 'return newBillingAccountBuilder', 'return newBillingAccountCmekSettingsBuilder' )
+  
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static FolderCmekSettingsBuilder newFolderBuilder()', 'newFolderBuilder', 'newFolderCmekSettingsBuilder')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static FolderCmekSettingsBuilder newFolderCmekSettingsBuilder()', DEPRECATION_JAVADOC.format(new_method='newFolderBuilder'))
+  s.replace('**/CmekSettingsName.java', 'return newFolderBuilder', 'return newFolderCmekSettingsBuilder') 
+  
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static OrganizationCmekSettingsBuilder newOrganizationBuilder()', 'newOrganizationBuilder', 'newOrganizationCmekSettingsBuilder')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static OrganizationCmekSettingsBuilder newOrganizationCmekSettingsBuilder()', DEPRECATION_JAVADOC.format(new_method='newOrganizationBuilder'))
+  s.replace('**/CmekSettingsName.java', 'return newOrganizationBuilder', 'return newOrganizationCmekSettingsBuilder')
+
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java', 'public static Builder newProjectBuilder()', 'newProjectBuilder', 'newProjectCmekSettingsBuilder')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static Builder newProjectCmekSettingsBuilder()', DEPRECATION_JAVADOC.format(new_method='newProjectBuilder'))
+
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java', 'public static CmekSettingsName ofBillingAccountName(String billingAccount)', 'ofBillingAccountName', 'ofBillingAccountCmekSettingsName')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static CmekSettingsName ofBillingAccountCmekSettingsName(String billingAccount)', DEPRECATION_JAVADOC.format(new_method='ofBillingAccountName'))
+  s.replace('**/CmekSettingsName.java', 'return ofBillingAccountName', 'return ofBillingAccountCmekSettingsName')
+  
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static CmekSettingsName ofFolderName(String folder)', 'ofFolderName', 'ofFolderCmekSettingsName')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static CmekSettingsName ofFolderCmekSettingsName(String folder)', DEPRECATION_JAVADOC.format(new_method='ofFolderName'))
+  s.replace('**/CmekSettingsName.java', 'return ofFolderName', 'return ofFolderCmekSettingsName')
+
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java', 'public static CmekSettingsName ofOrganizationName(String organization)', 'ofOrganizationName', 'ofOrganizationCmekSettingsName')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static CmekSettingsName ofOrganizationCmekSettingsName(String organization)', DEPRECATION_JAVADOC.format(new_method='ofOrganizationName'))
+  s.replace('**/CmekSettingsName.java', 'return ofOrganizationName', 'return ofOrganizationCmekSettingsName')
+  
+  java.copy_and_rename_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java', 'public static CmekSettingsName ofProjectName(String project)', 'ofProjectName', 'ofProjectCmekSettingsName')
+  java.deprecate_method('proto-google-cloud-logging-v2/src/main/java/com/google/logging/v2/CmekSettingsName.java','public static CmekSettingsName ofProjectCmekSettingsName(String project)', DEPRECATION_JAVADOC.format(new_method='ofProjectName'))
+  s.replace('**/CmekSettingsName.java', 'return ofProjectName', 'return ofProjectCmekSettingsName')
+
   s.replace('**/CmekSettingsName.java', 'BillingAccountBuilder', 'BillingAccountCmekSettingsBuilder')
   s.replace('**/CmekSettingsName.java', 'FolderBuilder', 'FolderCmekSettingsBuilder')
   s.replace('**/CmekSettingsName.java', 'OrganizationBuilder', 'OrganizationCmekSettingsBuilder')