diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java
index 1fb2de0943bd..813abbb5a225 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClient.java
@@ -25,7 +25,6 @@
 import com.google.api.gax.paging.AbstractPagedListResponse;
 import com.google.api.gax.rpc.PageContext;
 import com.google.api.gax.rpc.UnaryCallable;
-import com.google.api.pathtemplate.PathTemplate;
 import com.google.cloud.websecurityscanner.v1alpha.stub.WebSecurityScannerStub;
 import com.google.cloud.websecurityscanner.v1alpha.stub.WebSecurityScannerStubSettings;
 import com.google.protobuf.Empty;
@@ -47,7 +46,7 @@
  * <pre>
  * <code>
  * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
- *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+ *   String formattedParent = ProjectName.format("[PROJECT]");
  *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
  *   ScanConfig response = webSecurityScannerClient.createScanConfig(formattedParent, scanConfig);
  * }
@@ -111,116 +110,6 @@ public class WebSecurityScannerClient implements BackgroundResource {
   private final WebSecurityScannerSettings settings;
   private final WebSecurityScannerStub stub;
 
-  private static final PathTemplate PROJECT_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}");
-
-  private static final PathTemplate SCAN_CONFIG_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding("projects/{project}/scanConfigs/{scan_config}");
-
-  private static final PathTemplate SCAN_RUN_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/scanConfigs/{scan_config}/scanRuns/{scan_run}");
-
-  private static final PathTemplate FINDING_PATH_TEMPLATE =
-      PathTemplate.createWithoutUrlEncoding(
-          "projects/{project}/scanConfigs/{scan_config}/scanRuns/{scan_run}/findings/{finding}");
-
-  /** Formats a string containing the fully-qualified path to represent a project resource. */
-  public static final String formatProjectName(String project) {
-    return PROJECT_PATH_TEMPLATE.instantiate("project", project);
-  }
-
-  /** Formats a string containing the fully-qualified path to represent a scan_config resource. */
-  public static final String formatScanConfigName(String project, String scanConfig) {
-    return SCAN_CONFIG_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "scan_config", scanConfig);
-  }
-
-  /** Formats a string containing the fully-qualified path to represent a scan_run resource. */
-  public static final String formatScanRunName(String project, String scanConfig, String scanRun) {
-    return SCAN_RUN_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "scan_config", scanConfig,
-        "scan_run", scanRun);
-  }
-
-  /** Formats a string containing the fully-qualified path to represent a finding resource. */
-  public static final String formatFindingName(
-      String project, String scanConfig, String scanRun, String finding) {
-    return FINDING_PATH_TEMPLATE.instantiate(
-        "project", project,
-        "scan_config", scanConfig,
-        "scan_run", scanRun,
-        "finding", finding);
-  }
-
-  /** Parses the project from the given fully-qualified path which represents a project resource. */
-  public static final String parseProjectFromProjectName(String projectName) {
-    return PROJECT_PATH_TEMPLATE.parse(projectName).get("project");
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a scan_config resource.
-   */
-  public static final String parseProjectFromScanConfigName(String scanConfigName) {
-    return SCAN_CONFIG_PATH_TEMPLATE.parse(scanConfigName).get("project");
-  }
-
-  /**
-   * Parses the scan_config from the given fully-qualified path which represents a scan_config
-   * resource.
-   */
-  public static final String parseScanConfigFromScanConfigName(String scanConfigName) {
-    return SCAN_CONFIG_PATH_TEMPLATE.parse(scanConfigName).get("scan_config");
-  }
-
-  /**
-   * Parses the project from the given fully-qualified path which represents a scan_run resource.
-   */
-  public static final String parseProjectFromScanRunName(String scanRunName) {
-    return SCAN_RUN_PATH_TEMPLATE.parse(scanRunName).get("project");
-  }
-
-  /**
-   * Parses the scan_config from the given fully-qualified path which represents a scan_run
-   * resource.
-   */
-  public static final String parseScanConfigFromScanRunName(String scanRunName) {
-    return SCAN_RUN_PATH_TEMPLATE.parse(scanRunName).get("scan_config");
-  }
-
-  /**
-   * Parses the scan_run from the given fully-qualified path which represents a scan_run resource.
-   */
-  public static final String parseScanRunFromScanRunName(String scanRunName) {
-    return SCAN_RUN_PATH_TEMPLATE.parse(scanRunName).get("scan_run");
-  }
-
-  /** Parses the project from the given fully-qualified path which represents a finding resource. */
-  public static final String parseProjectFromFindingName(String findingName) {
-    return FINDING_PATH_TEMPLATE.parse(findingName).get("project");
-  }
-
-  /**
-   * Parses the scan_config from the given fully-qualified path which represents a finding resource.
-   */
-  public static final String parseScanConfigFromFindingName(String findingName) {
-    return FINDING_PATH_TEMPLATE.parse(findingName).get("scan_config");
-  }
-
-  /**
-   * Parses the scan_run from the given fully-qualified path which represents a finding resource.
-   */
-  public static final String parseScanRunFromFindingName(String findingName) {
-    return FINDING_PATH_TEMPLATE.parse(findingName).get("scan_run");
-  }
-
-  /** Parses the finding from the given fully-qualified path which represents a finding resource. */
-  public static final String parseFindingFromFindingName(String findingName) {
-    return FINDING_PATH_TEMPLATE.parse(findingName).get("finding");
-  }
-
   /** Constructs an instance of WebSecurityScannerClient with default settings. */
   public static final WebSecurityScannerClient create() throws IOException {
     return create(WebSecurityScannerSettings.newBuilder().build());
@@ -277,7 +166,7 @@ public WebSecurityScannerStub getStub() {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   String formattedParent = ProjectName.format("[PROJECT]");
    *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
    *   ScanConfig response = webSecurityScannerClient.createScanConfig(formattedParent, scanConfig);
    * }
@@ -289,7 +178,7 @@ public WebSecurityScannerStub getStub() {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ScanConfig createScanConfig(String parent, ScanConfig scanConfig) {
-    PROJECT_PATH_TEMPLATE.validate(parent, "createScanConfig");
+
     CreateScanConfigRequest request =
         CreateScanConfigRequest.newBuilder().setParent(parent).setScanConfig(scanConfig).build();
     return createScanConfig(request);
@@ -303,7 +192,7 @@ public final ScanConfig createScanConfig(String parent, ScanConfig scanConfig) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   String formattedParent = ProjectName.format("[PROJECT]");
    *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
    *   CreateScanConfigRequest request = CreateScanConfigRequest.newBuilder()
    *     .setParent(formattedParent)
@@ -328,7 +217,7 @@ public final ScanConfig createScanConfig(CreateScanConfigRequest request) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   String formattedParent = ProjectName.format("[PROJECT]");
    *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
    *   CreateScanConfigRequest request = CreateScanConfigRequest.newBuilder()
    *     .setParent(formattedParent)
@@ -352,7 +241,7 @@ public final UnaryCallable<CreateScanConfigRequest, ScanConfig> createScanConfig
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   webSecurityScannerClient.deleteScanConfig(formattedName);
    * }
    * </code></pre>
@@ -362,7 +251,7 @@ public final UnaryCallable<CreateScanConfigRequest, ScanConfig> createScanConfig
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final void deleteScanConfig(String name) {
-    SCAN_CONFIG_PATH_TEMPLATE.validate(name, "deleteScanConfig");
+
     DeleteScanConfigRequest request = DeleteScanConfigRequest.newBuilder().setName(name).build();
     deleteScanConfig(request);
   }
@@ -375,7 +264,7 @@ public final void deleteScanConfig(String name) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   DeleteScanConfigRequest request = DeleteScanConfigRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -398,7 +287,7 @@ public final void deleteScanConfig(DeleteScanConfigRequest request) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   DeleteScanConfigRequest request = DeleteScanConfigRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -420,7 +309,7 @@ public final UnaryCallable<DeleteScanConfigRequest, Empty> deleteScanConfigCalla
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   ScanConfig response = webSecurityScannerClient.getScanConfig(formattedName);
    * }
    * </code></pre>
@@ -430,7 +319,7 @@ public final UnaryCallable<DeleteScanConfigRequest, Empty> deleteScanConfigCalla
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ScanConfig getScanConfig(String name) {
-    SCAN_CONFIG_PATH_TEMPLATE.validate(name, "getScanConfig");
+
     GetScanConfigRequest request = GetScanConfigRequest.newBuilder().setName(name).build();
     return getScanConfig(request);
   }
@@ -443,7 +332,7 @@ public final ScanConfig getScanConfig(String name) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   GetScanConfigRequest request = GetScanConfigRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -466,7 +355,7 @@ public final ScanConfig getScanConfig(GetScanConfigRequest request) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   GetScanConfigRequest request = GetScanConfigRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -488,7 +377,7 @@ public final UnaryCallable<GetScanConfigRequest, ScanConfig> getScanConfigCallab
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   String formattedParent = ProjectName.format("[PROJECT]");
    *   for (ScanConfig element : webSecurityScannerClient.listScanConfigs(formattedParent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -500,7 +389,6 @@ public final UnaryCallable<GetScanConfigRequest, ScanConfig> getScanConfigCallab
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListScanConfigsPagedResponse listScanConfigs(String parent) {
-    PROJECT_PATH_TEMPLATE.validate(parent, "listScanConfigs");
     ListScanConfigsRequest request = ListScanConfigsRequest.newBuilder().setParent(parent).build();
     return listScanConfigs(request);
   }
@@ -513,7 +401,7 @@ public final ListScanConfigsPagedResponse listScanConfigs(String parent) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   String formattedParent = ProjectName.format("[PROJECT]");
    *   ListScanConfigsRequest request = ListScanConfigsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -538,7 +426,7 @@ public final ListScanConfigsPagedResponse listScanConfigs(ListScanConfigsRequest
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   String formattedParent = ProjectName.format("[PROJECT]");
    *   ListScanConfigsRequest request = ListScanConfigsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -563,7 +451,7 @@ public final ListScanConfigsPagedResponse listScanConfigs(ListScanConfigsRequest
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+   *   String formattedParent = ProjectName.format("[PROJECT]");
    *   ListScanConfigsRequest request = ListScanConfigsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -676,7 +564,7 @@ public final UnaryCallable<UpdateScanConfigRequest, ScanConfig> updateScanConfig
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   ScanRun response = webSecurityScannerClient.startScanRun(formattedName);
    * }
    * </code></pre>
@@ -686,7 +574,7 @@ public final UnaryCallable<UpdateScanConfigRequest, ScanConfig> updateScanConfig
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ScanRun startScanRun(String name) {
-    SCAN_CONFIG_PATH_TEMPLATE.validate(name, "startScanRun");
+
     StartScanRunRequest request = StartScanRunRequest.newBuilder().setName(name).build();
     return startScanRun(request);
   }
@@ -699,7 +587,7 @@ public final ScanRun startScanRun(String name) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   StartScanRunRequest request = StartScanRunRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -722,7 +610,7 @@ public final ScanRun startScanRun(StartScanRunRequest request) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   StartScanRunRequest request = StartScanRunRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -744,7 +632,7 @@ public final UnaryCallable<StartScanRunRequest, ScanRun> startScanRunCallable()
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   ScanRun response = webSecurityScannerClient.getScanRun(formattedName);
    * }
    * </code></pre>
@@ -754,7 +642,7 @@ public final UnaryCallable<StartScanRunRequest, ScanRun> startScanRunCallable()
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ScanRun getScanRun(String name) {
-    SCAN_RUN_PATH_TEMPLATE.validate(name, "getScanRun");
+
     GetScanRunRequest request = GetScanRunRequest.newBuilder().setName(name).build();
     return getScanRun(request);
   }
@@ -767,7 +655,7 @@ public final ScanRun getScanRun(String name) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   GetScanRunRequest request = GetScanRunRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -790,7 +678,7 @@ public final ScanRun getScanRun(GetScanRunRequest request) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   GetScanRunRequest request = GetScanRunRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -812,7 +700,7 @@ public final UnaryCallable<GetScanRunRequest, ScanRun> getScanRunCallable() {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedParent = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   for (ScanRun element : webSecurityScannerClient.listScanRuns(formattedParent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -824,7 +712,6 @@ public final UnaryCallable<GetScanRunRequest, ScanRun> getScanRunCallable() {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListScanRunsPagedResponse listScanRuns(String parent) {
-    SCAN_CONFIG_PATH_TEMPLATE.validate(parent, "listScanRuns");
     ListScanRunsRequest request = ListScanRunsRequest.newBuilder().setParent(parent).build();
     return listScanRuns(request);
   }
@@ -837,7 +724,7 @@ public final ListScanRunsPagedResponse listScanRuns(String parent) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedParent = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   ListScanRunsRequest request = ListScanRunsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -862,7 +749,7 @@ public final ListScanRunsPagedResponse listScanRuns(ListScanRunsRequest request)
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedParent = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   ListScanRunsRequest request = ListScanRunsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -887,7 +774,7 @@ public final ListScanRunsPagedResponse listScanRuns(ListScanRunsRequest request)
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+   *   String formattedParent = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
    *   ListScanRunsRequest request = ListScanRunsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -918,7 +805,7 @@ public final UnaryCallable<ListScanRunsRequest, ListScanRunsResponse> listScanRu
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   ScanRun response = webSecurityScannerClient.stopScanRun(formattedName);
    * }
    * </code></pre>
@@ -928,7 +815,7 @@ public final UnaryCallable<ListScanRunsRequest, ListScanRunsResponse> listScanRu
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ScanRun stopScanRun(String name) {
-    SCAN_RUN_PATH_TEMPLATE.validate(name, "stopScanRun");
+
     StopScanRunRequest request = StopScanRunRequest.newBuilder().setName(name).build();
     return stopScanRun(request);
   }
@@ -941,7 +828,7 @@ public final ScanRun stopScanRun(String name) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   StopScanRunRequest request = StopScanRunRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -964,7 +851,7 @@ public final ScanRun stopScanRun(StopScanRunRequest request) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   StopScanRunRequest request = StopScanRunRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -986,7 +873,7 @@ public final UnaryCallable<StopScanRunRequest, ScanRun> stopScanRunCallable() {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   for (CrawledUrl element : webSecurityScannerClient.listCrawledUrls(formattedParent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -998,7 +885,6 @@ public final UnaryCallable<StopScanRunRequest, ScanRun> stopScanRunCallable() {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListCrawledUrlsPagedResponse listCrawledUrls(String parent) {
-    SCAN_RUN_PATH_TEMPLATE.validate(parent, "listCrawledUrls");
     ListCrawledUrlsRequest request = ListCrawledUrlsRequest.newBuilder().setParent(parent).build();
     return listCrawledUrls(request);
   }
@@ -1011,7 +897,7 @@ public final ListCrawledUrlsPagedResponse listCrawledUrls(String parent) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   ListCrawledUrlsRequest request = ListCrawledUrlsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -1036,7 +922,7 @@ public final ListCrawledUrlsPagedResponse listCrawledUrls(ListCrawledUrlsRequest
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   ListCrawledUrlsRequest request = ListCrawledUrlsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -1061,7 +947,7 @@ public final ListCrawledUrlsPagedResponse listCrawledUrls(ListCrawledUrlsRequest
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   ListCrawledUrlsRequest request = ListCrawledUrlsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -1093,7 +979,7 @@ public final ListCrawledUrlsPagedResponse listCrawledUrls(ListCrawledUrlsRequest
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatFindingName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+   *   String formattedName = FindingName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
    *   Finding response = webSecurityScannerClient.getFinding(formattedName);
    * }
    * </code></pre>
@@ -1104,7 +990,7 @@ public final ListCrawledUrlsPagedResponse listCrawledUrls(ListCrawledUrlsRequest
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final Finding getFinding(String name) {
-    FINDING_PATH_TEMPLATE.validate(name, "getFinding");
+
     GetFindingRequest request = GetFindingRequest.newBuilder().setName(name).build();
     return getFinding(request);
   }
@@ -1117,7 +1003,7 @@ public final Finding getFinding(String name) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatFindingName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+   *   String formattedName = FindingName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
    *   GetFindingRequest request = GetFindingRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -1140,7 +1026,7 @@ public final Finding getFinding(GetFindingRequest request) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedName = WebSecurityScannerClient.formatFindingName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+   *   String formattedName = FindingName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
    *   GetFindingRequest request = GetFindingRequest.newBuilder()
    *     .setName(formattedName)
    *     .build();
@@ -1162,7 +1048,7 @@ public final UnaryCallable<GetFindingRequest, Finding> getFindingCallable() {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   String filter = "";
    *   for (Finding element : webSecurityScannerClient.listFindings(formattedParent, filter).iterateAll()) {
    *     // doThingsWith(element);
@@ -1177,7 +1063,6 @@ public final UnaryCallable<GetFindingRequest, Finding> getFindingCallable() {
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListFindingsPagedResponse listFindings(String parent, String filter) {
-    SCAN_RUN_PATH_TEMPLATE.validate(parent, "listFindings");
     ListFindingsRequest request =
         ListFindingsRequest.newBuilder().setParent(parent).setFilter(filter).build();
     return listFindings(request);
@@ -1191,7 +1076,7 @@ public final ListFindingsPagedResponse listFindings(String parent, String filter
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   String filter = "";
    *   ListFindingsRequest request = ListFindingsRequest.newBuilder()
    *     .setParent(formattedParent)
@@ -1218,7 +1103,7 @@ public final ListFindingsPagedResponse listFindings(ListFindingsRequest request)
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   String filter = "";
    *   ListFindingsRequest request = ListFindingsRequest.newBuilder()
    *     .setParent(formattedParent)
@@ -1245,7 +1130,7 @@ public final ListFindingsPagedResponse listFindings(ListFindingsRequest request)
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   String filter = "";
    *   ListFindingsRequest request = ListFindingsRequest.newBuilder()
    *     .setParent(formattedParent)
@@ -1278,7 +1163,7 @@ public final UnaryCallable<ListFindingsRequest, ListFindingsResponse> listFindin
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   ListFindingTypeStatsResponse response = webSecurityScannerClient.listFindingTypeStats(formattedParent);
    * }
    * </code></pre>
@@ -1288,7 +1173,7 @@ public final UnaryCallable<ListFindingsRequest, ListFindingsResponse> listFindin
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final ListFindingTypeStatsResponse listFindingTypeStats(String parent) {
-    SCAN_RUN_PATH_TEMPLATE.validate(parent, "listFindingTypeStats");
+
     ListFindingTypeStatsRequest request =
         ListFindingTypeStatsRequest.newBuilder().setParent(parent).build();
     return listFindingTypeStats(request);
@@ -1302,7 +1187,7 @@ public final ListFindingTypeStatsResponse listFindingTypeStats(String parent) {
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   ListFindingTypeStatsRequest request = ListFindingTypeStatsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
@@ -1326,7 +1211,7 @@ public final ListFindingTypeStatsResponse listFindingTypeStats(
    *
    * <pre><code>
    * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
-   *   String formattedParent = WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+   *   String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
    *   ListFindingTypeStatsRequest request = ListFindingTypeStatsRequest.newBuilder()
    *     .setParent(formattedParent)
    *     .build();
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/package-info.java b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/package-info.java
index 9498bdc4a92c..7358bdda9e66 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/package-info.java
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/main/java/com/google/cloud/websecurityscanner/v1alpha/package-info.java
@@ -30,7 +30,7 @@
  * <pre>
  * <code>
  * try (WebSecurityScannerClient webSecurityScannerClient = WebSecurityScannerClient.create()) {
- *   String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+ *   String formattedParent = ProjectName.format("[PROJECT]");
  *   ScanConfig scanConfig = ScanConfig.newBuilder().build();
  *   ScanConfig response = webSecurityScannerClient.createScanConfig(formattedParent, scanConfig);
  * }
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java
index 1adb90f7652a..d4b568cc4d94 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java
+++ b/google-cloud-clients/google-cloud-websecurityscanner/src/test/java/com/google/cloud/websecurityscanner/v1alpha/WebSecurityScannerClientTest.java
@@ -91,7 +91,7 @@ public void createScanConfigTest() {
         ScanConfig.newBuilder().setName(name).setDisplayName(displayName).setMaxQps(maxQps).build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+    String formattedParent = ProjectName.format("[PROJECT]");
     ScanConfig scanConfig = ScanConfig.newBuilder().build();
 
     ScanConfig actualResponse = client.createScanConfig(formattedParent, scanConfig);
@@ -116,7 +116,7 @@ public void createScanConfigExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+      String formattedParent = ProjectName.format("[PROJECT]");
       ScanConfig scanConfig = ScanConfig.newBuilder().build();
 
       client.createScanConfig(formattedParent, scanConfig);
@@ -132,8 +132,7 @@ public void deleteScanConfigTest() {
     Empty expectedResponse = Empty.newBuilder().build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedName =
-        WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+    String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
 
     client.deleteScanConfig(formattedName);
 
@@ -155,8 +154,7 @@ public void deleteScanConfigExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedName =
-          WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+      String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
 
       client.deleteScanConfig(formattedName);
       Assert.fail("No exception raised");
@@ -179,8 +177,7 @@ public void getScanConfigTest() {
             .build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedName =
-        WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+    String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
 
     ScanConfig actualResponse = client.getScanConfig(formattedName);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -203,8 +200,7 @@ public void getScanConfigExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedName =
-          WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+      String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
 
       client.getScanConfig(formattedName);
       Assert.fail("No exception raised");
@@ -226,7 +222,7 @@ public void listScanConfigsTest() {
             .build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+    String formattedParent = ProjectName.format("[PROJECT]");
 
     ListScanConfigsPagedResponse pagedListResponse = client.listScanConfigs(formattedParent);
 
@@ -252,7 +248,7 @@ public void listScanConfigsExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedParent = WebSecurityScannerClient.formatProjectName("[PROJECT]");
+      String formattedParent = ProjectName.format("[PROJECT]");
 
       client.listScanConfigs(formattedParent);
       Assert.fail("No exception raised");
@@ -324,8 +320,7 @@ public void startScanRunTest() {
             .build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedName =
-        WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+    String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
 
     ScanRun actualResponse = client.startScanRun(formattedName);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -348,8 +343,7 @@ public void startScanRunExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedName =
-          WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+      String formattedName = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
 
       client.startScanRun(formattedName);
       Assert.fail("No exception raised");
@@ -376,8 +370,7 @@ public void getScanRunTest() {
             .build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedName =
-        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+    String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
 
     ScanRun actualResponse = client.getScanRun(formattedName);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -400,8 +393,7 @@ public void getScanRunExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedName =
-          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+      String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
 
       client.getScanRun(formattedName);
       Assert.fail("No exception raised");
@@ -423,8 +415,7 @@ public void listScanRunsTest() {
             .build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedParent =
-        WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+    String formattedParent = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
 
     ListScanRunsPagedResponse pagedListResponse = client.listScanRuns(formattedParent);
 
@@ -450,8 +441,7 @@ public void listScanRunsExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedParent =
-          WebSecurityScannerClient.formatScanConfigName("[PROJECT]", "[SCAN_CONFIG]");
+      String formattedParent = ScanConfigName.format("[PROJECT]", "[SCAN_CONFIG]");
 
       client.listScanRuns(formattedParent);
       Assert.fail("No exception raised");
@@ -478,8 +468,7 @@ public void stopScanRunTest() {
             .build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedName =
-        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+    String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
 
     ScanRun actualResponse = client.stopScanRun(formattedName);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -502,8 +491,7 @@ public void stopScanRunExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedName =
-          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+      String formattedName = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
 
       client.stopScanRun(formattedName);
       Assert.fail("No exception raised");
@@ -525,8 +513,7 @@ public void listCrawledUrlsTest() {
             .build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedParent =
-        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+    String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
 
     ListCrawledUrlsPagedResponse pagedListResponse = client.listCrawledUrls(formattedParent);
 
@@ -552,8 +539,7 @@ public void listCrawledUrlsExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedParent =
-          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+      String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
 
       client.listCrawledUrls(formattedParent);
       Assert.fail("No exception raised");
@@ -589,8 +575,7 @@ public void getFindingTest() {
     mockWebSecurityScanner.addResponse(expectedResponse);
 
     String formattedName =
-        WebSecurityScannerClient.formatFindingName(
-            "[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+        FindingName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
 
     Finding actualResponse = client.getFinding(formattedName);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -614,8 +599,7 @@ public void getFindingExceptionTest() throws Exception {
 
     try {
       String formattedName =
-          WebSecurityScannerClient.formatFindingName(
-              "[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
+          FindingName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]", "[FINDING]");
 
       client.getFinding(formattedName);
       Assert.fail("No exception raised");
@@ -637,8 +621,7 @@ public void listFindingsTest() {
             .build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedParent =
-        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+    String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
     String filter = "filter-1274492040";
 
     ListFindingsPagedResponse pagedListResponse = client.listFindings(formattedParent, filter);
@@ -666,8 +649,7 @@ public void listFindingsExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedParent =
-          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+      String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
       String filter = "filter-1274492040";
 
       client.listFindings(formattedParent, filter);
@@ -684,8 +666,7 @@ public void listFindingTypeStatsTest() {
         ListFindingTypeStatsResponse.newBuilder().build();
     mockWebSecurityScanner.addResponse(expectedResponse);
 
-    String formattedParent =
-        WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+    String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
 
     ListFindingTypeStatsResponse actualResponse = client.listFindingTypeStats(formattedParent);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -708,8 +689,7 @@ public void listFindingTypeStatsExceptionTest() throws Exception {
     mockWebSecurityScanner.addException(exception);
 
     try {
-      String formattedParent =
-          WebSecurityScannerClient.formatScanRunName("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
+      String formattedParent = ScanRunName.format("[PROJECT]", "[SCAN_CONFIG]", "[SCAN_RUN]");
 
       client.listFindingTypeStats(formattedParent);
       Assert.fail("No exception raised");
diff --git a/google-cloud-clients/google-cloud-websecurityscanner/synth.metadata b/google-cloud-clients/google-cloud-websecurityscanner/synth.metadata
index 987fc288f345..abcd59074bda 100644
--- a/google-cloud-clients/google-cloud-websecurityscanner/synth.metadata
+++ b/google-cloud-clients/google-cloud-websecurityscanner/synth.metadata
@@ -1,19 +1,19 @@
 {
-  "updateTime": "2019-01-17T08:55:02.517910Z",
+  "updateTime": "2019-02-02T08:50:48.157044Z",
   "sources": [
     {
       "generator": {
         "name": "artman",
-        "version": "0.16.6",
-        "dockerImage": "googleapis/artman@sha256:12722f2ca3fbc3b53cc6aa5f0e569d7d221b46bd876a2136497089dec5e3634e"
+        "version": "0.16.8",
+        "dockerImage": "googleapis/artman@sha256:75bc07ef34a1de9895c18af54dc503ed3b3f3b52e85062e3360a979d2a0741e7"
       }
     },
     {
       "git": {
         "name": "googleapis",
         "remote": "https://github.com/googleapis/googleapis.git",
-        "sha": "0ac60e21a1aa86c07c1836865b35308ba8178b05",
-        "internalRef": "229626798"
+        "sha": "bce093dab3e65c40eb9a37efbdc960f34df6037a",
+        "internalRef": "231974277"
       }
     }
   ],