diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
index 97ea6124..7ddb2530 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogClient.java
@@ -430,7 +430,7 @@ public final EntryGroup createEntryGroup(
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString();
    *   String entryGroupId = "entryGroupId1228924712";
    *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
    *   EntryGroup response = dataCatalogClient.createEntryGroup(parent, entryGroupId, entryGroup);
@@ -493,7 +493,7 @@ public final EntryGroup createEntryGroup(
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   CreateEntryGroupRequest request =
    *       CreateEntryGroupRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString())
    *           .setEntryGroupId("entryGroupId1228924712")
    *           .setEntryGroup(EntryGroup.newBuilder().build())
    *           .build();
@@ -543,7 +543,7 @@ public final EntryGroup createEntryGroup(CreateEntryGroupRequest request) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   CreateEntryGroupRequest request =
    *       CreateEntryGroupRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString())
    *           .setEntryGroupId("entryGroupId1228924712")
    *           .setEntryGroup(EntryGroup.newBuilder().build())
    *           .build();
@@ -1815,7 +1815,7 @@ public final TagTemplate createTagTemplate(
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]").toString();
    *   String tagTemplateId = "tagTemplateId-1438776721";
    *   TagTemplate tagTemplate = TagTemplate.newBuilder().build();
    *   TagTemplate response =
@@ -1856,7 +1856,7 @@ public final TagTemplate createTagTemplate(
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   CreateTagTemplateRequest request =
    *       CreateTagTemplateRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]").toString())
    *           .setTagTemplateId("tagTemplateId-1438776721")
    *           .setTagTemplate(TagTemplate.newBuilder().build())
    *           .build();
@@ -1885,7 +1885,7 @@ public final TagTemplate createTagTemplate(CreateTagTemplateRequest request) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   CreateTagTemplateRequest request =
    *       CreateTagTemplateRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]").toString())
    *           .setTagTemplateId("tagTemplateId-1438776721")
    *           .setTagTemplate(TagTemplate.newBuilder().build())
    *           .build();
@@ -3318,7 +3318,8 @@ public final void deleteTag(EntryName name) {
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
+   *   String name =
+   *       TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]").toString();
    *   dataCatalogClient.deleteTag(name);
    * }
    * }</pre>
