diff --git a/.doc_gen/metadata/entityresolution_metadata.yaml b/.doc_gen/metadata/entityresolution_metadata.yaml
index a992fe8359e..141cd4427b5 100644
--- a/.doc_gen/metadata/entityresolution_metadata.yaml
+++ b/.doc_gen/metadata/entityresolution_metadata.yaml
@@ -21,7 +21,7 @@ entityresolution_Hello:
               snippet_tags:
                 - javascript.v3.entity-resolution.hello
   services:
-    entityresolution: {listMatchingWorkflows}
+    entityresolution: {ListMatchingWorkflows}
 entityresolution_DeleteSchemaMapping:
   languages:
     Java:
@@ -42,7 +42,7 @@ entityresolution_DeleteSchemaMapping:
                 - entity-resolution.JavaScriptv3.delete.schema-mapping
   services:
     entityresolution: {DeleteSchemaMapping}
-entityresolution_TagEntityResource:
+entityresolution_TagResource:
   languages:
     Java:
       versions:
@@ -61,7 +61,7 @@ entityresolution_TagEntityResource:
               snippet_tags:
                 - entity-resolution.JavaScriptv3.tag.entity-resource
   services:
-    entityresolution: {TagEntityResource}
+    entityresolution: {TagResource}
 entityresolution_CreateMatchingWorkflow:
   languages:
     Java:
@@ -82,26 +82,6 @@ entityresolution_CreateMatchingWorkflow:
                 - entity-resolution.JavaScriptv3.create-matching-workflow
   services:
     entityresolution: {CreateMatchingWorkflow}
-entityresolution_CheckWorkflowStatus:
-  languages:
-    Java:
-      versions:
-        - sdk_version: 2
-          github: javav2/example_code/entityresolution
-          excerpts:
-            - description:
-              snippet_tags:
-                - entityres.java2_check_matching_workflow.main
-    JavaScript:
-      versions:
-        - sdk_version: 3
-          github: javascriptv3/example_code/entityresolution
-          excerpts:
-            - description:
-              snippet_tags:
-                - entity-resolution.JavaScriptv3.check-workflow-status
-  services:
-    entityresolution: {CheckWorkflowStatus}
 entityresolution_StartMatchingJob:
   languages:
     Java:
diff --git a/.doc_gen/metadata/location_metadata.yaml b/.doc_gen/metadata/location_metadata.yaml
index 8185fa9d04f..f87c5430df0 100644
--- a/.doc_gen/metadata/location_metadata.yaml
+++ b/.doc_gen/metadata/location_metadata.yaml
@@ -33,7 +33,7 @@ location_Hello:
               snippet_tags:
                 - javascript.v3.location.hello
   services:
-    location: {ListGeofencesPaginator}
+    location: {ListGeofences, ListGeofenceCollections}
 location_CreateMap:
   languages:
     Kotlin:
diff --git a/javascriptv3/example_code/entityresolution/README.md b/javascriptv3/example_code/entityresolution/README.md
index 891d420c4b3..a7071382bcf 100644
--- a/javascriptv3/example_code/entityresolution/README.md
+++ b/javascriptv3/example_code/entityresolution/README.md
@@ -31,14 +31,13 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javas
 
 ### Get started
 
