diff --git a/.tools/readmes/scanner.py b/.tools/readmes/scanner.py
index 9582264be85..15acfae553a 100644
--- a/.tools/readmes/scanner.py
+++ b/.tools/readmes/scanner.py
@@ -142,13 +142,11 @@ def snippet(self, example: Example, readme_folder, api_name: str):
             excerpt = first(ex_ver.excerpts)
             if excerpt is not None:
                 if excerpt.snippet_tags:
-                    tags = excerpt.snippet_tags
-                    tags = [*filter(lambda t: api_name in t, tags)]
-
-                    # tags = [*sorted(tags)] # TODO: Switch to this form so that READMEs are always consistent
-                    tags = [*reversed(tags)]
-
-                    tag = first(tags) or excerpt.snippet_tags[0]
+                    # This form ensures that READMEs are always consistent,
+                    # but does not always give the "best" README link.
+                    tags = [*sorted(excerpt.snippet_tags)]
+                    filtered = filter(lambda t: api_name in t, tags)
+                    tag = first(filtered) or tags[0]
                 elif excerpt.snippet_files:
                     # TODO: Find the best (or all?) snippet files, not the first.
                     full_path = first(excerpt.snippet_files)
diff --git a/aws-cli/bash-linux/s3/README.md b/aws-cli/bash-linux/s3/README.md
index ca72b1617f3..cd4f6200ace 100644
--- a/aws-cli/bash-linux/s3/README.md
+++ b/aws-cli/bash-linux/s3/README.md
@@ -47,7 +47,7 @@ Code excerpts that show you how to call individual service functions.
 - [DeleteObjects](bucket-lifecycle-operations/bucket_operations.sh#L303)
 - [GetObject](bucket-lifecycle-operations/bucket_operations.sh#L168)
 - [HeadBucket](bucket-lifecycle-operations/bucket_operations.sh#L20)
-- [ListObjectsV2](bucket-lifecycle-operations/awsdocs_general.sh#L94)
+- [ListObjectsV2](bucket-lifecycle-operations/bucket_operations.sh#L236)
 - [PutObject](bucket-lifecycle-operations/bucket_operations.sh#L134)
 
 
diff --git a/cpp/example_code/aurora/README.md b/cpp/example_code/aurora/README.md
index 6d2db9bd804..f3bda6c878d 100644
--- a/cpp/example_code/aurora/README.md
+++ b/cpp/example_code/aurora/README.md
@@ -60,7 +60,7 @@ Code excerpts that show you how to call individual service functions.
 - [DeleteDBCluster](getting_started_with_db_clusters.cpp#L1047)
 - [DeleteDBClusterParameterGroup](getting_started_with_db_clusters.cpp#L1117)
 - [DeleteDBInstance](getting_started_with_db_clusters.cpp#L1017)
-- [DescribeDBClusterParameterGroups](getting_started_with_db_clusters.cpp#L295)
+- [DescribeDBClusterParameterGroups](getting_started_with_db_clusters.cpp#L276)
 - [DescribeDBClusterParameters](getting_started_with_db_clusters.cpp#L786)
 - [DescribeDBClusterSnapshots](getting_started_with_db_clusters.cpp#L701)
 - [DescribeDBClusters](getting_started_with_db_clusters.cpp#L746)
diff --git a/cpp/example_code/dynamodb/README.md b/cpp/example_code/dynamodb/README.md
index 0061f3c5180..fd3af6b6758 100644
--- a/cpp/example_code/dynamodb/README.md
+++ b/cpp/example_code/dynamodb/README.md
@@ -46,7 +46,7 @@ Next, for information on code example structures and how to build and run the ex
 
 Code examples that show you how to perform the essential operations within a service.
 
-- [Learn the basics](dynamodb_utils.cpp)
+- [Learn the basics](dynamodb_getting_started_scenario.cpp)
 
 
 ### Single actions
@@ -74,8 +74,8 @@ Code examples that show you how to accomplish a specific task by calling multipl
 functions within the same service.
 
 - [Create a serverless application to manage photos](../../example_code/cross-service/photo_asset_manager)
-- [Query a table by using batches of PartiQL statements](dynamodb_utils.cpp)
-- [Query a table using PartiQL](dynamodb_utils.cpp)
+- [Query a table by using batches of PartiQL statements](dynamodb_partiql_batch_scenario.cpp)
+- [Query a table using PartiQL](dynamodb_partiql_single_scenario.cpp)
 
 
 <!--custom.examples.start-->
diff --git a/cpp/example_code/ec2/README.md b/cpp/example_code/ec2/README.md
index ca7d4b97265..741e9ec5070 100644
--- a/cpp/example_code/ec2/README.md
+++ b/cpp/example_code/ec2/README.md
@@ -46,7 +46,7 @@ Next, for information on code example structures and how to build and run the ex
 
 Code excerpts that show you how to call individual service functions.
 
-- [AllocateAddress](allocate_address.cpp#L73)
+- [AllocateAddress](allocate_address.cpp#L23)
 - [AssociateAddress](associate_address.cpp#L20)
 - [AuthorizeSecurityGroupIngress](authorize_security_group_ingress.cpp#L26)
 - [CreateKeyPair](create_key_pair.cpp#L23)
diff --git a/cpp/example_code/iam/README.md b/cpp/example_code/iam/README.md
index 83a05fa73ee..db97f8b6208 100644
--- a/cpp/example_code/iam/README.md
+++ b/cpp/example_code/iam/README.md
@@ -49,7 +49,7 @@ Code excerpts that show you how to call individual service functions.
 - [AttachRolePolicy](attach_role_policy.cpp#L38)
 - [CreateAccessKey](create_access_key.cpp#L35)
 - [CreateAccountAlias](create_account_alias.cpp#L35)
-- [CreatePolicy](create_policy.cpp#L43)
+- [CreatePolicy](create_policy.cpp#L69)
 - [CreateRole](create_role.cpp#L35)
 - [CreateUser](create_user.cpp#L40)
 - [DeleteAccessKey](delete_access_key.cpp#L35)
diff --git a/cpp/example_code/rds/README.md b/cpp/example_code/rds/README.md
index fc6cf93a9d6..ec2077599e7 100644
--- a/cpp/example_code/rds/README.md
+++ b/cpp/example_code/rds/README.md
@@ -60,7 +60,7 @@ Code excerpts that show you how to call individual service functions.
 - [DeleteDBParameterGroup](getting_started_with_db_instances.cpp#L927)
 - [DescribeDBEngineVersions](getting_started_with_db_instances.cpp#L698)
 - [DescribeDBInstances](getting_started_with_db_instances.cpp#L752)
-- [DescribeDBParameterGroups](getting_started_with_db_instances.cpp#L275)
+- [DescribeDBParameterGroups](getting_started_with_db_instances.cpp#L256)
 - [DescribeDBParameters](getting_started_with_db_instances.cpp#L639)
 - [DescribeDBSnapshots](getting_started_with_db_instances.cpp#L597)
 - [DescribeOrderableDBInstanceOptions](getting_started_with_db_instances.cpp#L792)
diff --git a/cpp/example_code/s3/README.md b/cpp/example_code/s3/README.md
index 32a888890de..35cd8431fb9 100644
--- a/cpp/example_code/s3/README.md
+++ b/cpp/example_code/s3/README.md
@@ -72,7 +72,7 @@ Code excerpts that show you how to call individual service functions.
 - [ListBuckets](list_buckets.cpp#L29)
 - [ListObjectsV2](list_objects.cpp#L32)
 - [PutBucketAcl](put_bucket_acl.cpp#L47)
-- [PutBucketPolicy](put_bucket_policy.cpp#L37)
+- [PutBucketPolicy](put_bucket_policy.cpp#L68)
 - [PutBucketWebsite](put_website_config.cpp#L33)
 - [PutObject](put_object.cpp#L33)
 - [PutObjectAcl](get_put_object_acl.cpp#L165)
diff --git a/cpp/example_code/sqs/README.md b/cpp/example_code/sqs/README.md
index 0d080977f16..f9c1c28833a 100644
--- a/cpp/example_code/sqs/README.md
+++ b/cpp/example_code/sqs/README.md
@@ -51,7 +51,7 @@ Code excerpts that show you how to call individual service functions.
 - [DeleteMessage](delete_message.cpp#L23)
 - [DeleteMessageBatch](../cross-service/topics_and_queues/messaging_with_topics_and_queues.cpp#L644)
 - [DeleteQueue](delete_queue.cpp#L24)
-- [GetQueueAttributes](../cross-service/topics_and_queues/messaging_with_topics_and_queues.cpp#L380)
+- [GetQueueAttributes](../cross-service/topics_and_queues/messaging_with_topics_and_queues.cpp#L332)
 - [GetQueueUrl](get_queue_url.cpp#L23)
 - [ListQueues](list_queues.cpp#L23)
 - [ReceiveMessage](receive_message.cpp#L23)
diff --git a/dotnetv3/AutoScaling/README.md b/dotnetv3/AutoScaling/README.md
index 30405c8e714..0c121f8c537 100644
--- a/dotnetv3/AutoScaling/README.md
+++ b/dotnetv3/AutoScaling/README.md
@@ -38,7 +38,7 @@ For prerequisites, see the [README](../README.md#Prerequisites) in the `dotnetv3
 
 Code examples that show you how to perform the essential operations within a service.
 
-- [Learn the basics](Scenarios/AutoScalingBasics/UIWrapper.cs)
+- [Learn the basics](Scenarios/AutoScalingBasics/AutoScalingBasics.cs)
 
 
 ### Single actions
diff --git a/dotnetv3/IAM/README.md b/dotnetv3/IAM/README.md
index eef53330cdc..e127941c999 100644
--- a/dotnetv3/IAM/README.md
+++ b/dotnetv3/IAM/README.md
@@ -78,8 +78,8 @@ Code examples that show you how to accomplish a specific task by calling multipl
 functions within the same service.
 
 - [Build and manage a resilient service](../cross-service/ResilientService/ResilientServiceWorkflow/ResilientServiceWorkflow.cs)
-- [Create a group and add a user](Scenarios/IamScenariosCommon/UIWrapper.cs)
-- [Create a user and assume a role](Scenarios/IamScenariosCommon/UIWrapper.cs)
+- [Create a group and add a user](Scenarios/IamScenariosCommon/S3Wrapper.cs)
+- [Create a user and assume a role](Scenarios/IAMBasics/IAMBasics.cs)
 
 
 <!--custom.examples.start-->
diff --git a/dotnetv3/Keyspaces/README.md b/dotnetv3/Keyspaces/README.md
index 67fac9271b1..caa42fe12b5 100644
--- a/dotnetv3/Keyspaces/README.md
+++ b/dotnetv3/Keyspaces/README.md
@@ -38,7 +38,7 @@ For prerequisites, see the [README](../README.md#Prerequisites) in the `dotnetv3
 
 Code examples that show you how to perform the essential operations within a service.
 
-- [Learn the basics](Scenarios/KeyspacesBasics.cs)
+- [Learn the basics](Scenarios/Usings.cs)
 
 
 ### Single actions
diff --git a/dotnetv3/S3/README.md b/dotnetv3/S3/README.md
index bdfff1ac68c..626d9bc5018 100644
--- a/dotnetv3/S3/README.md
+++ b/dotnetv3/S3/README.md
@@ -89,7 +89,7 @@ functions within the same service.
 - [Manage access control lists (ACLs)](ManageACLsExample/ManageACLs.cs)
 - [Perform a multipart copy](MPUapiCopyObjExample/MPUapiCopyObj.cs)
 - [Transform data with S3 Object Lambda](../cross-service/S3ObjectLambdaFunction)
-- [Upload or download large files](scenarios/TransferUtilityBasics/TransferUtilityBasics/TransferBasics.cs)
+- [Upload or download large files](scenarios/TransferUtilityBasics/TransferUtilityBasics/GlobalUsings.cs)
 
 
 <!--custom.examples.start-->
diff --git a/dotnetv3/StepFunctions/README.md b/dotnetv3/StepFunctions/README.md
index 6f6af46e259..148cf31477c 100644
--- a/dotnetv3/StepFunctions/README.md
+++ b/dotnetv3/StepFunctions/README.md
@@ -38,7 +38,7 @@ For prerequisites, see the [README](../README.md#Prerequisites) in the `dotnetv3
 
 Code examples that show you how to perform the essential operations within a service.
 
-- [Learn the basics](Scenarios/UIMethods.cs)
+- [Learn the basics](Scenarios/StepFunctionsBasics.cs)
 
 
 ### Single actions
diff --git a/dotnetv3/dynamodb/README.md b/dotnetv3/dynamodb/README.md
index dee06e0441e..407ad563340 100644
--- a/dotnetv3/dynamodb/README.md
+++ b/dotnetv3/dynamodb/README.md
@@ -67,7 +67,7 @@ functions within the same service.
 
 - [Create a serverless application to manage photos](../cross-service/PhotoAssetManager)
 - [Create a web application to track DynamoDB data](../cross-service/DynamoDbItemTracker)
-- [Query a table by using batches of PartiQL statements](scenarios/PartiQL_Batch_Scenario/PartiQL_Batch_Scenario/PartiQLBatchMethods.cs)
+- [Query a table by using batches of PartiQL statements](scenarios/PartiQL_Batch_Scenario/PartiQL_Batch_Scenario/PartiQLBatch.cs)
 - [Query a table using PartiQL](scenarios/PartiQL_Basics_Scenario/PartiQL_Basics_Scenario/PartiQLMethods.cs)
 - [Use a document model](mid-level-api/MidlevelItemCRUDExample/MidlevelItemCRUDExample/MidlevelItemCRUD.cs)
 - [Use a high-level object persistence model](high-level-api/HighLevelItemCRUDExample/HighLevelItemCRUDExample/HighLevelItemCRUD.cs)
diff --git a/gov2/s3/README.md b/gov2/s3/README.md
index eb066a590b2..b544b08ae56 100644
--- a/gov2/s3/README.md
+++ b/gov2/s3/README.md
@@ -60,7 +60,7 @@ Code excerpts that show you how to call individual service functions.
 - [ListObjectsV2](actions/bucket_basics.go#L238)
 - [PutObject](actions/bucket_basics.go#L100)
 - [PutObjectLegalHold](../workflows/s3_object_lock/actions/s3_actions.go#L173)
-- [PutObjectLockConfiguration](../workflows/s3_object_lock/actions/s3_actions.go#L22)
+- [PutObjectLockConfiguration](../workflows/s3_object_lock/actions/s3_actions.go#L234)
 - [PutObjectRetention](../workflows/s3_object_lock/actions/s3_actions.go#L276)
 
 ### Scenarios
diff --git a/javascriptv3/example_code/cognito-identity-provider/README.md b/javascriptv3/example_code/cognito-identity-provider/README.md
index b286b11b86d..009ef4b4d54 100644
--- a/javascriptv3/example_code/cognito-identity-provider/README.md
+++ b/javascriptv3/example_code/cognito-identity-provider/README.md
@@ -56,7 +56,7 @@ Code excerpts that show you how to call individual service functions.
 Code examples that show you how to accomplish a specific task by calling multiple
 functions within the same service.
 
-- [Sign up a user with a user pool that requires MFA](actions/verify-software-token.js)
+- [Sign up a user with a user pool that requires MFA](actions/admin-initiate-auth.js)
 
 
 <!--custom.examples.start-->
diff --git a/javascriptv3/example_code/glue/README.md b/javascriptv3/example_code/glue/README.md
index 3e657a283fa..eb9a22d64d1 100644
--- a/javascriptv3/example_code/glue/README.md
+++ b/javascriptv3/example_code/glue/README.md
@@ -38,7 +38,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `javas
 
 Code examples that show you how to perform the essential operations within a service.
 
-- [Learn the basics](scenarios/basic/steps/start-crawler.js)
+- [Learn the basics](actions/create-crawler.js)
 
 
 ### Single actions
diff --git a/php/example_code/dynamodb/README.md b/php/example_code/dynamodb/README.md
index d7de8136499..b1891c57f40 100644
--- a/php/example_code/dynamodb/README.md
+++ b/php/example_code/dynamodb/README.md
@@ -40,12 +40,12 @@ 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.
 
-- [BatchExecuteStatement](DynamoDBService.php#L273)
+- [BatchExecuteStatement](DynamoDBService.php#L319)
 - [BatchWriteItem](DynamoDBService.php#L201)
 - [CreateTable](dynamodb_basics/GettingStartedWithDynamoDB.php#L52)
-- [DeleteItem](dynamodb_basics/GettingStartedWithDynamoDB.php#L100)
+- [DeleteItem](dynamodb_basics/GettingStartedWithDynamoDB.php#L148)
 - [DeleteTable](DynamoDBService.php#L84)
-- [ExecuteStatement](DynamoDBService.php#L243)
+- [ExecuteStatement](DynamoDBService.php#L263)
 - [GetItem](dynamodb_basics/GettingStartedWithDynamoDB.php#L131)
 - [ListTables](DynamoDBService.php#L64)
 - [PutItem](dynamodb_basics/GettingStartedWithDynamoDB.php#L67)
@@ -59,8 +59,8 @@ Code examples that show you how to accomplish a specific task by calling multipl
 functions within the same service.
 
 - [Create a serverless application to manage photos](../../applications/photo_asset_manager)
-- [Query a table by using batches of PartiQL statements](DynamoDBService.php)
-- [Query a table using PartiQL](DynamoDBService.php)
+- [Query a table by using batches of PartiQL statements](partiql_basics/GettingStartedWithPartiQLBatch.php)
+- [Query a table using PartiQL](partiql_basics/GettingStartedWithPartiQL.php)
 
 
 <!--custom.examples.start-->
diff --git a/php/example_code/glue/README.md b/php/example_code/glue/README.md
index 3f187603b72..ba1a99d789d 100644
--- a/php/example_code/glue/README.md
+++ b/php/example_code/glue/README.md
@@ -33,7 +33,7 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `php`
 
 Code examples that show you how to perform the essential operations within a service.
 
-- [Learn the basics](GlueService.php)
+- [Learn the basics](GettingStartedWithGlue.php)
 
 
 ### Single actions
@@ -41,19 +41,19 @@ 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.
 
 - [CreateCrawler](GettingStartedWithGlue.php#L47)
-- [CreateJob](GettingStartedWithGlue.php#L54)
+- [CreateJob](GettingStartedWithGlue.php#L110)
 - [DeleteCrawler](GettingStartedWithGlue.php#L180)
 - [DeleteDatabase](GettingStartedWithGlue.php#L173)
 - [DeleteJob](GettingStartedWithGlue.php#L159)
 - [DeleteTable](GettingStartedWithGlue.php#L166)
 - [GetCrawler](GettingStartedWithGlue.php#L69)
 - [GetDatabase](GettingStartedWithGlue.php#L58)
-- [GetJobRun](GettingStartedWithGlue.php#L107)
-- [GetJobRuns](GettingStartedWithGlue.php#L107)
+- [GetJobRun](GettingStartedWithGlue.php#L120)
+- [GetJobRuns](GettingStartedWithGlue.php#L130)
 - [GetTables](GettingStartedWithGlue.php#L58)
 - [ListJobs](GettingStartedWithGlue.php#L151)
 - [StartCrawler](GettingStartedWithGlue.php#L47)
-- [StartJobRun](GettingStartedWithGlue.php#L107)
+- [StartJobRun](GettingStartedWithGlue.php#L58)
 
 
 <!--custom.examples.start-->
diff --git a/php/example_code/iam/README.md b/php/example_code/iam/README.md
index acc6f24bb24..4fdf62e95ce 100644
--- a/php/example_code/iam/README.md
+++ b/php/example_code/iam/README.md
@@ -33,11 +33,11 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `php`
 
 Code excerpts that show you how to call individual service functions.
 
-- [AttachRolePolicy](GettingStartedWithIAM.php#L46)
-- [CreatePolicy](GettingStartedWithIAM.php#L46)
-- [CreateRole](GettingStartedWithIAM.php#L46)
+- [AttachRolePolicy](GettingStartedWithIAM.php#L82)
+- [CreatePolicy](GettingStartedWithIAM.php#L70)
+- [CreateRole](GettingStartedWithIAM.php#L57)
 - [CreateServiceLinkedRole](GettingStartedWithIAM.php#L46)
-- [CreateUser](GettingStartedWithIAM.php#L46)
+- [CreateUser](GettingStartedWithIAM.php#L51)
 - [GetAccountPasswordPolicy](GettingStartedWithIAM.php#L46)
 - [GetPolicy](GettingStartedWithIAM.php#L46)
 - [GetRole](GettingStartedWithIAM.php#L46)
diff --git a/php/example_code/s3/README.md b/php/example_code/s3/README.md
index 1ea662257ba..0aab0cf066b 100644
--- a/php/example_code/s3/README.md
+++ b/php/example_code/s3/README.md
@@ -45,8 +45,8 @@ 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.
 
-- [CopyObject](GettingStartedWithS3.php#L52)
-- [CreateBucket](GettingStartedWithS3.php#L52)
+- [CopyObject](GettingStartedWithS3.php#L104)
+- [CreateBucket](GettingStartedWithS3.php#L61)
 - [DeleteBucket](GettingStartedWithS3.php#L52)
 - [DeleteObjects](GettingStartedWithS3.php#L52)
 - [GetObject](GettingStartedWithS3.php#L52)
diff --git a/python/example_code/cognito/README.md b/python/example_code/cognito/README.md
index 3311c30c4dc..6f0661addb5 100644
--- a/python/example_code/cognito/README.md
+++ b/python/example_code/cognito/README.md
@@ -43,7 +43,7 @@ python -m pip install -r requirements.txt
 
 Code excerpts that show you how to call individual service functions.
 
-- [AdminGetUser](cognito_idp_actions.py#L23)
+- [AdminGetUser](cognito_idp_actions.py#L56)
 - [AdminInitiateAuth](cognito_idp_actions.py#L187)
 - [AdminRespondToAuthChallenge](cognito_idp_actions.py#L292)
 - [AssociateSoftwareToken](cognito_idp_actions.py#L241)
diff --git a/python/example_code/kms/README.md b/python/example_code/kms/README.md
index 4deb5e07b82..2e4c868c3d5 100644
--- a/python/example_code/kms/README.md
+++ b/python/example_code/kms/README.md
@@ -45,7 +45,7 @@ Code excerpts that show you how to call individual service functions.
 - [DeleteAlias](alias_management.py#L164)
 - [DescribeKey](key_management.py#L82)
 - [DisableKey](key_management.py#L128)
-- [EnableKey](key_management.py#L20)
+- [EnableKey](key_management.py#L128)
 - [Encrypt](key_encryption.py#L26)
 - [GenerateDataKey](key_management.py#L104)
 - [GetKeyPolicy](key_policies.py#L50)
diff --git a/python/example_code/polly/README.md b/python/example_code/polly/README.md
index 728772836e2..415d3499823 100644
--- a/python/example_code/polly/README.md
+++ b/python/example_code/polly/README.md
@@ -44,7 +44,7 @@ Code excerpts that show you how to call individual service functions.
 - [ListLexicons](polly_wrapper.py#L286)
 - [PutLexicon](polly_wrapper.py#L249)
 - [StartSpeechSynthesisTask](polly_wrapper.py#L147)
-- [SynthesizeSpeech](polly_wrapper.py#L20)
+- [SynthesizeSpeech](polly_wrapper.py#L54)
 
 ### Scenarios
 
diff --git a/python/example_code/rekognition/README.md b/python/example_code/rekognition/README.md
index b86d400e3a1..a46d600db41 100644
--- a/python/example_code/rekognition/README.md
+++ b/python/example_code/rekognition/README.md
@@ -61,7 +61,7 @@ Code excerpts that show you how to call individual service functions.
 Code examples that show you how to accomplish a specific task by calling multiple
 functions within the same service.
 
-- [Build a collection and find faces in it](rekognition_objects.py)
+- [Build a collection and find faces in it](rekognition_collections.py)
 - [Detect and display elements in images](rekognition_image_detection.py)
 - [Detect objects in images](../../cross_service/photo_analyzer)
 - [Detect people and objects in a video](../../example_code/rekognition)
@@ -95,7 +95,7 @@ This example shows you how to do the following:
 Start the example by running the following at a command prompt:
 
 ```
-python rekognition_objects.py
+python rekognition_collections.py
 ```
 
 
diff --git a/python/example_code/s3/README.md b/python/example_code/s3/README.md
index a72d852d394..6fe9a747f63 100644
--- a/python/example_code/s3/README.md
+++ b/python/example_code/s3/README.md
@@ -68,7 +68,7 @@ Code excerpts that show you how to call individual service functions.
 - [GetObjectLockConfiguration](scenarios/object-locking/cleanup.py#L17)
 - [HeadBucket](s3_basics/bucket_wrapper.py#L64)
 - [ListBuckets](s3_basics/bucket_wrapper.py#L85)
-- [ListObjectsV2](s3_basics/object_wrapper.py#L21)
+- [ListObjectsV2](s3_basics/object_wrapper.py#L99)
 - [PutBucketAcl](s3_basics/bucket_wrapper.py#L122)
 - [PutBucketCors](s3_basics/bucket_wrapper.py#L171)
 - [PutBucketLifecycleConfiguration](s3_basics/bucket_wrapper.py#L279)
diff --git a/python/example_code/ssm/README.md b/python/example_code/ssm/README.md
index b294335d3b3..2d9f10341ce 100644
--- a/python/example_code/ssm/README.md
+++ b/python/example_code/ssm/README.md
@@ -56,7 +56,7 @@ Code excerpts that show you how to call individual service functions.
 - [DeleteDocument](document.py#L59)
 - [DeleteMaintenanceWindow](maintenance_window.py#L73)
 - [DeleteOpsItem](ops_item.py#L73)
-- [DescribeOpsItems](ops_item.py#L13)
+- [DescribeOpsItems](ops_item.py#L95)
 - [ListCommandInvocations](document.py#L159)
 - [SendCommand](document.py#L82)
 - [UpdateMaintenanceWindow](maintenance_window.py#L97)
diff --git a/python/example_code/support/README.md b/python/example_code/support/README.md
index b1ee5b59344..536af051214 100644
--- a/python/example_code/support/README.md
+++ b/python/example_code/support/README.md
@@ -51,7 +51,7 @@ 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.
 
-- [AddAttachmentsToSet](support_wrapper.py#L19)
+- [AddAttachmentsToSet](support_wrapper.py#L143)
 - [AddCommunicationToCase](support_wrapper.py#L179)
 - [CreateCase](support_wrapper.py#L103)
 - [DescribeAttachment](support_wrapper.py#L242)
diff --git a/ruby/example_code/dynamodb/README.md b/ruby/example_code/dynamodb/README.md
index 94053f5536a..846bc5af01b 100644
--- a/ruby/example_code/dynamodb/README.md
+++ b/ruby/example_code/dynamodb/README.md
@@ -45,15 +45,15 @@ 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.
 
-- [BatchExecuteStatement](partiql/partiql_batch.rb#L12)
+- [BatchExecuteStatement](partiql/partiql_batch.rb#L25)
 - [BatchWriteItem](scaffold.rb#L83)
 - [CreateTable](scaffold.rb#L56)
 - [DeleteItem](basics/dynamodb_basics.rb#L127)
 - [DeleteTable](scaffold.rb#L109)
 - [DescribeTable](scaffold.rb#L37)
-- [ExecuteStatement](partiql/partiql_single.rb#L12)
+- [ExecuteStatement](partiql/partiql_single.rb#L25)
 - [GetItem](basics/dynamodb_basics.rb#L40)
-- [ListTables](scaffold.rb#L20)
+- [ListTables](scaffold.rb#L37)
 - [PutItem](basics/dynamodb_basics.rb#L23)
 - [Query](basics/dynamodb_basics.rb#L75)
 - [Scan](basics/dynamodb_basics.rb#L94)
diff --git a/rustv1/examples/aurora/README.md b/rustv1/examples/aurora/README.md
index 057deb218f2..cd42479ec52 100644
--- a/rustv1/examples/aurora/README.md
+++ b/rustv1/examples/aurora/README.md
@@ -45,19 +45,19 @@ 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.
 
-- [CreateDBCluster](src/aurora_scenario/mod.rs#L353)
-- [CreateDBClusterParameterGroup](src/aurora_scenario/mod.rs#L204)
-- [CreateDBClusterSnapshot](src/aurora_scenario/mod.rs#L353)
-- [CreateDBInstance](src/aurora_scenario/mod.rs#L353)
-- [DeleteDBCluster](src/aurora_scenario/mod.rs#L513)
-- [DeleteDBClusterParameterGroup](src/aurora_scenario/mod.rs#L513)
-- [DeleteDBInstance](src/aurora_scenario/mod.rs#L513)
-- [DescribeDBClusterParameters](src/aurora_scenario/mod.rs#L287)
-- [DescribeDBClusters](src/aurora_scenario/mod.rs#L353)
-- [DescribeDBEngineVersions](src/aurora_scenario/mod.rs#L142)
-- [DescribeDBInstances](src/aurora_scenario/mod.rs#L513)
-- [DescribeOrderableDBInstanceOptions](src/aurora_scenario/mod.rs#L179)
-- [ModifyDBClusterParameterGroup](src/aurora_scenario/mod.rs#L316)
+- [CreateDBCluster](src/rds.rs#L151)
+- [CreateDBClusterParameterGroup](src/rds.rs#L88)
+- [CreateDBClusterSnapshot](src/rds.rs#L206)
+- [CreateDBInstance](src/rds.rs#L174)
+- [DeleteDBCluster](src/aurora_scenario/tests.rs#L790)
+- [DeleteDBClusterParameterGroup](src/aurora_scenario/tests.rs#L790)
+- [DeleteDBInstance](src/aurora_scenario/tests.rs#L790)
+- [DescribeDBClusterParameters](src/aurora_scenario/tests.rs#L376)
+- [DescribeDBClusters](src/rds.rs#L106)
+- [DescribeDBEngineVersions](src/rds.rs#L56)
+- [DescribeDBInstances](src/aurora_scenario/tests.rs#L790)
+- [DescribeOrderableDBInstanceOptions](src/rds.rs#L69)
+- [ModifyDBClusterParameterGroup](src/rds.rs#L135)
 
 
 <!--custom.examples.start-->
diff --git a/rustv1/examples/auto-scaling/README.md b/rustv1/examples/auto-scaling/README.md
index db0b7ae95de..ffb2413da34 100644
--- a/rustv1/examples/auto-scaling/README.md
+++ b/rustv1/examples/auto-scaling/README.md
@@ -53,7 +53,7 @@ Code excerpts that show you how to call individual service functions.
 - [DisableMetricsCollection](src/scenario.rs#L617)
 - [EnableMetricsCollection](src/scenario.rs#L294)
 - [SetDesiredCapacity](src/scenario.rs#L595)
-- [TerminateInstanceInAutoScalingGroup](src/scenario.rs#L654)
+- [TerminateInstanceInAutoScalingGroup](src/scenario.rs#L456)
 - [UpdateAutoScalingGroup](src/bin/update-autoscaling-group.rs#L30)
 
 
diff --git a/rustv1/examples/lambda/README.md b/rustv1/examples/lambda/README.md
index 6d2d0f38e45..c409803e70e 100644
--- a/rustv1/examples/lambda/README.md
+++ b/rustv1/examples/lambda/README.md
@@ -41,7 +41,7 @@ Code excerpts that show you how to call individual service functions.
 - [GetFunction](src/actions.rs#L382)
 - [Invoke](src/actions.rs#L407)
 - [ListFunctions](src/actions.rs#L395)
-- [UpdateFunctionCode](src/actions.rs#L423)
+- [UpdateFunctionCode](src/actions.rs#L200)
 - [UpdateFunctionConfiguration](src/actions.rs#L449)
 
 ### Scenarios
diff --git a/swift/example_code/cognito-identity/README.md b/swift/example_code/cognito-identity/README.md
index 6a091f27686..e82ee9ea737 100644
--- a/swift/example_code/cognito-identity/README.md
+++ b/swift/example_code/cognito-identity/README.md
@@ -33,9 +33,9 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `swift
 
 Code excerpts that show you how to call individual service functions.
 
-- [CreateIdentityPool](FindOrCreateIdentityPool/Sources/CognitoIdentityHandler/CognitoIdentityHandler.swift#L7)
-- [DeleteIdentityPool](FindOrCreateIdentityPool/Sources/CognitoIdentityHandler/CognitoIdentityHandler.swift#L7)
-- [ListIdentityPools](FindOrCreateIdentityPool/Sources/CognitoIdentityHandler/CognitoIdentityHandler.swift#L7)
+- [CreateIdentityPool](FindOrCreateIdentityPool/Sources/CognitoIdentityHandler/CognitoIdentityHandler.swift#L94)
+- [DeleteIdentityPool](FindOrCreateIdentityPool/Sources/CognitoIdentityHandler/CognitoIdentityHandler.swift#L116)
+- [ListIdentityPools](FindOrCreateIdentityPool/Sources/CognitoIdentityHandler/CognitoIdentityHandler.swift#L27)
 
 
 <!--custom.examples.start-->
diff --git a/swift/example_code/dynamodb/README.md b/swift/example_code/dynamodb/README.md
index bc786d80022..5a42e7d0736 100644
--- a/swift/example_code/dynamodb/README.md
+++ b/swift/example_code/dynamodb/README.md
@@ -40,17 +40,17 @@ 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.
 
-- [BatchGetItem](basics/Sources/basics.swift#L34)
-- [BatchWriteItem](basics/Sources/basics.swift#L34)
-- [CreateTable](basics/Sources/basics.swift#L34)
-- [DeleteItem](basics/Sources/basics.swift#L34)
-- [DeleteTable](basics/Sources/basics.swift#L34)
-- [GetItem](basics/Sources/basics.swift#L34)
-- [ListTables](basics/Sources/basics.swift#L34)
-- [PutItem](basics/Sources/basics.swift#L34)
-- [Query](basics/Sources/basics.swift#L34)
-- [Scan](basics/Sources/basics.swift#L34)
-- [UpdateItem](basics/Sources/basics.swift#L34)
+- [BatchGetItem](BatchGetItem/Sources/MovieDatabase.swift#L258)
+- [BatchWriteItem](basics/MovieList/MovieTable.swift#L162)
+- [CreateTable](basics/MovieList/MovieTable.swift#L53)
+- [DeleteItem](basics/MovieList/MovieTable.swift#L455)
+- [DeleteTable](basics/MovieList/MovieTable.swift#L121)
+- [GetItem](basics/MovieList/MovieTable.swift#L261)
+- [ListTables](ListTables/Sources/DatabaseManager.swift#L82)
+- [PutItem](basics/MovieList/MovieTable.swift#L219)
+- [Query](basics/MovieList/MovieTable.swift#L294)
+- [Scan](basics/MovieList/MovieTable.swift#L334)
+- [UpdateItem](basics/MovieList/MovieTable.swift#L397)
 
 
 <!--custom.examples.start-->
diff --git a/swift/example_code/iam/README.md b/swift/example_code/iam/README.md
index 9b5f5b17ed1..df3ce8b686c 100644
--- a/swift/example_code/iam/README.md
+++ b/swift/example_code/iam/README.md
@@ -33,27 +33,27 @@ For prerequisites, see the [README](../../README.md#Prerequisites) in the `swift
 
 Code excerpts that show you how to call individual service functions.
 
-- [AttachRolePolicy](basics/Sources/Basics/Basics.swift#L29)
-- [CreateAccessKey](basics/Sources/Basics/Basics.swift#L29)
-- [CreatePolicy](basics/Sources/Basics/Basics.swift#L29)
-- [CreateRole](basics/Sources/Basics/Basics.swift#L29)
-- [CreateServiceLinkedRole](basics/Sources/Basics/Basics.swift#L29)
-- [CreateUser](basics/Sources/Basics/Basics.swift#L29)
-- [DeleteAccessKey](basics/Sources/Basics/Basics.swift#L29)
-- [DeletePolicy](basics/Sources/Basics/Basics.swift#L29)
-- [DeleteRole](basics/Sources/Basics/Basics.swift#L29)
-- [DeleteUser](basics/Sources/Basics/Basics.swift#L29)
-- [DeleteUserPolicy](basics/Sources/Basics/Basics.swift#L29)
-- [DetachRolePolicy](basics/Sources/Basics/Basics.swift#L29)
-- [GetPolicy](basics/Sources/Basics/Basics.swift#L29)
-- [GetRole](basics/Sources/Basics/Basics.swift#L29)
+- [AttachRolePolicy](AttachRolePolicy/Sources/ServiceHandler/ServiceHandler.swift#L51)
+- [CreateAccessKey](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L177)
+- [CreatePolicy](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L202)
+- [CreateRole](CreateRole/Sources/ServiceHandler/ServiceHandler.swift#L51)
+- [CreateServiceLinkedRole](CreateServiceLinkedRole/Sources/ServiceHandler/ServiceHandler.swift#L59)
+- [CreateUser](CreateUser/Sources/ServiceHandler/ServiceHandler.swift#L50)
+- [DeleteAccessKey](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L348)
+- [DeletePolicy](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L310)
+- [DeleteRole](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L374)
+- [DeleteUser](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L328)
+- [DeleteUserPolicy](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L251)
+- [DetachRolePolicy](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L291)
+- [GetPolicy](GetPolicy/Sources/ServiceHandler/ServiceHandler.swift#L50)
+- [GetRole](GetRole/Sources/ServiceHandler/ServiceHandler.swift#L51)
 - [ListAttachedRolePolicies](basics/Sources/Basics/Basics.swift#L29)
 - [ListGroups](basics/Sources/Basics/Basics.swift#L29)
 - [ListPolicies](basics/Sources/Basics/Basics.swift#L29)
 - [ListRolePolicies](basics/Sources/Basics/Basics.swift#L29)
 - [ListRoles](basics/Sources/Basics/Basics.swift#L29)
 - [ListUsers](basics/Sources/Basics/Basics.swift#L29)
-- [PutUserPolicy](basics/Sources/Basics/Basics.swift#L29)
+- [PutUserPolicy](basics/Sources/ServiceHandler/ServiceHandlerIAM.swift#L229)
 
 
 <!--custom.examples.start-->