@@ -3342,7 +3343,8 @@ public final void deleteTag(String name) {
    *   DeleteTagRequest request =
    *       DeleteTagRequest.newBuilder()
    *           .setName(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .build();
    *   dataCatalogClient.deleteTag(request);
    * }
@@ -3366,7 +3368,8 @@ public final void deleteTag(DeleteTagRequest request) {
    *   DeleteTagRequest request =
    *       DeleteTagRequest.newBuilder()
    *           .setName(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .build();
    *   ApiFuture<Empty> future = dataCatalogClient.deleteTagCallable().futureCall(request);
    *   // Do something.
@@ -3414,7 +3417,7 @@ public final ListTagsPagedResponse listTags(EntryName parent) {
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   String parent =
-   *       EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
+   *       TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]").toString();
    *   for (Tag element : dataCatalogClient.listTags(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -3443,7 +3446,8 @@ public final ListTagsPagedResponse listTags(String parent) {
    *   ListTagsRequest request =
    *       ListTagsRequest.newBuilder()
    *           .setParent(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -3471,7 +3475,8 @@ public final ListTagsPagedResponse listTags(ListTagsRequest request) {
    *   ListTagsRequest request =
    *       ListTagsRequest.newBuilder()
    *           .setParent(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -3498,7 +3503,8 @@ public final UnaryCallable<ListTagsRequest, ListTagsPagedResponse> listTagsPaged
    *   ListTagsRequest request =
    *       ListTagsRequest.newBuilder()
    *           .setParent(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java
index f400f95f..9b483263 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClient.java
@@ -199,7 +199,7 @@ public final Taxonomy createTaxonomy(LocationName parent, Taxonomy taxonomy) {
    *
    * <pre>{@code
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
    *   Taxonomy taxonomy = Taxonomy.newBuilder().build();
    *   Taxonomy response = policyTagManagerClient.createTaxonomy(parent, taxonomy);
    * }
@@ -227,7 +227,7 @@ public final Taxonomy createTaxonomy(String parent, Taxonomy taxonomy) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   CreateTaxonomyRequest request =
    *       CreateTaxonomyRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setTaxonomy(Taxonomy.newBuilder().build())
    *           .build();
    *   Taxonomy response = policyTagManagerClient.createTaxonomy(request);
@@ -253,7 +253,7 @@ public final Taxonomy createTaxonomy(CreateTaxonomyRequest request) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   CreateTaxonomyRequest request =
    *       CreateTaxonomyRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setTaxonomy(Taxonomy.newBuilder().build())
    *           .build();
    *   ApiFuture<Taxonomy> future =
@@ -466,7 +466,7 @@ public final ListTaxonomiesPagedResponse listTaxonomies(LocationName parent) {
    *
    * <pre>{@code
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
    *   for (Taxonomy element : policyTagManagerClient.listTaxonomies(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -491,7 +491,7 @@ public final ListTaxonomiesPagedResponse listTaxonomies(String parent) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListTaxonomiesRequest request =
    *       ListTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -518,7 +518,7 @@ public final ListTaxonomiesPagedResponse listTaxonomies(ListTaxonomiesRequest re
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListTaxonomiesRequest request =
    *       ListTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -546,7 +546,7 @@ public final ListTaxonomiesPagedResponse listTaxonomies(ListTaxonomiesRequest re
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListTaxonomiesRequest request =
    *       ListTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -694,7 +694,8 @@ public final PolicyTag createPolicyTag(TaxonomyName parent, PolicyTag policyTag)
    *
    * <pre>{@code
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   String parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
+   *   String parent =
+   *       PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]").toString();
    *   PolicyTag policyTag = PolicyTag.newBuilder().build();
    *   PolicyTag response = policyTagManagerClient.createPolicyTag(parent, policyTag);
    * }
@@ -720,7 +721,9 @@ public final PolicyTag createPolicyTag(String parent, PolicyTag policyTag) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   CreatePolicyTagRequest request =
    *       CreatePolicyTagRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPolicyTag(PolicyTag.newBuilder().build())
    *           .build();
    *   PolicyTag response = policyTagManagerClient.createPolicyTag(request);
@@ -744,7 +747,9 @@ public final PolicyTag createPolicyTag(CreatePolicyTagRequest request) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   CreatePolicyTagRequest request =
    *       CreatePolicyTagRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPolicyTag(PolicyTag.newBuilder().build())
    *           .build();
    *   ApiFuture<PolicyTag> future =
@@ -984,7 +989,8 @@ public final ListPolicyTagsPagedResponse listPolicyTags(TaxonomyName parent) {
    *
    * <pre>{@code
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   String parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
+   *   String parent =
+   *       PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]").toString();
    *   for (PolicyTag element : policyTagManagerClient.listPolicyTags(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -1009,7 +1015,9 @@ public final ListPolicyTagsPagedResponse listPolicyTags(String parent) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListPolicyTagsRequest request =
    *       ListPolicyTagsRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -1036,7 +1044,9 @@ public final ListPolicyTagsPagedResponse listPolicyTags(ListPolicyTagsRequest re
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListPolicyTagsRequest request =
    *       ListPolicyTagsRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -1064,7 +1074,9 @@ public final ListPolicyTagsPagedResponse listPolicyTags(ListPolicyTagsRequest re
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListPolicyTagsRequest request =
    *       ListPolicyTagsRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClient.java
index 3a5dfd9a..6274436f 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClient.java
@@ -239,7 +239,7 @@ public final UnaryCallable<ReplaceTaxonomyRequest, Taxonomy> replaceTaxonomyCall
    *     PolicyTagManagerSerializationClient.create()) {
    *   ImportTaxonomiesRequest request =
    *       ImportTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .build();
    *   ImportTaxonomiesResponse response =
    *       policyTagManagerSerializationClient.importTaxonomies(request);
@@ -271,7 +271,7 @@ public final ImportTaxonomiesResponse importTaxonomies(ImportTaxonomiesRequest r
    *     PolicyTagManagerSerializationClient.create()) {
    *   ImportTaxonomiesRequest request =
    *       ImportTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .build();
    *   ApiFuture<ImportTaxonomiesResponse> future =
    *       policyTagManagerSerializationClient.importTaxonomiesCallable().futureCall(request);
@@ -300,7 +300,7 @@ public final ImportTaxonomiesResponse importTaxonomies(ImportTaxonomiesRequest r
    *     PolicyTagManagerSerializationClient.create()) {
    *   ExportTaxonomiesRequest request =
    *       ExportTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .addAllTaxonomies(new ArrayList<String>())
    *           .build();
    *   ExportTaxonomiesResponse response =
@@ -330,7 +330,7 @@ public final ExportTaxonomiesResponse exportTaxonomies(ExportTaxonomiesRequest r
    *     PolicyTagManagerSerializationClient.create()) {
    *   ExportTaxonomiesRequest request =
    *       ExportTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .addAllTaxonomies(new ArrayList<String>())
    *           .build();
    *   ApiFuture<ExportTaxonomiesResponse> future =
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
index 049269cd..a7b928d2 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClient.java
@@ -393,7 +393,7 @@ public final EntryGroup createEntryGroup(
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString();
    *   String entryGroupId = "entryGroupId1228924712";
    *   EntryGroup entryGroup = EntryGroup.newBuilder().build();
    *   EntryGroup response = dataCatalogClient.createEntryGroup(parent, entryGroupId, entryGroup);
@@ -437,7 +437,7 @@ public final EntryGroup createEntryGroup(
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   CreateEntryGroupRequest request =
    *       CreateEntryGroupRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString())
    *           .setEntryGroupId("entryGroupId1228924712")
    *           .setEntryGroup(EntryGroup.newBuilder().build())
    *           .build();
@@ -466,7 +466,7 @@ public final EntryGroup createEntryGroup(CreateEntryGroupRequest request) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   CreateEntryGroupRequest request =
    *       CreateEntryGroupRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(EntryGroupName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]").toString())
    *           .setEntryGroupId("entryGroupId1228924712")
    *           .setEntryGroup(EntryGroup.newBuilder().build())
    *           .build();
@@ -1693,7 +1693,7 @@ public final TagTemplate createTagTemplate(
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]").toString();
    *   String tagTemplateId = "tagTemplateId-1438776721";
    *   TagTemplate tagTemplate = TagTemplate.newBuilder().build();
    *   TagTemplate response =
@@ -1736,7 +1736,7 @@ public final TagTemplate createTagTemplate(
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   CreateTagTemplateRequest request =
    *       CreateTagTemplateRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]").toString())
    *           .setTagTemplateId("tagTemplateId-1438776721")
    *           .setTagTemplate(TagTemplate.newBuilder().build())
    *           .build();
@@ -1764,7 +1764,7 @@ public final TagTemplate createTagTemplate(CreateTagTemplateRequest request) {
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   CreateTagTemplateRequest request =
    *       CreateTagTemplateRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TagTemplateName.of("[PROJECT]", "[LOCATION]", "[TAG_TEMPLATE]").toString())
    *           .setTagTemplateId("tagTemplateId-1438776721")
    *           .setTagTemplate(TagTemplate.newBuilder().build())
    *           .build();
@@ -3009,7 +3009,8 @@ public final void deleteTag(EntryName name) {
    *
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
-   *   String name = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
+   *   String name =
+   *       TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]").toString();
    *   dataCatalogClient.deleteTag(name);
    * }
    * }</pre>
@@ -3037,7 +3038,8 @@ public final void deleteTag(String name) {
    *   DeleteTagRequest request =
    *       DeleteTagRequest.newBuilder()
    *           .setName(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .build();
    *   dataCatalogClient.deleteTag(request);
    * }
@@ -3061,7 +3063,8 @@ public final void deleteTag(DeleteTagRequest request) {
    *   DeleteTagRequest request =
    *       DeleteTagRequest.newBuilder()
    *           .setName(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .build();
    *   ApiFuture<Empty> future = dataCatalogClient.deleteTagCallable().futureCall(request);
    *   // Do something.
@@ -3114,7 +3117,7 @@ public final ListTagsPagedResponse listTags(EntryName parent) {
    * <pre>{@code
    * try (DataCatalogClient dataCatalogClient = DataCatalogClient.create()) {
    *   String parent =
-   *       EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString();
+   *       TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]").toString();
    *   for (Tag element : dataCatalogClient.listTags(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -3148,7 +3151,8 @@ public final ListTagsPagedResponse listTags(String parent) {
    *   ListTagsRequest request =
    *       ListTagsRequest.newBuilder()
    *           .setParent(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -3176,7 +3180,8 @@ public final ListTagsPagedResponse listTags(ListTagsRequest request) {
    *   ListTagsRequest request =
    *       ListTagsRequest.newBuilder()
    *           .setParent(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -3203,7 +3208,8 @@ public final UnaryCallable<ListTagsRequest, ListTagsPagedResponse> listTagsPaged
    *   ListTagsRequest request =
    *       ListTagsRequest.newBuilder()
    *           .setParent(
-   *               EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+   *               TagName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]", "[TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
index 404ea595..4131823a 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClient.java
@@ -193,7 +193,7 @@ public final Taxonomy createTaxonomy(LocationName parent, Taxonomy taxonomy) {
    *
    * <pre>{@code
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
    *   Taxonomy taxonomy = Taxonomy.newBuilder().build();
    *   Taxonomy response = policyTagManagerClient.createTaxonomy(parent, taxonomy);
    * }
@@ -219,7 +219,7 @@ public final Taxonomy createTaxonomy(String parent, Taxonomy taxonomy) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   CreateTaxonomyRequest request =
    *       CreateTaxonomyRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setTaxonomy(Taxonomy.newBuilder().build())
    *           .build();
    *   Taxonomy response = policyTagManagerClient.createTaxonomy(request);
@@ -243,7 +243,7 @@ public final Taxonomy createTaxonomy(CreateTaxonomyRequest request) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   CreateTaxonomyRequest request =
    *       CreateTaxonomyRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setTaxonomy(Taxonomy.newBuilder().build())
    *           .build();
    *   ApiFuture<Taxonomy> future =
@@ -458,7 +458,7 @@ public final ListTaxonomiesPagedResponse listTaxonomies(LocationName parent) {
    *
    * <pre>{@code
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   String parent = LocationName.of("[PROJECT]", "[LOCATION]").toString();
+   *   String parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
    *   for (Taxonomy element : policyTagManagerClient.listTaxonomies(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -484,7 +484,7 @@ public final ListTaxonomiesPagedResponse listTaxonomies(String parent) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListTaxonomiesRequest request =
    *       ListTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -512,7 +512,7 @@ public final ListTaxonomiesPagedResponse listTaxonomies(ListTaxonomiesRequest re
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListTaxonomiesRequest request =
    *       ListTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -541,7 +541,7 @@ public final ListTaxonomiesPagedResponse listTaxonomies(ListTaxonomiesRequest re
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListTaxonomiesRequest request =
    *       ListTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -689,7 +689,8 @@ public final PolicyTag createPolicyTag(TaxonomyName parent, PolicyTag policyTag)
    *
    * <pre>{@code
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   String parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
+   *   String parent =
+   *       PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]").toString();
    *   PolicyTag policyTag = PolicyTag.newBuilder().build();
    *   PolicyTag response = policyTagManagerClient.createPolicyTag(parent, policyTag);
    * }
@@ -715,7 +716,9 @@ public final PolicyTag createPolicyTag(String parent, PolicyTag policyTag) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   CreatePolicyTagRequest request =
    *       CreatePolicyTagRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPolicyTag(PolicyTag.newBuilder().build())
    *           .build();
    *   PolicyTag response = policyTagManagerClient.createPolicyTag(request);
@@ -739,7 +742,9 @@ public final PolicyTag createPolicyTag(CreatePolicyTagRequest request) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   CreatePolicyTagRequest request =
    *       CreatePolicyTagRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPolicyTag(PolicyTag.newBuilder().build())
    *           .build();
    *   ApiFuture<PolicyTag> future =
@@ -955,7 +960,8 @@ public final ListPolicyTagsPagedResponse listPolicyTags(TaxonomyName parent) {
    *
    * <pre>{@code
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
-   *   String parent = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString();
+   *   String parent =
+   *       PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]").toString();
    *   for (PolicyTag element : policyTagManagerClient.listPolicyTags(parent).iterateAll()) {
    *     // doThingsWith(element);
    *   }
@@ -980,7 +986,9 @@ public final ListPolicyTagsPagedResponse listPolicyTags(String parent) {
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListPolicyTagsRequest request =
    *       ListPolicyTagsRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -1007,7 +1015,9 @@ public final ListPolicyTagsPagedResponse listPolicyTags(ListPolicyTagsRequest re
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListPolicyTagsRequest request =
    *       ListPolicyTagsRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
@@ -1035,7 +1045,9 @@ public final ListPolicyTagsPagedResponse listPolicyTags(ListPolicyTagsRequest re
    * try (PolicyTagManagerClient policyTagManagerClient = PolicyTagManagerClient.create()) {
    *   ListPolicyTagsRequest request =
    *       ListPolicyTagsRequest.newBuilder()
-   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
+   *           .setParent(
+   *               PolicyTagName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]", "[POLICY_TAG]")
+   *                   .toString())
    *           .setPageSize(883849137)
    *           .setPageToken("pageToken873572522")
    *           .build();
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClient.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClient.java
index 0c2aa59c..5cc4bbf2 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClient.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClient.java
@@ -38,7 +38,7 @@
  *     PolicyTagManagerSerializationClient.create()) {
  *   ImportTaxonomiesRequest request =
  *       ImportTaxonomiesRequest.newBuilder()
- *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+ *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
  *           .build();
  *   ImportTaxonomiesResponse response =
  *       policyTagManagerSerializationClient.importTaxonomies(request);
@@ -165,7 +165,7 @@ public PolicyTagManagerSerializationStub getStub() {
    *     PolicyTagManagerSerializationClient.create()) {
    *   ImportTaxonomiesRequest request =
    *       ImportTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .build();
    *   ImportTaxonomiesResponse response =
    *       policyTagManagerSerializationClient.importTaxonomies(request);
@@ -192,7 +192,7 @@ public final ImportTaxonomiesResponse importTaxonomies(ImportTaxonomiesRequest r
    *     PolicyTagManagerSerializationClient.create()) {
    *   ImportTaxonomiesRequest request =
    *       ImportTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .build();
    *   ApiFuture<ImportTaxonomiesResponse> future =
    *       policyTagManagerSerializationClient.importTaxonomiesCallable().futureCall(request);
@@ -220,7 +220,7 @@ public final ImportTaxonomiesResponse importTaxonomies(ImportTaxonomiesRequest r
    *     PolicyTagManagerSerializationClient.create()) {
    *   ExportTaxonomiesRequest request =
    *       ExportTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .addAllTaxonomies(new ArrayList<String>())
    *           .build();
    *   ExportTaxonomiesResponse response =
@@ -249,7 +249,7 @@ public final ExportTaxonomiesResponse exportTaxonomies(ExportTaxonomiesRequest r
    *     PolicyTagManagerSerializationClient.create()) {
    *   ExportTaxonomiesRequest request =
    *       ExportTaxonomiesRequest.newBuilder()
-   *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+   *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
    *           .addAllTaxonomies(new ArrayList<String>())
    *           .build();
    *   ApiFuture<ExportTaxonomiesResponse> future =
diff --git a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/package-info.java b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/package-info.java
index c1d42e36..3ff2548a 100644
--- a/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/package-info.java
+++ b/google-cloud-datacatalog/src/main/java/com/google/cloud/datacatalog/v1beta1/package-info.java
@@ -60,7 +60,7 @@
  *     PolicyTagManagerSerializationClient.create()) {
  *   ImportTaxonomiesRequest request =
  *       ImportTaxonomiesRequest.newBuilder()
- *           .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+ *           .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
  *           .build();
  *   ImportTaxonomiesResponse response =
  *       policyTagManagerSerializationClient.importTaxonomies(request);
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/DataCatalogClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/DataCatalogClientTest.java
index 28d5735d..e822b804 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/DataCatalogClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/DataCatalogClientTest.java
@@ -2433,7 +2433,7 @@ public void setIamPolicyTest() throws Exception {
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
     Policy policy = Policy.newBuilder().build();
 
     Policy actualResponse = client.setIamPolicy(resource, policy);
@@ -2457,7 +2457,7 @@ public void setIamPolicyExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
       Policy policy = Policy.newBuilder().build();
       client.setIamPolicy(resource, policy);
       Assert.fail("No exception raised");
@@ -2519,7 +2519,7 @@ public void getIamPolicyTest() throws Exception {
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
 
     Policy actualResponse = client.getIamPolicy(resource);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -2541,7 +2541,7 @@ public void getIamPolicyExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
       client.getIamPolicy(resource);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
@@ -2597,8 +2597,7 @@ public void testIamPermissionsTest() throws Exception {
 
     TestIamPermissionsRequest request =
         TestIamPermissionsRequest.newBuilder()
-            .setResource(
-                EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+            .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .addAllPermissions(new ArrayList<String>())
             .build();
 
@@ -2625,8 +2624,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
     try {
       TestIamPermissionsRequest request =
           TestIamPermissionsRequest.newBuilder()
-              .setResource(
-                  EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+              .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .addAllPermissions(new ArrayList<String>())
               .build();
       client.testIamPermissions(request);
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClientTest.java
index 02d9f82b..9ef92347 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/PolicyTagManagerClientTest.java
@@ -862,8 +862,7 @@ public void getIamPolicyTest() throws Exception {
 
     GetIamPolicyRequest request =
         GetIamPolicyRequest.newBuilder()
-            .setResource(
-                EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+            .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .setOptions(GetPolicyOptions.newBuilder().build())
             .build();
 
@@ -890,8 +889,7 @@ public void getIamPolicyExceptionTest() throws Exception {
     try {
       GetIamPolicyRequest request =
           GetIamPolicyRequest.newBuilder()
-              .setResource(
-                  EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+              .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .setOptions(GetPolicyOptions.newBuilder().build())
               .build();
       client.getIamPolicy(request);
@@ -913,8 +911,7 @@ public void setIamPolicyTest() throws Exception {
 
     SetIamPolicyRequest request =
         SetIamPolicyRequest.newBuilder()
-            .setResource(
-                EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+            .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .setPolicy(Policy.newBuilder().build())
             .build();
 
@@ -941,8 +938,7 @@ public void setIamPolicyExceptionTest() throws Exception {
     try {
       SetIamPolicyRequest request =
           SetIamPolicyRequest.newBuilder()
-              .setResource(
-                  EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+              .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .setPolicy(Policy.newBuilder().build())
               .build();
       client.setIamPolicy(request);
@@ -960,8 +956,7 @@ public void testIamPermissionsTest() throws Exception {
 
     TestIamPermissionsRequest request =
         TestIamPermissionsRequest.newBuilder()
-            .setResource(
-                EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+            .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .addAllPermissions(new ArrayList<String>())
             .build();
 
@@ -988,8 +983,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
     try {
       TestIamPermissionsRequest request =
           TestIamPermissionsRequest.newBuilder()
-              .setResource(
-                  EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+              .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .addAllPermissions(new ArrayList<String>())
               .build();
       client.testIamPermissions(request);
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClientTest.java
index 6535a1c5..e3cad102 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationClientTest.java
@@ -137,7 +137,7 @@ public void importTaxonomiesTest() throws Exception {
 
     ImportTaxonomiesRequest request =
         ImportTaxonomiesRequest.newBuilder()
-            .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+            .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .build();
 
     ImportTaxonomiesResponse actualResponse = client.importTaxonomies(request);
@@ -164,7 +164,7 @@ public void importTaxonomiesExceptionTest() throws Exception {
     try {
       ImportTaxonomiesRequest request =
           ImportTaxonomiesRequest.newBuilder()
-              .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+              .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .build();
       client.importTaxonomies(request);
       Assert.fail("No exception raised");
@@ -183,7 +183,7 @@ public void exportTaxonomiesTest() throws Exception {
 
     ExportTaxonomiesRequest request =
         ExportTaxonomiesRequest.newBuilder()
-            .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+            .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .addAllTaxonomies(new ArrayList<String>())
             .build();
 
@@ -211,7 +211,7 @@ public void exportTaxonomiesExceptionTest() throws Exception {
     try {
       ExportTaxonomiesRequest request =
           ExportTaxonomiesRequest.newBuilder()
-              .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+              .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .addAllTaxonomies(new ArrayList<String>())
               .build();
       client.exportTaxonomies(request);
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClientTest.java
index 9f98c773..44c813ae 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/DataCatalogClientTest.java
@@ -2278,7 +2278,7 @@ public void setIamPolicyTest() throws Exception {
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
     Policy policy = Policy.newBuilder().build();
 
     Policy actualResponse = client.setIamPolicy(resource, policy);
@@ -2302,7 +2302,7 @@ public void setIamPolicyExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
       Policy policy = Policy.newBuilder().build();
       client.setIamPolicy(resource, policy);
       Assert.fail("No exception raised");
@@ -2364,7 +2364,7 @@ public void getIamPolicyTest() throws Exception {
             .build();
     mockDataCatalog.addResponse(expectedResponse);
 
-    ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+    ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
 
     Policy actualResponse = client.getIamPolicy(resource);
     Assert.assertEquals(expectedResponse, actualResponse);
@@ -2386,7 +2386,7 @@ public void getIamPolicyExceptionTest() throws Exception {
     mockDataCatalog.addException(exception);
 
     try {
-      ResourceName resource = EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]");
+      ResourceName resource = TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]");
       client.getIamPolicy(resource);
       Assert.fail("No exception raised");
     } catch (InvalidArgumentException e) {
@@ -2442,8 +2442,7 @@ public void testIamPermissionsTest() throws Exception {
 
     TestIamPermissionsRequest request =
         TestIamPermissionsRequest.newBuilder()
-            .setResource(
-                EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+            .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .addAllPermissions(new ArrayList<String>())
             .build();
 
@@ -2470,8 +2469,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
     try {
       TestIamPermissionsRequest request =
           TestIamPermissionsRequest.newBuilder()
-              .setResource(
-                  EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+              .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .addAllPermissions(new ArrayList<String>())
               .build();
       client.testIamPermissions(request);
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClientTest.java
index ff757ad6..6d3a6e72 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerClientTest.java
@@ -852,8 +852,7 @@ public void getIamPolicyTest() throws Exception {
 
     GetIamPolicyRequest request =
         GetIamPolicyRequest.newBuilder()
-            .setResource(
-                EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+            .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .setOptions(GetPolicyOptions.newBuilder().build())
             .build();
 
@@ -880,8 +879,7 @@ public void getIamPolicyExceptionTest() throws Exception {
     try {
       GetIamPolicyRequest request =
           GetIamPolicyRequest.newBuilder()
-              .setResource(
-                  EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+              .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .setOptions(GetPolicyOptions.newBuilder().build())
               .build();
       client.getIamPolicy(request);
@@ -903,8 +901,7 @@ public void setIamPolicyTest() throws Exception {
 
     SetIamPolicyRequest request =
         SetIamPolicyRequest.newBuilder()
-            .setResource(
-                EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+            .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .setPolicy(Policy.newBuilder().build())
             .build();
 
@@ -931,8 +928,7 @@ public void setIamPolicyExceptionTest() throws Exception {
     try {
       SetIamPolicyRequest request =
           SetIamPolicyRequest.newBuilder()
-              .setResource(
-                  EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+              .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .setPolicy(Policy.newBuilder().build())
               .build();
       client.setIamPolicy(request);
@@ -950,8 +946,7 @@ public void testIamPermissionsTest() throws Exception {
 
     TestIamPermissionsRequest request =
         TestIamPermissionsRequest.newBuilder()
-            .setResource(
-                EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+            .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .addAllPermissions(new ArrayList<String>())
             .build();
 
@@ -978,8 +973,7 @@ public void testIamPermissionsExceptionTest() throws Exception {
     try {
       TestIamPermissionsRequest request =
           TestIamPermissionsRequest.newBuilder()
-              .setResource(
-                  EntryName.of("[PROJECT]", "[LOCATION]", "[ENTRY_GROUP]", "[ENTRY]").toString())
+              .setResource(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .addAllPermissions(new ArrayList<String>())
               .build();
       client.testIamPermissions(request);
diff --git a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClientTest.java b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClientTest.java
index 7994c7ab..94ab57c0 100644
--- a/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClientTest.java
+++ b/google-cloud-datacatalog/src/test/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationClientTest.java
@@ -85,7 +85,7 @@ public void importTaxonomiesTest() throws Exception {
 
     ImportTaxonomiesRequest request =
         ImportTaxonomiesRequest.newBuilder()
-            .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+            .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .build();
 
     ImportTaxonomiesResponse actualResponse = client.importTaxonomies(request);
@@ -111,7 +111,7 @@ public void importTaxonomiesExceptionTest() throws Exception {
     try {
       ImportTaxonomiesRequest request =
           ImportTaxonomiesRequest.newBuilder()
-              .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+              .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .build();
       client.importTaxonomies(request);
       Assert.fail("No exception raised");
@@ -130,7 +130,7 @@ public void exportTaxonomiesTest() throws Exception {
 
     ExportTaxonomiesRequest request =
         ExportTaxonomiesRequest.newBuilder()
-            .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+            .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
             .addAllTaxonomies(new ArrayList<String>())
             .build();
 
@@ -158,7 +158,7 @@ public void exportTaxonomiesExceptionTest() throws Exception {
     try {
       ExportTaxonomiesRequest request =
           ExportTaxonomiesRequest.newBuilder()
-              .setParent(LocationName.of("[PROJECT]", "[LOCATION]").toString())
+              .setParent(TaxonomyName.of("[PROJECT]", "[LOCATION]", "[TAXONOMY]").toString())
               .addAllTaxonomies(new ArrayList<String>())
               .build();
       client.exportTaxonomies(request);
diff --git a/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogGrpc.java b/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogGrpc.java
index a85e39a3..043ea11b 100644
--- a/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogGrpc.java
+++ b/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/DataCatalogGrpc.java
@@ -28,7 +28,6 @@
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/cloud/datacatalog/v1/datacatalog.proto")
-@io.grpc.stub.annotations.GrpcGenerated
 public final class DataCatalogGrpc {
 
   private DataCatalogGrpc() {}
diff --git a/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerGrpc.java b/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerGrpc.java
index ca0bd99f..84f84e9c 100644
--- a/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerGrpc.java
+++ b/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerGrpc.java
@@ -31,7 +31,6 @@
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/cloud/datacatalog/v1/policytagmanager.proto")
-@io.grpc.stub.annotations.GrpcGenerated
 public final class PolicyTagManagerGrpc {
 
   private PolicyTagManagerGrpc() {}
diff --git a/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationGrpc.java b/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationGrpc.java
index 34a64b7a..736db04a 100644
--- a/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationGrpc.java
+++ b/grpc-google-cloud-datacatalog-v1/src/main/java/com/google/cloud/datacatalog/v1/PolicyTagManagerSerializationGrpc.java
@@ -29,7 +29,6 @@
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/cloud/datacatalog/v1/policytagmanagerserialization.proto")
-@io.grpc.stub.annotations.GrpcGenerated
 public final class PolicyTagManagerSerializationGrpc {
 
   private PolicyTagManagerSerializationGrpc() {}
diff --git a/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogGrpc.java b/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogGrpc.java
index c52edd60..04c2e3bc 100644
--- a/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogGrpc.java
+++ b/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/DataCatalogGrpc.java
@@ -28,7 +28,6 @@
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/cloud/datacatalog/v1beta1/datacatalog.proto")
-@io.grpc.stub.annotations.GrpcGenerated
 public final class DataCatalogGrpc {
 
   private DataCatalogGrpc() {}
diff --git a/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerGrpc.java b/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerGrpc.java
index 2eb2f526..cfc4d133 100644
--- a/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerGrpc.java
+++ b/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerGrpc.java
@@ -28,7 +28,6 @@
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/cloud/datacatalog/v1beta1/policytagmanager.proto")
-@io.grpc.stub.annotations.GrpcGenerated
 public final class PolicyTagManagerGrpc {
 
   private PolicyTagManagerGrpc() {}
diff --git a/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationGrpc.java b/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationGrpc.java
index d6d1ba0d..52db710d 100644
--- a/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationGrpc.java
+++ b/grpc-google-cloud-datacatalog-v1beta1/src/main/java/com/google/cloud/datacatalog/v1beta1/PolicyTagManagerSerializationGrpc.java
@@ -28,7 +28,6 @@
 @javax.annotation.Generated(
     value = "by gRPC proto compiler",
     comments = "Source: google/cloud/datacatalog/v1beta1/policytagmanagerserialization.proto")
-@io.grpc.stub.annotations.GrpcGenerated
 public final class PolicyTagManagerSerializationGrpc {
 
   private PolicyTagManagerSerializationGrpc() {}