-- [Hello AWS Entity Resolution](hello.js#L4) (`listMatchingWorkflows`)
+- [Hello AWS Entity Resolution](hello.js#L4) (`ListMatchingWorkflows`)
 
 
 ### Single actions
 
 Code excerpts that show you how to call individual service functions.
 
-- [CheckWorkflowStatus](actions/check-workflow-status.js#L4)
 - [CreateMatchingWorkflow](actions/create-matching-workflow.js#L4)
 - [CreateSchemaMapping](actions/create-schema-mapping.js#L4)
 - [DeleteMatchingWorkflow](actions/delete-matching-workflow.js#L4)
@@ -47,7 +46,7 @@ Code excerpts that show you how to call individual service functions.
 - [GetSchemaMapping](actions/get-schema-mapping.js#L4)
 - [ListSchemaMappings](actions/list-schema-mappings.js#L4)
 - [StartMatchingJob](actions/start-matching-job.js#L4)
-- [TagEntityResource](actions/tag-entity-resource.js#L4)
+- [TagResource](actions/tag-entity-resource.js#L4)
 
 
 <!--custom.examples.start-->
diff --git a/javascriptv3/example_code/location/README.md b/javascriptv3/example_code/location/README.md
index 3e8886e1c14..9b4661cc455 100644
--- a/javascriptv3/example_code/location/README.md
+++ b/javascriptv3/example_code/location/README.md
@@ -31,7 +31,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javas
 
 ### Get started
 
-- [Hello Amazon Location](hello.js#L4) (`ListGeofencesPaginator`)
+- [Hello Amazon Location](hello.js#L4) (`ListGeofenceCollections`)
 
 
 ### Basics
diff --git a/javav2/example_code/entityresolution/README.md b/javav2/example_code/entityresolution/README.md
index 70ff18acb90..4e352c7f6e0 100644
--- a/javav2/example_code/entityresolution/README.md
+++ b/javav2/example_code/entityresolution/README.md
@@ -31,7 +31,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javav
 
 ### Get started
 
-- [Hello AWS Entity Resolution](src/main/java/com/example/entity/HelloEntityResoultion.java#L19) (`listMatchingWorkflows`)
+- [Hello AWS Entity Resolution](src/main/java/com/example/entity/HelloEntityResoultion.java#L19) (`ListMatchingWorkflows`)
 
 
 ### Basics
@@ -45,7 +45,6 @@ Code examples that show you how to perform the essential operations within a ser
 
 Code excerpts that show you how to call individual service functions.
 
-- [CheckWorkflowStatus](src/main/java/com/example/entity/scenario/EntityResActions.java#L391)
 - [CreateMatchingWorkflow](src/main/java/com/example/entity/scenario/EntityResActions.java#L429)
 - [CreateSchemaMapping](src/main/java/com/example/entity/scenario/EntityResActions.java#L230)
 - [DeleteMatchingWorkflow](src/main/java/com/example/entity/scenario/EntityResActions.java#L196)
@@ -54,7 +53,7 @@ Code excerpts that show you how to call individual service functions.
 - [GetSchemaMapping](src/main/java/com/example/entity/scenario/EntityResActions.java#L280)
 - [ListSchemaMappings](src/main/java/com/example/entity/scenario/EntityResActions.java#L173)
 - [StartMatchingJob](src/main/java/com/example/entity/scenario/EntityResActions.java#L354)
-- [TagEntityResource](src/main/java/com/example/entity/scenario/EntityResActions.java#L516)
+- [TagResource](src/main/java/com/example/entity/scenario/EntityResActions.java#L516)
 
 
 <!--custom.examples.start-->
diff --git a/javav2/example_code/location/README.md b/javav2/example_code/location/README.md
index 25861abec23..15a2a647c5c 100644
--- a/javav2/example_code/location/README.md
+++ b/javav2/example_code/location/README.md
@@ -31,7 +31,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javav
 
 ### Get started
 
-- [Hello Amazon Location](src/main/java/com/example/location/HelloLocation.java#L18) (`ListGeofencesPaginator`)
+- [Hello Amazon Location](src/main/java/com/example/location/HelloLocation.java#L18) (`ListGeofenceCollections`)
 
 
 ### Basics
diff --git a/kotlin/services/location/README.md b/kotlin/services/location/README.md
index ce8de6da3f5..7435b58436e 100644
--- a/kotlin/services/location/README.md
+++ b/kotlin/services/location/README.md
@@ -31,7 +31,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `kotli
 
 ### Get started
 
-- [Hello Amazon Location](src/main/java/location/HelloLocation.kt#L10) (`ListGeofencesPaginator`)
+- [Hello Amazon Location](src/main/java/location/HelloLocation.kt#L10) (`ListGeofenceCollections`)
 
 
 ### Basics