diff --git a/Project.toml b/Project.toml
index 77e5e1121c..e7a34bf3e6 100644
--- a/Project.toml
+++ b/Project.toml
@@ -1,7 +1,7 @@
 name = "AWS"
 uuid = "fbe9abb3-538b-5e4e-ba9e-bc94f4f92ebc"
 license = "MIT"
-version = "1.1.0"
+version = "1.1.1"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
@@ -15,6 +15,8 @@ Mocking = "78c3b35d-d492-501b-9361-3d52fe80e533"
 OrderedCollections = "bac558e1-5e72-5ebc-8fee-abe8a469f55d"
 Retry = "20febd7b-183b-5ae2-ac4a-720e7ce64774"
 Sockets = "6462fe0b-24de-5631-8697-dd941f90decc"
+Suppressor = "fd094767-a336-5f1f-9728-57cf17d0bbfb"
+UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 XMLDict = "228000da-037f-5747-90a9-8195ccbf91a5"
 
 [compat]
@@ -30,8 +32,9 @@ XMLDict = "0.3, 0.4"
 julia = "1"
 
 [extras]
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 UUIDs = "cf7118a7-6976-5b1a-9a39-7adc72f591a4"
 
 [targets]
-test = ["Test", "UUIDs"]
+test = ["Pkg", "Test", "UUIDs"]
diff --git a/deps/metadata.json b/deps/metadata.json
index a32de1a54b..bc494edae5 100644
--- a/deps/metadata.json
+++ b/deps/metadata.json
@@ -368,7 +368,7 @@
     "version": "2018-09-24"
   },
   "macie2-2020-01-01.normal.json": {
-    "sha": "f6b643913cb1ccc9f8f8c47ca23973faa86a3869",
+    "sha": "d5da059f7e7cb3ab15343b5a2300f3f44b458771",
     "version": "2020-01-01"
   },
   "macie-2017-12-19.normal.json": {
@@ -640,7 +640,7 @@
     "version": "2018-04-02"
   },
   "ec2-2016-11-15.normal.json": {
-    "sha": "6b3c0b1b8bc1a47b46fd5aa6ddee768926a59ac3",
+    "sha": "e5c0266709b854b37dcfeeffa89c56210eeb35a0",
     "version": "2016-11-15"
   },
   "ebs-2019-11-02.normal.json": {
@@ -871,6 +871,10 @@
     "sha": "76d5972a260117fadff8525bb7868f0088fb4e58",
     "version": "2016-02-06"
   },
+  "appflow-2020-08-23.normal.json": {
+    "sha": "c221f5a9e4c5b886309db9bed24efed26c48e4c0",
+    "version": "2020-08-23"
+  },
   "appconfig-2019-10-09.normal.json": {
     "sha": "c6b7a4f23ac9130b30b6a72ed7f44da2e2fbf646",
     "version": "2019-10-09"
@@ -910,9 +914,5 @@
   "AWSMigrationHub-2017-05-31.normal.json": {
     "sha": "3fe8ac6c83654077d104e4a3ffb9ce52726229b5",
     "version": "2017-05-31"
-  },
-  "appflow-2020-08-23.normal.json": {
-    "sha": "c221f5a9e4c5b886309db9bed24efed26c48e4c0",
-    "version": "2020-08-23"
   }
 }
diff --git a/src/AWS.jl b/src/AWS.jl
index d5a019189b..08754e4f71 100644
--- a/src/AWS.jl
+++ b/src/AWS.jl
@@ -1,5 +1,6 @@
 module AWS
 
+using Compat: Compat
 using Base64
 using Dates
 using HTTP
@@ -8,6 +9,7 @@ using Mocking
 using OrderedCollections: LittleDict, OrderedDict
 using Retry
 using Sockets
+using UUIDs: UUIDs
 using XMLDict
 
 export @service
diff --git a/src/AWSMetadata.jl b/src/AWSMetadata.jl
index 6361264b70..8341c17ed3 100644
--- a/src/AWSMetadata.jl
+++ b/src/AWSMetadata.jl
@@ -99,9 +99,9 @@ function _generate_high_level_wrapper(services::AbstractArray{<:OrderedDict})
         open(service_path, "w") do f
             println(f, "# This file is auto-generated by AWSMetadata.jl")
             println(f, "using AWS")
-            println(f, "using AWS.AWSServices: $service_name\n")
-            println(f, "using Compat")
-            println(f, "using UUIDs")
+            println(f, "using AWS.AWSServices: $service_name")
+            println(f, "using AWS.Compat")
+            println(f, "using AWS.UUIDs")
             join(f, operations, "\n")
         end
     end
diff --git a/src/services/accessanalyzer.jl b/src/services/accessanalyzer.jl
index 79bac61f6f..9c3af5cca4 100644
--- a/src/services/accessanalyzer.jl
+++ b/src/services/accessanalyzer.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: accessanalyzer
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateAnalyzer()
 
diff --git a/src/services/acm.jl b/src/services/acm.jl
index 26c63edc11..0749ec3c6c 100644
--- a/src/services/acm.jl
+++ b/src/services/acm.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: acm
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTagsToCertificate()
 
@@ -74,7 +74,7 @@ get_certificate(CertificateArn, args::AbstractDict{String, <:Any}; aws_config::A
 """
     ImportCertificate()
 
-Imports a certificate into AWS Certificate Manager (ACM) to use with services that are integrated with ACM. Note that integrated services allow only certificate types and keys they support to be associated with their resources. Further, their support differs depending on whether the certificate is imported into IAM or into ACM. For more information, see the documentation for each service. For more information about importing certificates into ACM, see Importing Certificates in the AWS Certificate Manager User Guide.   ACM does not provide managed renewal for certificates that you import.  Note the following guidelines when importing third party certificates:   You must enter the private key that matches the certificate you are importing.   The private key must be unencrypted. You cannot import a private key that is protected by a password or a passphrase.   If the certificate you are importing is not self-signed, you must enter its certificate chain.   If a certificate chain is included, the issuer must be the subject of one of the certificates in the chain.   The certificate, private key, and certificate chain must be PEM-encoded.   The current time must be between the Not Before and Not After certificate fields.   The Issuer field must not be empty.   The OCSP authority URL, if present, must not exceed 1000 characters.   To import a new certificate, omit the CertificateArn argument. Include this argument only when you want to replace a previously imported certifica   When you import a certificate by using the CLI, you must specify the certificate, the certificate chain, and the private key by their file names preceded by file://. For example, you can specify a certificate saved in the C: temp folder as file://C: temp certificate_to_import.pem. If you are making an HTTP or HTTPS Query request, include these arguments as BLOBs.    When you import a certificate by using an SDK, you must specify the certificate, the certificate chain, and the private key files in the manner required by the programming language you're using.    The cryptographic algorithm of an imported certificate must match the algorithm of the signing CA. For example, if the signing CA key type is RSA, then the certificate key type must also be RSA.   This operation returns the Amazon Resource Name (ARN) of the imported certificate.
+Imports a certificate into AWS Certificate Manager (ACM) to use with services that are integrated with ACM. Note that integrated services allow only certificate types and keys they support to be associated with their resources. Further, their support differs depending on whether the certificate is imported into IAM or into ACM. For more information, see the documentation for each service. For more information about importing certificates into ACM, see Importing Certificates in the AWS Certificate Manager User Guide.   ACM does not provide managed renewal for certificates that you import.  Note the following guidelines when importing third party certificates:   You must enter the private key that matches the certificate you are importing.   The private key must be unencrypted. You cannot import a private key that is protected by a password or a passphrase.   If the certificate you are importing is not self-signed, you must enter its certificate chain.   If a certificate chain is included, the issuer must be the subject of one of the certificates in the chain.   The certificate, private key, and certificate chain must be PEM-encoded.   The current time must be between the Not Before and Not After certificate fields.   The Issuer field must not be empty.   The OCSP authority URL, if present, must not exceed 1000 characters.   To import a new certificate, omit the CertificateArn argument. Include this argument only when you want to replace a previously imported certifica   When you import a certificate by using the CLI, you must specify the certificate, the certificate chain, and the private key by their file names preceded by file://. For example, you can specify a certificate saved in the C:temp folder as file://C:tempcertificate_to_import.pem. If you are making an HTTP or HTTPS Query request, include these arguments as BLOBs.    When you import a certificate by using an SDK, you must specify the certificate, the certificate chain, and the private key files in the manner required by the programming language you're using.    The cryptographic algorithm of an imported certificate must match the algorithm of the signing CA. For example, if the signing CA key type is RSA, then the certificate key type must also be RSA.   This operation returns the Amazon Resource Name (ARN) of the imported certificate.
 
 # Required Parameters
 - `Certificate`: The certificate to import.
diff --git a/src/services/acm_pca.jl b/src/services/acm_pca.jl
index 07f40e9432..f2815a5a37 100644
--- a/src/services/acm_pca.jl
+++ b/src/services/acm_pca.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: acm_pca
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateCertificateAuthority()
 
diff --git a/src/services/alexa_for_business.jl b/src/services/alexa_for_business.jl
index cbd6d17a93..9200696d89 100644
--- a/src/services/alexa_for_business.jl
+++ b/src/services/alexa_for_business.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: alexa_for_business
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     ApproveSkill()
 
diff --git a/src/services/amplify.jl b/src/services/amplify.jl
index a79e1ea688..227a3cf89d 100644
--- a/src/services/amplify.jl
+++ b/src/services/amplify.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: amplify
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApp()
 
diff --git a/src/services/api_gateway.jl b/src/services/api_gateway.jl
index e8259987e6..a771206b45 100644
--- a/src/services/api_gateway.jl
+++ b/src/services/api_gateway.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: api_gateway
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApiKey()
 
@@ -1419,7 +1419,7 @@ Represents a put integration.
 
 # Optional Parameters
 - `contentHandling`: Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors:  CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob. CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string.  If this property is not defined, the response payload will be passed through from the integration response to the method response without modification.
-- `responseParameters`: A key-value map specifying response parameters that are passed to the method response from the back end. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where name must be a valid and unique response header name and JSON-expression a valid JSON expression without the   prefix.
+- `responseParameters`: A key-value map specifying response parameters that are passed to the method response from the back end. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where name must be a valid and unique response header name and JSON-expression a valid JSON expression without the  prefix.
 - `responseTemplates`: Specifies a put integration response's templates.
 - `selectionPattern`: Specifies the selection pattern of a put integration response.
 """
@@ -1464,7 +1464,7 @@ Adds a MethodResponse to an existing Method resource.
 
 # Optional Parameters
 - `responseModels`: Specifies the Model resources used for the response's content type. Response models are represented as a key/value map, with a content type as the key and a Model name as the value.
-- `responseParameters`: A key-value map specifying required or optional response parameters that API Gateway can send back to the caller. A key defines a method response header name and the associated value is a Boolean flag indicating whether the method response parameter is required or not. The method response header names must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The response parameter names defined here are available in the integration response to be mapped from an integration response header expressed in integration.response.header.{name}, a static value enclosed within a pair of single quotes (e.g., 'application/json'), or a JSON expression from the back-end response payload in the form of integration.response.body.{JSON-expression}, where JSON-expression is a valid JSON expression without the   prefix.)
+- `responseParameters`: A key-value map specifying required or optional response parameters that API Gateway can send back to the caller. A key defines a method response header name and the associated value is a Boolean flag indicating whether the method response parameter is required or not. The method response header names must match the pattern of method.response.header.{name}, where name is a valid and unique header name. The response parameter names defined here are available in the integration response to be mapped from an integration response header expressed in integration.response.header.{name}, a static value enclosed within a pair of single quotes (e.g., 'application/json'), or a JSON expression from the back-end response payload in the form of integration.response.body.{JSON-expression}, where JSON-expression is a valid JSON expression without the  prefix.)
 """
 
 put_method_response(http_method, resource_id, restapi_id, status_code; aws_config::AWSConfig=global_aws_config()) = api_gateway("PUT", "/restapis/$(restapi_id)/resources/$(resource_id)/methods/$(http_method)/responses/$(status_code)"; aws_config=aws_config)
diff --git a/src/services/apigatewaymanagementapi.jl b/src/services/apigatewaymanagementapi.jl
index 10e83837db..ffde0466ee 100644
--- a/src/services/apigatewaymanagementapi.jl
+++ b/src/services/apigatewaymanagementapi.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: apigatewaymanagementapi
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteConnection()
 
diff --git a/src/services/apigatewayv2.jl b/src/services/apigatewayv2.jl
index 203d225332..081e23063e 100644
--- a/src/services/apigatewayv2.jl
+++ b/src/services/apigatewayv2.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: apigatewayv2
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApi()
 
@@ -19,8 +19,8 @@ Creates an Api resource.
 - `credentialsArn`: This property is part of quick create. It specifies the credentials required for the integration, if any. For a Lambda integration, three options are available. To specify an IAM Role for API Gateway to assume, use the role's Amazon Resource Name (ARN). To require that the caller's identity be passed through from the request, specify arn:aws:iam::*:user/*. To use resource-based permissions on supported AWS services, specify null. Currently, this property is not used for HTTP integrations. Supported only for HTTP APIs.
 - `description`: The description of the API.
 - `disableSchemaValidation`: Avoid validating models when creating a deployment. Supported only for WebSocket APIs.
-- `routeKey`: This property is part of quick create. If you don't specify a routeKey, a default route of  default is created. The  default route acts as a catch-all for any request made to your API, for a particular stage. The  default route key can't be modified. You can add routes after creating the API, and you can update the route keys of additional routes. Supported only for HTTP APIs.
-- `routeSelectionExpression`: The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be  {request.method}  {request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.
+- `routeKey`: This property is part of quick create. If you don't specify a routeKey, a default route of default is created. The default route acts as a catch-all for any request made to your API, for a particular stage. The default route key can't be modified. You can add routes after creating the API, and you can update the route keys of additional routes. Supported only for HTTP APIs.
+- `routeSelectionExpression`: The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be {request.method} {request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.
 - `tags`: The collection of tags. Each tag element is associated with a given resource.
 - `target`: This property is part of quick create. Quick create produces an API with an integration, a default catch-all route, and a default stage which is configured to automatically deploy changes. For HTTP integrations, specify a fully qualified URL. For Lambda integrations, specify a function ARN. The type of the integration will be HTTP_PROXY or AWS_PROXY, respectively. Supported only for HTTP APIs.
 - `version`: A version identifier for the API.
@@ -54,7 +54,7 @@ Creates an Authorizer for an API.
 # Required Parameters
 - `apiId`: The API identifier.
 - `authorizerType`: The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.
-- `identitySource`: The identity source for which authorization is requested. For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function. For JWT, a single entry that specifies where to extract the JSON Web Token (JWT )from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \" request.header.Authorization\".
+- `identitySource`: The identity source for which authorization is requested. For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function. For JWT, a single entry that specifies where to extract the JSON Web Token (JWT )from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"request.header.Authorization\".
 - `name`: The name of the authorizer.
 
 # Optional Parameters
@@ -144,7 +144,7 @@ Creates an IntegrationResponses.
 
 # Optional Parameters
 - `contentHandlingStrategy`: Specifies how to handle response payload content type conversions. Supported values are CONVERT_TO_BINARY and CONVERT_TO_TEXT, with the following behaviors: CONVERT_TO_BINARY: Converts a response payload from a Base64-encoded string to the corresponding binary blob. CONVERT_TO_TEXT: Converts a response payload from a binary blob to a Base64-encoded string. If this property is not defined, the response payload will be passed through from the integration response to the route response or method response without modification.
-- `responseParameters`: A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where {name} is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where {name} is a valid and unique response header name and {JSON-expression} is a valid JSON expression without the   prefix.
+- `responseParameters`: A key-value map specifying response parameters that are passed to the method response from the backend. The key is a method response header parameter name and the mapped value is an integration response header value, a static value enclosed within a pair of single quotes, or a JSON expression from the integration response body. The mapping key must match the pattern of method.response.header.{name}, where {name} is a valid and unique header name. The mapped non-static value must match the pattern of integration.response.header.{name} or integration.response.body.{JSON-expression}, where {name} is a valid and unique response header name and {JSON-expression} is a valid JSON expression without the  prefix.
 - `responseTemplates`: The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.
 - `templateSelectionExpression`: The template selection expression for the integration response. Supported only for WebSocket APIs.
 """
@@ -955,7 +955,7 @@ Updates an Api resource.
 - `disableSchemaValidation`: Avoid validating models when creating a deployment. Supported only for WebSocket APIs.
 - `name`: The name of the API.
 - `routeKey`: This property is part of quick create. If not specified, the route created using quick create is kept. Otherwise, this value replaces the route key of the quick create route. Additional routes may still be added after the API is updated. Supported only for HTTP APIs.
-- `routeSelectionExpression`: The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be  {request.method}  {request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.
+- `routeSelectionExpression`: The route selection expression for the API. For HTTP APIs, the routeSelectionExpression must be {request.method} {request.path}. If not provided, this will be the default for HTTP APIs. This property is required for WebSocket APIs.
 - `target`: This property is part of quick create. For HTTP integrations, specify a fully qualified URL. For Lambda integrations, specify a function ARN. The type of the integration will be HTTP_PROXY or AWS_PROXY, respectively. The value provided updates the integration URI and integration type. You can update a quick-created target, but you can't remove it from an API. Supported only for HTTP APIs.
 - `version`: A version identifier for the API.
 """
@@ -996,7 +996,7 @@ Updates an Authorizer.
 - `authorizerType`: The authorizer type. For WebSocket APIs, specify REQUEST for a Lambda function using incoming request parameters. For HTTP APIs, specify JWT to use JSON Web Tokens.
 - `authorizerUri`: The authorizer's Uniform Resource Identifier (URI). For REQUEST authorizers, this must be a well-formed Lambda function URI, for example, arn:aws:apigateway:us-west-2:lambda:path/2015-03-31/functions/arn:aws:lambda:us-west-2:{account_id}:function:{lambda_function_name}/invocations. In general, the URI has this form: arn:aws:apigateway:{region}:lambda:path/{service_api}
                , where {region} is the same as the region hosting the Lambda function, path indicates that the remaining substring in the URI should be treated as the path to the resource, including the initial /. For Lambda functions, this is usually of the form /2015-03-31/functions/[FunctionARN]/invocations. Supported only for REQUEST authorizers.
-- `identitySource`: The identity source for which authorization is requested. For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function. For JWT, a single entry that specifies where to extract the JSON Web Token (JWT) from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \" request.header.Authorization\".
+- `identitySource`: The identity source for which authorization is requested. For a REQUEST authorizer, this is optional. The value is a set of one or more mapping expressions of the specified request parameters. Currently, the identity source can be headers, query string parameters, stage variables, and context parameters. For example, if an Auth header and a Name query string parameter are defined as identity sources, this value is route.request.header.Auth, route.request.querystring.Name. These parameters will be used to perform runtime validation for Lambda-based authorizers by verifying all of the identity-related request parameters are present in the request, not null, and non-empty. Only when this is true does the authorizer invoke the authorizer Lambda function. Otherwise, it returns a 401 Unauthorized response without calling the Lambda function. For JWT, a single entry that specifies where to extract the JSON Web Token (JWT) from inbound requests. Currently only header-based and query parameter-based selections are supported, for example \"request.header.Authorization\".
 - `identityValidationExpression`: This parameter is not used.
 - `jwtConfiguration`: Represents the configuration of a JWT authorizer. Required for the JWT authorizer type. Supported only for HTTP APIs.
 - `name`: The name of the authorizer.
@@ -1088,7 +1088,7 @@ Updates an IntegrationResponses.
                   {name}
                 is a valid and unique response header name and 
                   {JSON-expression}
-                is a valid JSON expression without the   prefix.
+                is a valid JSON expression without the  prefix.
 - `responseTemplates`: The collection of response templates for the integration response as a string-to-string map of key-value pairs. Response templates are represented as a key/value map, with a content-type as the key and a template as the value.
 - `templateSelectionExpression`: The template selection expression for the integration response. Supported only for WebSocket APIs.
 """
diff --git a/src/services/app_mesh.jl b/src/services/app_mesh.jl
index 4ee58ad09b..3d2ded897b 100644
--- a/src/services/app_mesh.jl
+++ b/src/services/app_mesh.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: app_mesh
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateGatewayRoute()
 
diff --git a/src/services/appconfig.jl b/src/services/appconfig.jl
index 3078a4d01b..0018b2b2e6 100644
--- a/src/services/appconfig.jl
+++ b/src/services/appconfig.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: appconfig
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApplication()
 
diff --git a/src/services/appflow.jl b/src/services/appflow.jl
index 5b25a45879..df4bdd7048 100644
--- a/src/services/appflow.jl
+++ b/src/services/appflow.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: appflow
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateConnectorProfile()
 
diff --git a/src/services/application_auto_scaling.jl b/src/services/application_auto_scaling.jl
index b6e536b97a..4a043b4cec 100644
--- a/src/services/application_auto_scaling.jl
+++ b/src/services/application_auto_scaling.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: application_auto_scaling
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteScalingPolicy()
 
@@ -11,7 +11,7 @@ Deletes the specified scaling policy for an Application Auto Scaling scalable ta
 
 # Required Parameters
 - `PolicyName`: The name of the scaling policy.
-- `ResourceId`: The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension. This string consists of the service namespace, resource type, and scaling property.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 - `ServiceNamespace`: The namespace of the AWS service that provides the resource. For a resource provided by your own application or service, use custom-resource instead.
 
@@ -26,7 +26,7 @@ delete_scaling_policy(PolicyName, ResourceId, ScalableDimension, ServiceNamespac
 Deletes the specified scheduled action for an Application Auto Scaling scalable target. For more information, see Delete a Scheduled Action in the Application Auto Scaling User Guide.
 
 # Required Parameters
-- `ResourceId`: The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension. This string consists of the service namespace, resource type, and scaling property.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 - `ScheduledActionName`: The name of the scheduled action.
 - `ServiceNamespace`: The namespace of the AWS service that provides the resource. For a resource provided by your own application or service, use custom-resource instead.
@@ -42,7 +42,7 @@ delete_scheduled_action(ResourceId, ScalableDimension, ScheduledActionName, Serv
 Deregisters an Application Auto Scaling scalable target when you have finished using it. To see which resources have been registered, use DescribeScalableTargets.   Deregistering a scalable target deletes the scaling policies and the scheduled actions that are associated with it. 
 
 # Required Parameters
-- `ResourceId`: The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 - `ServiceNamespace`: The namespace of the AWS service that provides the resource. For a resource provided by your own application or service, use custom-resource instead.
 
@@ -62,7 +62,7 @@ Gets information about the scalable targets in the specified namespace. You can
 # Optional Parameters
 - `MaxResults`: The maximum number of scalable targets. This value can be between 1 and 50. The default value is 50. If this parameter is used, the operation returns up to MaxResults results at a time, along with a NextToken value. To get the next set of results, include the NextToken value in a subsequent call. If this parameter is not used, the operation returns up to 50 results and a NextToken value, if applicable.
 - `NextToken`: The token for the next set of results.
-- `ResourceIds`: The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceIds`: The identifier of the resource associated with the scalable target. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 """
 
@@ -80,7 +80,7 @@ Provides descriptive information about the scaling activities in the specified n
 # Optional Parameters
 - `MaxResults`: The maximum number of scalable targets. This value can be between 1 and 50. The default value is 50. If this parameter is used, the operation returns up to MaxResults results at a time, along with a NextToken value. To get the next set of results, include the NextToken value in a subsequent call. If this parameter is not used, the operation returns up to 50 results and a NextToken value, if applicable.
 - `NextToken`: The token for the next set of results.
-- `ResourceId`: The identifier of the resource associated with the scaling activity. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource associated with the scaling activity. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 """
 
@@ -99,7 +99,7 @@ Describes the Application Auto Scaling scaling policies for the specified servic
 - `MaxResults`: The maximum number of scalable targets. This value can be between 1 and 50. The default value is 50. If this parameter is used, the operation returns up to MaxResults results at a time, along with a NextToken value. To get the next set of results, include the NextToken value in a subsequent call. If this parameter is not used, the operation returns up to 50 results and a NextToken value, if applicable.
 - `NextToken`: The token for the next set of results.
 - `PolicyNames`: The names of the scaling policies to describe.
-- `ResourceId`: The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 """
 
@@ -117,7 +117,7 @@ Describes the Application Auto Scaling scheduled actions for the specified servi
 # Optional Parameters
 - `MaxResults`: The maximum number of scheduled action results. This value can be between 1 and 50. The default value is 50. If this parameter is used, the operation returns up to MaxResults results at a time, along with a NextToken value. To get the next set of results, include the NextToken value in a subsequent call. If this parameter is not used, the operation returns up to 50 results and a NextToken value, if applicable.
 - `NextToken`: The token for the next set of results.
-- `ResourceId`: The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier. If you specify a scalable dimension, you must also specify a resource ID.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension. This string consists of the service namespace, resource type, and scaling property. If you specify a scalable dimension, you must also specify a resource ID.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 - `ScheduledActionNames`: The names of the scheduled actions to describe.
 """
@@ -132,7 +132,7 @@ Creates or updates a scaling policy for an Application Auto Scaling scalable tar
 
 # Required Parameters
 - `PolicyName`: The name of the scaling policy.
-- `ResourceId`: The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource associated with the scaling policy. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension. This string consists of the service namespace, resource type, and scaling property.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 - `ServiceNamespace`: The namespace of the AWS service that provides the resource. For a resource provided by your own application or service, use custom-resource instead.
 
@@ -151,7 +151,7 @@ put_scaling_policy(PolicyName, ResourceId, ScalableDimension, ServiceNamespace,
 Creates or updates a scheduled action for an Application Auto Scaling scalable target. Each scalable target is identified by a service namespace, resource ID, and scalable dimension. A scheduled action applies to the scalable target identified by those three attributes. You cannot create a scheduled action until you have registered the resource as a scalable target. When start and end times are specified with a recurring schedule using a cron expression or rates, they form the boundaries of when the recurring action starts and stops. To update a scheduled action, specify the parameters that you want to change. If you don't specify start and end times, the old values are deleted. For more information, see Scheduled Scaling in the Application Auto Scaling User Guide.  If a scalable target is deregistered, the scalable target is no longer available to run scheduled actions. Any scheduled actions that were specified for the scalable target are deleted. 
 
 # Required Parameters
-- `ResourceId`: The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource associated with the scheduled action. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension. This string consists of the service namespace, resource type, and scaling property.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 - `ScheduledActionName`: The name of the scheduled action. This name must be unique among all other scheduled actions on the specified scalable target. 
 - `ServiceNamespace`: The namespace of the AWS service that provides the resource. For a resource provided by your own application or service, use custom-resource instead.
@@ -172,7 +172,7 @@ put_scheduled_action(ResourceId, ScalableDimension, ScheduledActionName, Service
 Registers or updates a scalable target.  A scalable target is a resource that Application Auto Scaling can scale out and scale in. Scalable targets are uniquely identified by the combination of resource ID, scalable dimension, and namespace.  When you register a new scalable target, you must specify values for minimum and maximum capacity. Application Auto Scaling scaling policies will not scale capacity to values that are outside of this range. After you register a scalable target, you do not need to register it again to use other Application Auto Scaling operations. To see which resources have been registered, use DescribeScalableTargets. You can also view the scaling policies for a service namespace by using DescribeScalableTargets. If you no longer need a scalable target, you can deregister it by using DeregisterScalableTarget. To update a scalable target, specify the parameters that you want to change. Include the parameters that identify the scalable target: resource ID, scalable dimension, and namespace. Any parameters that you don't specify are not changed by this update request. 
 
 # Required Parameters
-- `ResourceId`: The identifier of the resource that is associated with the scalable target. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not  LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
+- `ResourceId`: The identifier of the resource that is associated with the scalable target. This string consists of the resource type and unique identifier.   ECS service - The resource type is service and the unique identifier is the cluster name and service name. Example: service/default/sample-webapp.   Spot Fleet request - The resource type is spot-fleet-request and the unique identifier is the Spot Fleet request ID. Example: spot-fleet-request/sfr-73fbd2ce-aa30-494c-8788-1cee4EXAMPLE.   EMR cluster - The resource type is instancegroup and the unique identifier is the cluster ID and instance group ID. Example: instancegroup/j-2EEZNYKUA1NTV/ig-1791Y4E1L8YI0.   AppStream 2.0 fleet - The resource type is fleet and the unique identifier is the fleet name. Example: fleet/sample-fleet.   DynamoDB table - The resource type is table and the unique identifier is the table name. Example: table/my-table.   DynamoDB global secondary index - The resource type is index and the unique identifier is the index name. Example: table/my-table/index/my-table-index.   Aurora DB cluster - The resource type is cluster and the unique identifier is the cluster name. Example: cluster:my-db-cluster.   Amazon SageMaker endpoint variant - The resource type is variant and the unique identifier is the resource ID. Example: endpoint/my-end-point/variant/KMeansClustering.   Custom resources are not supported with a resource type. This parameter must specify the OutputValue from the CloudFormation template stack used to access the resources. The unique identifier is defined by the service provider. More information is available in our GitHub repository.   Amazon Comprehend document classification endpoint - The resource type and unique identifier are specified using the endpoint ARN. Example: arn:aws:comprehend:us-west-2:123456789012:document-classifier-endpoint/EXAMPLE.   Lambda provisioned concurrency - The resource type is function and the unique identifier is the function name with a function version or alias name suffix that is not LATEST. Example: function:my-function:prod or function:my-function:1.   Amazon Keyspaces table - The resource type is table and the unique identifier is the table name. Example: keyspace/mykeyspace/table/mytable.  
 - `ScalableDimension`: The scalable dimension associated with the scalable target. This string consists of the service namespace, resource type, and scaling property.    ecs:service:DesiredCount - The desired task count of an ECS service.    ec2:spot-fleet-request:TargetCapacity - The target capacity of a Spot Fleet request.    elasticmapreduce:instancegroup:InstanceCount - The instance count of an EMR Instance Group.    appstream:fleet:DesiredCapacity - The desired capacity of an AppStream 2.0 fleet.    dynamodb:table:ReadCapacityUnits - The provisioned read capacity for a DynamoDB table.    dynamodb:table:WriteCapacityUnits - The provisioned write capacity for a DynamoDB table.    dynamodb:index:ReadCapacityUnits - The provisioned read capacity for a DynamoDB global secondary index.    dynamodb:index:WriteCapacityUnits - The provisioned write capacity for a DynamoDB global secondary index.    rds:cluster:ReadReplicaCount - The count of Aurora Replicas in an Aurora DB cluster. Available for Aurora MySQL-compatible edition and Aurora PostgreSQL-compatible edition.    sagemaker:variant:DesiredInstanceCount - The number of EC2 instances for an Amazon SageMaker model endpoint variant.    custom-resource:ResourceType:Property - The scalable dimension for a custom resource provided by your own application or service.    comprehend:document-classifier-endpoint:DesiredInferenceUnits - The number of inference units for an Amazon Comprehend document classification endpoint.    lambda:function:ProvisionedConcurrency - The provisioned concurrency for a Lambda function.    cassandra:table:ReadCapacityUnits - The provisioned read capacity for an Amazon Keyspaces table.    cassandra:table:WriteCapacityUnits - The provisioned write capacity for an Amazon Keyspaces table.  
 - `ServiceNamespace`: The namespace of the AWS service that provides the resource. For a resource provided by your own application or service, use custom-resource instead.
 
diff --git a/src/services/application_discovery_service.jl b/src/services/application_discovery_service.jl
index 5473840088..205e241ab4 100644
--- a/src/services/application_discovery_service.jl
+++ b/src/services/application_discovery_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: application_discovery_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateConfigurationItemsToApplication()
 
@@ -97,7 +97,7 @@ Lists agents or connectors as specified by ID or other filters. All agents/conne
 - `agentIds`: The agent or the Connector IDs for which you want information. If you specify no IDs, the system returns information about all agents/Connectors associated with your AWS user account.
 - `filters`: You can filter the request using various logical operators and a key-value format. For example:   {\"key\": \"collectionStatus\", \"value\": \"STARTED\"} 
 - `maxResults`: The total number of agents/Connectors to return in a single page of output. The maximum value is 100.
-- `nextToken`: Token to retrieve the next set of results. For example, if you previously specified 100 IDs for DescribeAgentsRequest agentIds but set DescribeAgentsRequest maxResults to 10, you received a set of 10 results along with a token. Use that token in this query to get the next set of 10.
+- `nextToken`: Token to retrieve the next set of results. For example, if you previously specified 100 IDs for DescribeAgentsRequestagentIds but set DescribeAgentsRequestmaxResults to 10, you received a set of 10 results along with a token. Use that token in this query to get the next set of 10.
 """
 
 describe_agents(; aws_config::AWSConfig=global_aws_config()) = application_discovery_service("DescribeAgents"; aws_config=aws_config)
@@ -232,7 +232,7 @@ Retrieves a list of configuration items as specified by the value passed to the
 # Optional Parameters
 - `filters`: You can filter the request using various logical operators and a key-value format. For example:   {\"key\": \"serverType\", \"value\": \"webServer\"}  For a complete list of filter options and guidance about using them with this action, see Using the ListConfigurations Action in the AWS Application Discovery Service User Guide.
 - `maxResults`: The total number of items to return. The maximum value is 100.
-- `nextToken`: Token to retrieve the next set of results. For example, if a previous call to ListConfigurations returned 100 items, but you set ListConfigurationsRequest maxResults to 10, you received a set of 10 results along with a token. Use that token in this query to get the next set of 10.
+- `nextToken`: Token to retrieve the next set of results. For example, if a previous call to ListConfigurations returned 100 items, but you set ListConfigurationsRequestmaxResults to 10, you received a set of 10 results along with a token. Use that token in this query to get the next set of 10.
 - `orderBy`: Certain filter criteria return output that can be sorted in ascending or descending order. For a list of output characteristics for each filter, see Using the ListConfigurations Action in the AWS Application Discovery Service User Guide.
 """
 
@@ -250,7 +250,7 @@ Retrieves a list of servers that are one network hop away from a specified serve
 # Optional Parameters
 - `maxResults`: Maximum number of results to return in a single page of output.
 - `neighborConfigurationIds`: List of configuration IDs to test for one-hop-away.
-- `nextToken`: Token to retrieve the next set of results. For example, if you previously specified 100 IDs for ListServerNeighborsRequest neighborConfigurationIds but set ListServerNeighborsRequest maxResults to 10, you received a set of 10 results along with a token. Use that token in this query to get the next set of 10.
+- `nextToken`: Token to retrieve the next set of results. For example, if you previously specified 100 IDs for ListServerNeighborsRequestneighborConfigurationIds but set ListServerNeighborsRequestmaxResults to 10, you received a set of 10 results along with a token. Use that token in this query to get the next set of 10.
 - `portInformationNeeded`: Flag to indicate if port and protocol information is needed as part of the response.
 """
 
diff --git a/src/services/application_insights.jl b/src/services/application_insights.jl
index f2c426d562..8e3bbd3c7a 100644
--- a/src/services/application_insights.jl
+++ b/src/services/application_insights.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: application_insights
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApplication()
 
diff --git a/src/services/appstream.jl b/src/services/appstream.jl
index dd93744f9b..db82dc3693 100644
--- a/src/services/appstream.jl
+++ b/src/services/appstream.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: appstream
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateFleet()
 
@@ -100,7 +100,7 @@ Creates a fleet. A fleet consists of streaming instances that run a specified im
 - `ImageName`: The name of the image used to create the fleet.
 - `MaxUserDurationInSeconds`: The maximum amount of time that a streaming session can remain active, in seconds. If users are still connected to a streaming instance five minutes before this limit is reached, they are prompted to save any open documents before being disconnected. After this time elapses, the instance is terminated and replaced by a new instance. Specify a value between 600 and 360000.
 - `StreamView`: The AppStream 2.0 view that is displayed to your users when they stream from the fleet. When APP is specified, only the windows of applications opened by users display. When DESKTOP is specified, the standard desktop that is provided by the operating system displays. The default value is APP.
-- `Tags`: The tags to associate with the fleet. A tag is a key-value pair, and the value is optional. For example, Environment=Test. If you do not specify a value, Environment=.  If you do not specify a value, the value is set to an empty string. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following special characters:  _ . : / = +   - @ For more information, see Tagging Your Resources in the Amazon AppStream 2.0 Administration Guide.
+- `Tags`: The tags to associate with the fleet. A tag is a key-value pair, and the value is optional. For example, Environment=Test. If you do not specify a value, Environment=.  If you do not specify a value, the value is set to an empty string. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following special characters:  _ . : / = +  - @ For more information, see Tagging Your Resources in the Amazon AppStream 2.0 Administration Guide.
 - `VpcConfig`: The VPC configuration for the fleet.
 """
 
@@ -126,7 +126,7 @@ Creates an image builder. An image builder is a virtual machine that is used to
 - `IamRoleArn`: The Amazon Resource Name (ARN) of the IAM role to apply to the image builder. To assume a role, the image builder calls the AWS Security Token Service (STS) AssumeRole API operation and passes the ARN of the role to use. The operation creates a new session with temporary credentials. AppStream 2.0 retrieves the temporary credentials and creates the appstream_machine_role credential profile on the instance. For more information, see Using an IAM Role to Grant Permissions to Applications and Scripts Running on AppStream 2.0 Streaming Instances in the Amazon AppStream 2.0 Administration Guide.
 - `ImageArn`: The ARN of the public, private, or shared image to use.
 - `ImageName`: The name of the image used to create the image builder.
-- `Tags`: The tags to associate with the image builder. A tag is a key-value pair, and the value is optional. For example, Environment=Test. If you do not specify a value, Environment=.  Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following special characters:  _ . : / = +   - @ If you do not specify a value, the value is set to an empty string. For more information about tags, see Tagging Your Resources in the Amazon AppStream 2.0 Administration Guide.
+- `Tags`: The tags to associate with the image builder. A tag is a key-value pair, and the value is optional. For example, Environment=Test. If you do not specify a value, Environment=.  Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following special characters:  _ . : / = +  - @ If you do not specify a value, the value is set to an empty string. For more information about tags, see Tagging Your Resources in the Amazon AppStream 2.0 Administration Guide.
 - `VpcConfig`: The VPC configuration for the image builder. You can specify only one subnet.
 """
 
@@ -165,7 +165,7 @@ Creates a stack to start streaming applications to users. A stack consists of an
 - `FeedbackURL`: The URL that users are redirected to after they click the Send Feedback link. If no URL is specified, no Send Feedback link is displayed.
 - `RedirectURL`: The URL that users are redirected to after their streaming session ends.
 - `StorageConnectors`: The storage connectors to enable.
-- `Tags`: The tags to associate with the stack. A tag is a key-value pair, and the value is optional. For example, Environment=Test. If you do not specify a value, Environment=.  If you do not specify a value, the value is set to an empty string. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following special characters:  _ . : / = +   - @ For more information about tags, see Tagging Your Resources in the Amazon AppStream 2.0 Administration Guide.
+- `Tags`: The tags to associate with the stack. A tag is a key-value pair, and the value is optional. For example, Environment=Test. If you do not specify a value, Environment=.  If you do not specify a value, the value is set to an empty string. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following special characters:  _ . : / = +  - @ For more information about tags, see Tagging Your Resources in the Amazon AppStream 2.0 Administration Guide.
 - `UserSettings`: The actions that are enabled or disabled for users during their streaming sessions. By default, these actions are enabled. 
 """
 
@@ -632,7 +632,7 @@ Adds or overwrites one or more tags for the specified AppStream 2.0 resource. Yo
 
 # Required Parameters
 - `ResourceArn`: The Amazon Resource Name (ARN) of the resource.
-- `Tags`: The tags to associate. A tag is a key-value pair, and the value is optional. For example, Environment=Test. If you do not specify a value, Environment=.  If you do not specify a value, the value is set to an empty string. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following special characters:  _ . : / = +   - @
+- `Tags`: The tags to associate. A tag is a key-value pair, and the value is optional. For example, Environment=Test. If you do not specify a value, Environment=.  If you do not specify a value, the value is set to an empty string. Generally allowed characters are: letters, numbers, and spaces representable in UTF-8, and the following special characters:  _ . : / = +  - @
 
 """
 
diff --git a/src/services/appsync.jl b/src/services/appsync.jl
index d3f637a645..1b2a6f392e 100644
--- a/src/services/appsync.jl
+++ b/src/services/appsync.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: appsync
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApiCache()
 
diff --git a/src/services/athena.jl b/src/services/athena.jl
index 971cec8d8f..f9852fcf25 100644
--- a/src/services/athena.jl
+++ b/src/services/athena.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: athena
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchGetNamedQuery()
 
@@ -20,7 +20,7 @@ batch_get_named_query(NamedQueryIds, args::AbstractDict{String, <:Any}; aws_conf
 """
     BatchGetQueryExecution()
 
-Returns the details of a single query execution or a list of up to 50 query executions, which you provide as an array of query execution ID strings. Requires you to have access to the workgroup in which the queries ran. To get a list of query execution IDs, use ListQueryExecutionsInput WorkGroup. Query executions differ from named (saved) queries. Use BatchGetNamedQueryInput to get details about named queries.
+Returns the details of a single query execution or a list of up to 50 query executions, which you provide as an array of query execution ID strings. Requires you to have access to the workgroup in which the queries ran. To get a list of query execution IDs, use ListQueryExecutionsInputWorkGroup. Query executions differ from named (saved) queries. Use BatchGetNamedQueryInput to get details about named queries.
 
 # Required Parameters
 - `QueryExecutionIds`: An array of query execution IDs.
@@ -76,7 +76,7 @@ Creates a workgroup with the specified name.
 - `Name`: The workgroup name.
 
 # Optional Parameters
-- `Configuration`: The configuration for the workgroup, which includes the location in Amazon S3 where query results are stored, the encryption configuration, if any, used for encrypting query results, whether the Amazon CloudWatch Metrics are enabled for the workgroup, the limit for the amount of bytes scanned (cutoff) per query, if it is specified, and whether workgroup's settings (specified with EnforceWorkGroupConfiguration) in the WorkGroupConfiguration override client-side settings. See WorkGroupConfiguration EnforceWorkGroupConfiguration.
+- `Configuration`: The configuration for the workgroup, which includes the location in Amazon S3 where query results are stored, the encryption configuration, if any, used for encrypting query results, whether the Amazon CloudWatch Metrics are enabled for the workgroup, the limit for the amount of bytes scanned (cutoff) per query, if it is specified, and whether workgroup's settings (specified with EnforceWorkGroupConfiguration) in the WorkGroupConfiguration override client-side settings. See WorkGroupConfigurationEnforceWorkGroupConfiguration.
 - `Description`: The workgroup description.
 - `Tags`: A list of comma separated tags to add to the workgroup that is created.
 """
@@ -337,7 +337,7 @@ Runs the SQL query statements contained in the Query. Requires you to have acces
 # Optional Parameters
 - `ClientRequestToken`: A unique case-sensitive string used to ensure the request to create the query is idempotent (executes only once). If another StartQueryExecution request is received, the same response is returned and another query is not created. If a parameter has changed, for example, the QueryString, an error is returned.  This token is listed as not required because AWS SDKs (for example the AWS SDK for Java) auto-generate the token for users. If you are not using the AWS SDK or the AWS CLI, you must provide this token or the action will fail. 
 - `QueryExecutionContext`: The database within which the query executes.
-- `ResultConfiguration`: Specifies information about where and how to save the results of the query execution. If the query runs in a workgroup, then workgroup's settings may override query settings. This affects the query results location. The workgroup settings override is specified in EnforceWorkGroupConfiguration (true/false) in the WorkGroupConfiguration. See WorkGroupConfiguration EnforceWorkGroupConfiguration.
+- `ResultConfiguration`: Specifies information about where and how to save the results of the query execution. If the query runs in a workgroup, then workgroup's settings may override query settings. This affects the query results location. The workgroup settings override is specified in EnforceWorkGroupConfiguration (true/false) in the WorkGroupConfiguration. See WorkGroupConfigurationEnforceWorkGroupConfiguration.
 - `WorkGroup`: The name of the workgroup in which the query is being started.
 """
 
diff --git a/src/services/auto_scaling.jl b/src/services/auto_scaling.jl
index 9dfb03e5a4..586937c40f 100644
--- a/src/services/auto_scaling.jl
+++ b/src/services/auto_scaling.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: auto_scaling
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AttachInstances()
 
diff --git a/src/services/auto_scaling_plans.jl b/src/services/auto_scaling_plans.jl
index f0795400d8..666c8e8456 100644
--- a/src/services/auto_scaling_plans.jl
+++ b/src/services/auto_scaling_plans.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: auto_scaling_plans
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateScalingPlan()
 
diff --git a/src/services/backup.jl b/src/services/backup.jl
index 239ccc5352..bf054f4add 100644
--- a/src/services/backup.jl
+++ b/src/services/backup.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: backup
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateBackupPlan()
 
diff --git a/src/services/batch.jl b/src/services/batch.jl
index 0b67831d79..8d1c5d3fc8 100644
--- a/src/services/batch.jl
+++ b/src/services/batch.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: batch
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelJob()
 
diff --git a/src/services/braket.jl b/src/services/braket.jl
index ef8a959d53..db602de723 100644
--- a/src/services/braket.jl
+++ b/src/services/braket.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: braket
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelQuantumTask()
 
diff --git a/src/services/budgets.jl b/src/services/budgets.jl
index 7fe2c264cd..eff74ef062 100644
--- a/src/services/budgets.jl
+++ b/src/services/budgets.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: budgets
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateBudget()
 
diff --git a/src/services/chime.jl b/src/services/chime.jl
index 345ebc9239..b460db21dc 100644
--- a/src/services/chime.jl
+++ b/src/services/chime.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: chime
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociatePhoneNumberWithUser()
 
@@ -334,7 +334,7 @@ create_user(accountId, args::AbstractDict{String, <:Any}; aws_config::AWSConfig=
 """
     CreateVoiceConnector()
 
-Creates an Amazon Chime Voice Connector under the administrator's AWS account. You can choose to create an Amazon Chime Voice Connector in a specific AWS Region. Enabling CreateVoiceConnectorRequest RequireEncryption configures your Amazon Chime Voice Connector to use TLS transport for SIP signaling and Secure RTP (SRTP) for media. Inbound calls use TLS transport, and unencrypted outbound calls are blocked.
+Creates an Amazon Chime Voice Connector under the administrator's AWS account. You can choose to create an Amazon Chime Voice Connector in a specific AWS Region. Enabling CreateVoiceConnectorRequestRequireEncryption configures your Amazon Chime Voice Connector to use TLS transport for SIP signaling and Secure RTP (SRTP) for media. Inbound calls use TLS transport, and unencrypted outbound calls are blocked.
 
 # Required Parameters
 - `Name`: The name of the Amazon Chime Voice Connector.
diff --git a/src/services/cloud9.jl b/src/services/cloud9.jl
index d85da67d81..4079374c1d 100644
--- a/src/services/cloud9.jl
+++ b/src/services/cloud9.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloud9
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateEnvironmentEC2()
 
diff --git a/src/services/clouddirectory.jl b/src/services/clouddirectory.jl
index 9b63418223..52356a7f83 100644
--- a/src/services/clouddirectory.jl
+++ b/src/services/clouddirectory.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: clouddirectory
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddFacetToObject()
 
@@ -706,7 +706,7 @@ Lists parent objects that are associated with a given object in pagination fashi
 - `x-amz-data-partition`: The Amazon Resource Name (ARN) that is associated with the Directory where the object resides. For more information, see arns.
 
 # Optional Parameters
-- `IncludeAllLinksToEachParent`: When set to True, returns all ListObjectParentsResponse ParentLinks. There could be multiple links between a parent-child pair.
+- `IncludeAllLinksToEachParent`: When set to True, returns all ListObjectParentsResponseParentLinks. There could be multiple links between a parent-child pair.
 - `MaxResults`: The maximum number of items to be retrieved in a single call. This is an approximate number.
 - `NextToken`: The pagination token.
 - `x-amz-consistency-level`: Represents the manner and timing in which the successful write or update of an object is reflected in a subsequent read operation of that same object.
@@ -936,7 +936,7 @@ Does the following:   Adds new Attributes, Rules, or ObjectTypes.   Updates exis
 
 # Optional Parameters
 - `AttributeUpdates`: List of attributes that need to be updated in a given schema Facet. Each attribute is followed by AttributeAction, which specifies the type of update operation to perform. 
-- `ObjectType`: The object type that is associated with the facet. See CreateFacetRequest ObjectType for more details.
+- `ObjectType`: The object type that is associated with the facet. See CreateFacetRequestObjectType for more details.
 """
 
 update_facet(Name, x_amz_data_partition; aws_config::AWSConfig=global_aws_config()) = clouddirectory("PUT", "/amazonclouddirectory/2017-01-11/facet", Dict{String, Any}("Name"=>Name, "headers"=>Dict{String, Any}("x-amz-data-partition"=>x_amz_data_partition)); aws_config=aws_config)
diff --git a/src/services/cloudformation.jl b/src/services/cloudformation.jl
index 5292f6bc0f..801f53ab5a 100644
--- a/src/services/cloudformation.jl
+++ b/src/services/cloudformation.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudformation
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelUpdateStack()
 
diff --git a/src/services/cloudfront.jl b/src/services/cloudfront.jl
index f0b1d3a6a4..69e3d91550 100644
--- a/src/services/cloudfront.jl
+++ b/src/services/cloudfront.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudfront
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateCachePolicy2020_05_31()
 
diff --git a/src/services/cloudhsm.jl b/src/services/cloudhsm.jl
index 80f1608473..5e012a20ae 100644
--- a/src/services/cloudhsm.jl
+++ b/src/services/cloudhsm.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudhsm
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTagsToResource()
 
diff --git a/src/services/cloudhsm_v2.jl b/src/services/cloudhsm_v2.jl
index ce0e9c58c0..be603cb9e2 100644
--- a/src/services/cloudhsm_v2.jl
+++ b/src/services/cloudhsm_v2.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudhsm_v2
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CopyBackupToRegion()
 
diff --git a/src/services/cloudsearch.jl b/src/services/cloudsearch.jl
index 6eb08671c3..94f1b8b2cc 100644
--- a/src/services/cloudsearch.jl
+++ b/src/services/cloudsearch.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudsearch
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BuildSuggesters()
 
diff --git a/src/services/cloudsearch_domain.jl b/src/services/cloudsearch_domain.jl
index ea184b1b7f..5b4ed78cda 100644
--- a/src/services/cloudsearch_domain.jl
+++ b/src/services/cloudsearch_domain.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudsearch_domain
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     Search()
 
@@ -19,7 +19,7 @@ Retrieves a list of documents that match the specified search criteria. How you
 - `fq`: Specifies a structured query that filters the results of a search without affecting how the results are scored and sorted. You use filterQuery in conjunction with the query parameter to filter the documents that match the constraints specified in the query parameter. Specifying a filter controls only which matching documents are included in the results, it has no effect on how they are scored and sorted. The filterQuery parameter supports the full structured query syntax.  For more information about using filters, see Filtering Matching Documents in the Amazon CloudSearch Developer Guide.
 - `highlight`: Retrieves highlights for matches in the specified text or text-array fields. Each specified field must be highlight enabled in the domain configuration. The fields and options are specified in JSON using the form {\"FIELD\":{\"OPTION\":VALUE,\"OPTION:\"STRING\"},\"FIELD\":{\"OPTION\":VALUE,\"OPTION\":\"STRING\"}}. You can specify the following highlight options:   format: specifies the format of the data in the text field: text or html. When data is returned as HTML, all non-alphanumeric characters are encoded. The default is html.   max_phrases: specifies the maximum number of occurrences of the search term(s) you want to highlight. By default, the first occurrence is highlighted.   pre_tag: specifies the string to prepend to an occurrence of a search term. The default for HTML highlights is &amp;lt;em&amp;gt;. The default for text highlights is *.   post_tag: specifies the string to append to an occurrence of a search term. The default for HTML highlights is &amp;lt;/em&amp;gt;. The default for text highlights is *.   If no highlight options are specified for a field, the returned field text is treated as HTML and the first match is highlighted with emphasis tags: &amp;lt;em&gt;search-term&amp;lt;/em&amp;gt;. For example, the following request retrieves highlights for the actors and title fields.  { \"actors\": {}, \"title\": {\"format\": \"text\",\"max_phrases\": 2,\"pre_tag\": \"\",\"post_tag\": \"\"} }
 - `partial`: Enables partial results to be returned if one or more index partitions are unavailable. When your search index is partitioned across multiple search instances, by default Amazon CloudSearch only returns results if every partition can be queried. This means that the failure of a single search instance can result in 5xx (internal server) errors. When you enable partial results, Amazon CloudSearch returns whatever results are available and includes the percentage of documents searched in the search results (percent-searched). This enables you to more gracefully degrade your users' search experience. For example, rather than displaying no results, you could display the partial results and a message indicating that the results might be incomplete due to a temporary system outage.
-- `q.options`: Configures options for the query parser specified in the queryParser parameter. You specify the options in JSON using the following form {\"OPTION1\":\"VALUE1\",\"OPTION2\":VALUE2\"...\"OPTIONN\":\"VALUEN\"}. The options you can configure vary according to which parser you use:  defaultOperator: The default operator used to combine individual terms in the search string. For example: defaultOperator: 'or'. For the dismax parser, you specify a percentage that represents the percentage of terms in the search string (rounded down) that must match, rather than a default operator. A value of 0% is the equivalent to OR, and a value of 100% is equivalent to AND. The percentage must be specified as a value in the range 0-100 followed by the percent (%) symbol. For example, defaultOperator: 50%. Valid values: and, or, a percentage in the range 0%-100% (dismax). Default: and (simple, structured, lucene) or 100 (dismax). Valid for: simple, structured, lucene, and dismax. fields: An array of the fields to search when no fields are specified in a search. If no fields are specified in a search and this option is not specified, all text and text-array fields are searched. You can specify a weight for each field to control the relative importance of each field when Amazon CloudSearch calculates relevance scores. To specify a field weight, append a caret (^) symbol and the weight to the field name. For example, to boost the importance of the title field over the description field you could specify: \"fields\":[\"title^5\",\"description\"]. Valid values: The name of any configured field and an optional numeric value greater than zero. Default: All text and text-array fields. Valid for: simple, structured, lucene, and dismax. operators: An array of the operators or special characters you want to disable for the simple query parser. If you disable the and, or, or not operators, the corresponding operators (+, |, -) have no special meaning and are dropped from the search string. Similarly, disabling prefix disables the wildcard operator (*) and disabling phrase disables the ability to search for phrases by enclosing phrases in double quotes. Disabling precedence disables the ability to control order of precedence using parentheses. Disabling near disables the ability to use the ~ operator to perform a sloppy phrase search. Disabling the fuzzy operator disables the ability to use the ~ operator to perform a fuzzy search. escape disables the ability to use a backslash ( ) to escape special characters within the search string. Disabling whitespace is an advanced option that prevents the parser from tokenizing on whitespace, which can be useful for Vietnamese. (It prevents Vietnamese words from being split incorrectly.) For example, you could disable all operators other than the phrase operator to support just simple term and phrase queries: \"operators\":[\"and\",\"not\",\"or\", \"prefix\"]. Valid values: and, escape, fuzzy, near, not, or, phrase, precedence, prefix, whitespace. Default: All operators and special characters are enabled. Valid for: simple. phraseFields: An array of the text or text-array fields you want to use for phrase searches. When the terms in the search string appear in close proximity within a field, the field scores higher. You can specify a weight for each field to boost that score. The phraseSlop option controls how much the matches can deviate from the search string and still be boosted. To specify a field weight, append a caret (^) symbol and the weight to the field name. For example, to boost phrase matches in the title field over the abstract field, you could specify: \"phraseFields\":[\"title^3\", \"plot\"] Valid values: The name of any text or text-array field and an optional numeric value greater than zero. Default: No fields. If you don't specify any fields with phraseFields, proximity scoring is disabled even if phraseSlop is specified. Valid for: dismax. phraseSlop: An integer value that specifies how much matches can deviate from the search phrase and still be boosted according to the weights specified in the phraseFields option; for example, phraseSlop: 2. You must also specify phraseFields to enable proximity scoring. Valid values: positive integers. Default: 0. Valid for: dismax. explicitPhraseSlop: An integer value that specifies how much a match can deviate from the search phrase when the phrase is enclosed in double quotes in the search string. (Phrases that exceed this proximity distance are not considered a match.) For example, to specify a slop of three for dismax phrase queries, you would specify \"explicitPhraseSlop\":3. Valid values: positive integers. Default: 0. Valid for: dismax. tieBreaker: When a term in the search string is found in a document's field, a score is calculated for that field based on how common the word is in that field compared to other documents. If the term occurs in multiple fields within a document, by default only the highest scoring field contributes to the document's overall score. You can specify a tieBreaker value to enable the matches in lower-scoring fields to contribute to the document's score. That way, if two documents have the same max field score for a particular term, the score for the document that has matches in more fields will be higher. The formula for calculating the score with a tieBreaker is (max field score) + (tieBreaker) * (sum of the scores for the rest of the matching fields). Set tieBreaker to 0 to disregard all but the highest scoring field (pure max): \"tieBreaker\":0. Set to 1 to sum the scores from all fields (pure sum): \"tieBreaker\":1. Valid values: 0.0 to 1.0. Default: 0.0. Valid for: dismax.  
+- `q.options`: Configures options for the query parser specified in the queryParser parameter. You specify the options in JSON using the following form {\"OPTION1\":\"VALUE1\",\"OPTION2\":VALUE2\"...\"OPTIONN\":\"VALUEN\"}. The options you can configure vary according to which parser you use:  defaultOperator: The default operator used to combine individual terms in the search string. For example: defaultOperator: 'or'. For the dismax parser, you specify a percentage that represents the percentage of terms in the search string (rounded down) that must match, rather than a default operator. A value of 0% is the equivalent to OR, and a value of 100% is equivalent to AND. The percentage must be specified as a value in the range 0-100 followed by the percent (%) symbol. For example, defaultOperator: 50%. Valid values: and, or, a percentage in the range 0%-100% (dismax). Default: and (simple, structured, lucene) or 100 (dismax). Valid for: simple, structured, lucene, and dismax. fields: An array of the fields to search when no fields are specified in a search. If no fields are specified in a search and this option is not specified, all text and text-array fields are searched. You can specify a weight for each field to control the relative importance of each field when Amazon CloudSearch calculates relevance scores. To specify a field weight, append a caret (^) symbol and the weight to the field name. For example, to boost the importance of the title field over the description field you could specify: \"fields\":[\"title^5\",\"description\"]. Valid values: The name of any configured field and an optional numeric value greater than zero. Default: All text and text-array fields. Valid for: simple, structured, lucene, and dismax. operators: An array of the operators or special characters you want to disable for the simple query parser. If you disable the and, or, or not operators, the corresponding operators (+, |, -) have no special meaning and are dropped from the search string. Similarly, disabling prefix disables the wildcard operator (*) and disabling phrase disables the ability to search for phrases by enclosing phrases in double quotes. Disabling precedence disables the ability to control order of precedence using parentheses. Disabling near disables the ability to use the ~ operator to perform a sloppy phrase search. Disabling the fuzzy operator disables the ability to use the ~ operator to perform a fuzzy search. escape disables the ability to use a backslash () to escape special characters within the search string. Disabling whitespace is an advanced option that prevents the parser from tokenizing on whitespace, which can be useful for Vietnamese. (It prevents Vietnamese words from being split incorrectly.) For example, you could disable all operators other than the phrase operator to support just simple term and phrase queries: \"operators\":[\"and\",\"not\",\"or\", \"prefix\"]. Valid values: and, escape, fuzzy, near, not, or, phrase, precedence, prefix, whitespace. Default: All operators and special characters are enabled. Valid for: simple. phraseFields: An array of the text or text-array fields you want to use for phrase searches. When the terms in the search string appear in close proximity within a field, the field scores higher. You can specify a weight for each field to boost that score. The phraseSlop option controls how much the matches can deviate from the search string and still be boosted. To specify a field weight, append a caret (^) symbol and the weight to the field name. For example, to boost phrase matches in the title field over the abstract field, you could specify: \"phraseFields\":[\"title^3\", \"plot\"] Valid values: The name of any text or text-array field and an optional numeric value greater than zero. Default: No fields. If you don't specify any fields with phraseFields, proximity scoring is disabled even if phraseSlop is specified. Valid for: dismax. phraseSlop: An integer value that specifies how much matches can deviate from the search phrase and still be boosted according to the weights specified in the phraseFields option; for example, phraseSlop: 2. You must also specify phraseFields to enable proximity scoring. Valid values: positive integers. Default: 0. Valid for: dismax. explicitPhraseSlop: An integer value that specifies how much a match can deviate from the search phrase when the phrase is enclosed in double quotes in the search string. (Phrases that exceed this proximity distance are not considered a match.) For example, to specify a slop of three for dismax phrase queries, you would specify \"explicitPhraseSlop\":3. Valid values: positive integers. Default: 0. Valid for: dismax. tieBreaker: When a term in the search string is found in a document's field, a score is calculated for that field based on how common the word is in that field compared to other documents. If the term occurs in multiple fields within a document, by default only the highest scoring field contributes to the document's overall score. You can specify a tieBreaker value to enable the matches in lower-scoring fields to contribute to the document's score. That way, if two documents have the same max field score for a particular term, the score for the document that has matches in more fields will be higher. The formula for calculating the score with a tieBreaker is (max field score) + (tieBreaker) * (sum of the scores for the rest of the matching fields). Set tieBreaker to 0 to disregard all but the highest scoring field (pure max): \"tieBreaker\":0. Set to 1 to sum the scores from all fields (pure sum): \"tieBreaker\":1. Valid values: 0.0 to 1.0. Default: 0.0. Valid for: dismax.  
 - `q.parser`: Specifies which query parser to use to process the request. If queryParser is not specified, Amazon CloudSearch uses the simple query parser.  Amazon CloudSearch supports four query parsers:   simple: perform simple searches of text and text-array fields. By default, the simple query parser searches all text and text-array fields. You can specify which fields to search by with the queryOptions parameter. If you prefix a search term with a plus sign (+) documents must contain the term to be considered a match. (This is the default, unless you configure the default operator with the queryOptions parameter.) You can use the - (NOT), | (OR), and * (wildcard) operators to exclude particular terms, find results that match any of the specified terms, or search for a prefix. To search for a phrase rather than individual terms, enclose the phrase in double quotes. For more information, see Searching for Text in the Amazon CloudSearch Developer Guide.   structured: perform advanced searches by combining multiple expressions to define the search criteria. You can also search within particular fields, search for values and ranges of values, and use advanced options such as term boosting, matchall, and near. For more information, see Constructing Compound Queries in the Amazon CloudSearch Developer Guide.   lucene: search using the Apache Lucene query parser syntax. For more information, see Apache Lucene Query Parser Syntax.   dismax: search using the simplified subset of the Apache Lucene query parser syntax defined by the DisMax query parser. For more information, see DisMax Query Parser Syntax.  
 - `return`: Specifies the field and expression values to include in the response. Multiple fields or expressions are specified as a comma-separated list. By default, a search response includes all return enabled fields (_all_fields). To return only the document IDs for the matching documents, specify _no_fields. To retrieve the relevance score calculated for each document, specify _score. 
 - `size`: Specifies the maximum number of search hits to include in the response. 
diff --git a/src/services/cloudtrail.jl b/src/services/cloudtrail.jl
index af0cf51080..ccab0d3f3e 100644
--- a/src/services/cloudtrail.jl
+++ b/src/services/cloudtrail.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudtrail
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTags()
 
diff --git a/src/services/cloudwatch.jl b/src/services/cloudwatch.jl
index 184b2f5532..eef778a03b 100644
--- a/src/services/cloudwatch.jl
+++ b/src/services/cloudwatch.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudwatch
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteAlarms()
 
diff --git a/src/services/cloudwatch_events.jl b/src/services/cloudwatch_events.jl
index e5f40efc4c..ee19c4cd34 100644
--- a/src/services/cloudwatch_events.jl
+++ b/src/services/cloudwatch_events.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudwatch_events
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     ActivateEventSource()
 
@@ -376,7 +376,7 @@ put_rule(Name, args::AbstractDict{String, <:Any}; aws_config::AWSConfig=global_a
 """
     PutTargets()
 
-Adds the specified targets to the specified rule, or updates the targets if they are already associated with the rule. Targets are the resources that are invoked when a rule is triggered. You can configure the following as targets for Events:   EC2 instances   SSM Run Command   SSM Automation   AWS Lambda functions   Data streams in Amazon Kinesis Data Streams   Data delivery streams in Amazon Kinesis Data Firehose   Amazon ECS tasks   AWS Step Functions state machines   AWS Batch jobs   AWS CodeBuild projects   Pipelines in AWS CodePipeline   Amazon Inspector assessment templates   Amazon SNS topics   Amazon SQS queues, including FIFO queues   The default event bus of another AWS account   Amazon API Gateway REST APIs   Creating rules with built-in targets is supported only in the AWS Management Console. The built-in targets are EC2 CreateSnapshot API call, EC2 RebootInstances API call, EC2 StopInstances API call, and EC2 TerminateInstances API call.  For some target types, PutTargets provides target-specific parameters. If the target is a Kinesis data stream, you can optionally specify which shard the event goes to by using the KinesisParameters argument. To invoke a command on multiple EC2 instances with one rule, you can use the RunCommandParameters field. To be able to make API calls against the resources that you own, Amazon EventBridge (CloudWatch Events) needs the appropriate permissions. For AWS Lambda and Amazon SNS resources, EventBridge relies on resource-based policies. For EC2 instances, Kinesis data streams, AWS Step Functions state machines and API Gateway REST APIs, EventBridge relies on IAM roles that you specify in the RoleARN argument in PutTargets. For more information, see Authentication and Access Control in the Amazon EventBridge User Guide. If another AWS account is in the same region and has granted you permission (using PutPermission), you can send events to that account. Set that account's event bus as a target of the rules in your account. To send the matched events to the other account, specify that account's event bus as the Arn value when you run PutTargets. If your account sends events to another account, your account is charged for each sent event. Each event sent to another account is charged as a custom event. The account receiving the event is not charged. For more information, see Amazon EventBridge (CloudWatch Events) Pricing.   Input, InputPath, and InputTransformer are not available with PutTarget if the target is an event bus of a different AWS account.  If you are setting the event bus of another account as the target, and that account granted permission to your account through an organization instead of directly by the account ID, then you must specify a RoleArn with proper permissions in the Target structure. For more information, see Sending and Receiving Events Between AWS Accounts in the Amazon EventBridge User Guide. For more information about enabling cross-account events, see PutPermission.  Input, InputPath, and InputTransformer are mutually exclusive and optional parameters of a target. When a rule is triggered due to a matched event:   If none of the following arguments are specified for a target, then the entire event is passed to the target in JSON format (unless the target is Amazon EC2 Run Command or Amazon ECS task, in which case nothing from the event is passed to the target).   If Input is specified in the form of valid JSON, then the matched event is overridden with this constant.   If InputPath is specified in the form of JSONPath (for example,  .detail), then only the part of the event specified in the path is passed to the target (for example, only the detail part of the event is passed).   If InputTransformer is specified, then one or more specified JSONPaths are extracted from the event and used as values in a template that you specify as the input to the target.   When you specify InputPath or InputTransformer, you must use JSON dot notation, not bracket notation. When you add targets to a rule and the associated rule triggers soon after, new or updated targets might not be immediately invoked. Allow a short period of time for changes to take effect. This action can partially fail if too many requests are made at the same time. If that happens, FailedEntryCount is non-zero in the response and each entry in FailedEntries provides the ID of the failed target and the error code.
+Adds the specified targets to the specified rule, or updates the targets if they are already associated with the rule. Targets are the resources that are invoked when a rule is triggered. You can configure the following as targets for Events:   EC2 instances   SSM Run Command   SSM Automation   AWS Lambda functions   Data streams in Amazon Kinesis Data Streams   Data delivery streams in Amazon Kinesis Data Firehose   Amazon ECS tasks   AWS Step Functions state machines   AWS Batch jobs   AWS CodeBuild projects   Pipelines in AWS CodePipeline   Amazon Inspector assessment templates   Amazon SNS topics   Amazon SQS queues, including FIFO queues   The default event bus of another AWS account   Amazon API Gateway REST APIs   Creating rules with built-in targets is supported only in the AWS Management Console. The built-in targets are EC2 CreateSnapshot API call, EC2 RebootInstances API call, EC2 StopInstances API call, and EC2 TerminateInstances API call.  For some target types, PutTargets provides target-specific parameters. If the target is a Kinesis data stream, you can optionally specify which shard the event goes to by using the KinesisParameters argument. To invoke a command on multiple EC2 instances with one rule, you can use the RunCommandParameters field. To be able to make API calls against the resources that you own, Amazon EventBridge (CloudWatch Events) needs the appropriate permissions. For AWS Lambda and Amazon SNS resources, EventBridge relies on resource-based policies. For EC2 instances, Kinesis data streams, AWS Step Functions state machines and API Gateway REST APIs, EventBridge relies on IAM roles that you specify in the RoleARN argument in PutTargets. For more information, see Authentication and Access Control in the Amazon EventBridge User Guide. If another AWS account is in the same region and has granted you permission (using PutPermission), you can send events to that account. Set that account's event bus as a target of the rules in your account. To send the matched events to the other account, specify that account's event bus as the Arn value when you run PutTargets. If your account sends events to another account, your account is charged for each sent event. Each event sent to another account is charged as a custom event. The account receiving the event is not charged. For more information, see Amazon EventBridge (CloudWatch Events) Pricing.   Input, InputPath, and InputTransformer are not available with PutTarget if the target is an event bus of a different AWS account.  If you are setting the event bus of another account as the target, and that account granted permission to your account through an organization instead of directly by the account ID, then you must specify a RoleArn with proper permissions in the Target structure. For more information, see Sending and Receiving Events Between AWS Accounts in the Amazon EventBridge User Guide. For more information about enabling cross-account events, see PutPermission.  Input, InputPath, and InputTransformer are mutually exclusive and optional parameters of a target. When a rule is triggered due to a matched event:   If none of the following arguments are specified for a target, then the entire event is passed to the target in JSON format (unless the target is Amazon EC2 Run Command or Amazon ECS task, in which case nothing from the event is passed to the target).   If Input is specified in the form of valid JSON, then the matched event is overridden with this constant.   If InputPath is specified in the form of JSONPath (for example, .detail), then only the part of the event specified in the path is passed to the target (for example, only the detail part of the event is passed).   If InputTransformer is specified, then one or more specified JSONPaths are extracted from the event and used as values in a template that you specify as the input to the target.   When you specify InputPath or InputTransformer, you must use JSON dot notation, not bracket notation. When you add targets to a rule and the associated rule triggers soon after, new or updated targets might not be immediately invoked. Allow a short period of time for changes to take effect. This action can partially fail if too many requests are made at the same time. If that happens, FailedEntryCount is non-zero in the response and each entry in FailedEntries provides the ID of the failed target and the error code.
 
 # Required Parameters
 - `Rule`: The name of the rule.
diff --git a/src/services/cloudwatch_logs.jl b/src/services/cloudwatch_logs.jl
index edcbbfbb89..49c2aa8ded 100644
--- a/src/services/cloudwatch_logs.jl
+++ b/src/services/cloudwatch_logs.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cloudwatch_logs
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateKmsKey()
 
diff --git a/src/services/codeartifact.jl b/src/services/codeartifact.jl
index 4466d113d1..90f3b96183 100644
--- a/src/services/codeartifact.jl
+++ b/src/services/codeartifact.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codeartifact
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateExternalConnection()
 
diff --git a/src/services/codebuild.jl b/src/services/codebuild.jl
index 808a7633bf..bd9ef07d1d 100644
--- a/src/services/codebuild.jl
+++ b/src/services/codebuild.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codebuild
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchDeleteBuilds()
 
diff --git a/src/services/codecommit.jl b/src/services/codecommit.jl
index 9d43658413..5f94522798 100644
--- a/src/services/codecommit.jl
+++ b/src/services/codecommit.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codecommit
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateApprovalRuleTemplateWithRepository()
 
diff --git a/src/services/codedeploy.jl b/src/services/codedeploy.jl
index c927a5fd36..9d2a672e7c 100644
--- a/src/services/codedeploy.jl
+++ b/src/services/codedeploy.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codedeploy
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTagsToOnPremisesInstances()
 
diff --git a/src/services/codeguru_reviewer.jl b/src/services/codeguru_reviewer.jl
index 799bd4965b..cfe1baf45e 100644
--- a/src/services/codeguru_reviewer.jl
+++ b/src/services/codeguru_reviewer.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codeguru_reviewer
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateRepository()
 
diff --git a/src/services/codeguruprofiler.jl b/src/services/codeguruprofiler.jl
index e2338d9f9b..2d315c5301 100644
--- a/src/services/codeguruprofiler.jl
+++ b/src/services/codeguruprofiler.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codeguruprofiler
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddNotificationChannels()
 
diff --git a/src/services/codepipeline.jl b/src/services/codepipeline.jl
index 519065db2f..a6de32edc5 100644
--- a/src/services/codepipeline.jl
+++ b/src/services/codepipeline.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codepipeline
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcknowledgeJob()
 
diff --git a/src/services/codestar.jl b/src/services/codestar.jl
index f0e5675d0c..3279e13d9b 100644
--- a/src/services/codestar.jl
+++ b/src/services/codestar.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codestar
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateTeamMember()
 
diff --git a/src/services/codestar_connections.jl b/src/services/codestar_connections.jl
index bffdd66a6c..dacde90daa 100644
--- a/src/services/codestar_connections.jl
+++ b/src/services/codestar_connections.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codestar_connections
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateConnection()
 
diff --git a/src/services/codestar_notifications.jl b/src/services/codestar_notifications.jl
index 249f711868..a37b93f0c2 100644
--- a/src/services/codestar_notifications.jl
+++ b/src/services/codestar_notifications.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: codestar_notifications
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateNotificationRule()
 
diff --git a/src/services/cognito_identity.jl b/src/services/cognito_identity.jl
index 4c4f0cdc43..d5326994cb 100644
--- a/src/services/cognito_identity.jl
+++ b/src/services/cognito_identity.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cognito_identity
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateIdentityPool()
 
diff --git a/src/services/cognito_identity_provider.jl b/src/services/cognito_identity_provider.jl
index cc57a9305b..7273abe0f2 100644
--- a/src/services/cognito_identity_provider.jl
+++ b/src/services/cognito_identity_provider.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cognito_identity_provider
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddCustomAttributes()
 
@@ -1208,7 +1208,7 @@ Lists the users in the Amazon Cognito user pool.
 
 # Optional Parameters
 - `AttributesToGet`: An array of strings, where each string is the name of a user attribute to be returned for each user in the search results. If the array is null, all attributes are returned.
-- `Filter`: A filter string of the form \"AttributeName Filter-Type \"AttributeValue\"\". Quotation marks within the filter string must be escaped using the backslash ( ) character. For example, \"family_name =  \"Reddy \"\".    AttributeName: The name of the attribute to search for. You can only search for one attribute at a time.    Filter-Type: For an exact match, use =, for example, \"given_name =  \"Jon \"\". For a prefix (\"starts with\") match, use ^=, for example, \"given_name ^=  \"Jon \"\".     AttributeValue: The attribute value that must be matched for each user.   If the filter string is empty, ListUsers returns all users in the user pool. You can only search for the following standard attributes:    username (case-sensitive)    email     phone_number     name     given_name     family_name     preferred_username     cognito:user_status (called Status in the Console) (case-insensitive)    status (called Enabled in the Console) (case-sensitive)     sub    Custom attributes are not searchable. For more information, see Searching for Users Using the ListUsers API and Examples of Using the ListUsers API in the Amazon Cognito Developer Guide.
+- `Filter`: A filter string of the form \"AttributeName Filter-Type \"AttributeValue\"\". Quotation marks within the filter string must be escaped using the backslash () character. For example, \"family_name = \"Reddy\"\".    AttributeName: The name of the attribute to search for. You can only search for one attribute at a time.    Filter-Type: For an exact match, use =, for example, \"given_name = \"Jon\"\". For a prefix (\"starts with\") match, use ^=, for example, \"given_name ^= \"Jon\"\".     AttributeValue: The attribute value that must be matched for each user.   If the filter string is empty, ListUsers returns all users in the user pool. You can only search for the following standard attributes:    username (case-sensitive)    email     phone_number     name     given_name     family_name     preferred_username     cognito:user_status (called Status in the Console) (case-insensitive)    status (called Enabled in the Console) (case-sensitive)     sub    Custom attributes are not searchable. For more information, see Searching for Users Using the ListUsers API and Examples of Using the ListUsers API in the Amazon Cognito Developer Guide.
 - `Limit`: Maximum number of users to be returned.
 - `PaginationToken`: An identifier that was returned from the previous call to this operation, which can be used to return the next set of items in the list.
 """
diff --git a/src/services/cognito_sync.jl b/src/services/cognito_sync.jl
index eed3f86943..ac0b03f25d 100644
--- a/src/services/cognito_sync.jl
+++ b/src/services/cognito_sync.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cognito_sync
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BulkPublish()
 
diff --git a/src/services/comprehend.jl b/src/services/comprehend.jl
index e4c7ce36af..d48b3dda7f 100644
--- a/src/services/comprehend.jl
+++ b/src/services/comprehend.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: comprehend
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchDetectDominantLanguage()
 
diff --git a/src/services/comprehendmedical.jl b/src/services/comprehendmedical.jl
index 3b7f6d831a..34906618b3 100644
--- a/src/services/comprehendmedical.jl
+++ b/src/services/comprehendmedical.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: comprehendmedical
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeEntitiesDetectionV2Job()
 
diff --git a/src/services/compute_optimizer.jl b/src/services/compute_optimizer.jl
index dddb6d4c48..8233e4b1c9 100644
--- a/src/services/compute_optimizer.jl
+++ b/src/services/compute_optimizer.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: compute_optimizer
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeRecommendationExportJobs()
 
diff --git a/src/services/config_service.jl b/src/services/config_service.jl
index 3ff4bd2b50..3c9b926e8b 100644
--- a/src/services/config_service.jl
+++ b/src/services/config_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: config_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchGetAggregateResourceConfig()
 
diff --git a/src/services/connect.jl b/src/services/connect.jl
index 5723034800..e10ce0c4fc 100644
--- a/src/services/connect.jl
+++ b/src/services/connect.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: connect
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateUser()
 
@@ -14,7 +14,7 @@ Creates a user account for the specified Amazon Connect instance.
 - `PhoneConfig`: The phone settings for the user.
 - `RoutingProfileId`: The identifier of the routing profile for the user.
 - `SecurityProfileIds`: The identifier of the security profile for the user.
-- `Username`: The user name for the account. For instances not using SAML for identity management, the user name can include up to 20 characters. If you are using SAML for identity management, the user name can include up to 64 characters from [a-zA-Z0-9_-. @]+.
+- `Username`: The user name for the account. For instances not using SAML for identity management, the user name can include up to 20 characters. If you are using SAML for identity management, the user name can include up to 64 characters from [a-zA-Z0-9_-.@]+.
 
 # Optional Parameters
 - `DirectoryUserId`: The identifier of the user account in the directory used for identity management. If Amazon Connect cannot access the directory, you can specify this identifier to authenticate users. If you include the identifier, we assume that Amazon Connect cannot access the directory. Otherwise, the identity information is used to authenticate users from your directory. This parameter is required if you are using an existing directory for identity management in Amazon Connect when Amazon Connect cannot access your directory to authenticate users. If you are using SAML for identity management and include this parameter, an error is returned.
diff --git a/src/services/connectparticipant.jl b/src/services/connectparticipant.jl
index c4e7386655..f8e3b615ee 100644
--- a/src/services/connectparticipant.jl
+++ b/src/services/connectparticipant.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: connectparticipant
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateParticipantConnection()
 
diff --git a/src/services/cost_and_usage_report_service.jl b/src/services/cost_and_usage_report_service.jl
index 67c79eec57..d187c4c99b 100644
--- a/src/services/cost_and_usage_report_service.jl
+++ b/src/services/cost_and_usage_report_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cost_and_usage_report_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteReportDefinition()
 
diff --git a/src/services/cost_explorer.jl b/src/services/cost_explorer.jl
index fe77db5623..4c02e7e344 100644
--- a/src/services/cost_explorer.jl
+++ b/src/services/cost_explorer.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: cost_explorer
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateCostCategoryDefinition()
 
diff --git a/src/services/data_pipeline.jl b/src/services/data_pipeline.jl
index 7e79511013..7e5b5dcb14 100644
--- a/src/services/data_pipeline.jl
+++ b/src/services/data_pipeline.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: data_pipeline
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     ActivatePipeline()
 
diff --git a/src/services/database_migration_service.jl b/src/services/database_migration_service.jl
index 96e2f479e6..a226db665b 100644
--- a/src/services/database_migration_service.jl
+++ b/src/services/database_migration_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: database_migration_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTagsToResource()
 
diff --git a/src/services/dataexchange.jl b/src/services/dataexchange.jl
index 83618482d2..58790b8c37 100644
--- a/src/services/dataexchange.jl
+++ b/src/services/dataexchange.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: dataexchange
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelJob()
 
diff --git a/src/services/datasync.jl b/src/services/datasync.jl
index 52a073c4e9..3a12753bbc 100644
--- a/src/services/datasync.jl
+++ b/src/services/datasync.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: datasync
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelTaskExecution()
 
@@ -27,7 +27,7 @@ Activates an AWS DataSync agent that you have deployed on your host. The activat
 
 # Optional Parameters
 - `AgentName`: The name you configured for your agent. This value is a text reference that is used to identify the agent in the console.
-- `SecurityGroupArns`: The ARNs of the security groups used to protect your data transfer task subnets. See CreateAgentRequest SubnetArns.
+- `SecurityGroupArns`: The ARNs of the security groups used to protect your data transfer task subnets. See CreateAgentRequestSubnetArns.
 - `SubnetArns`: The Amazon Resource Names (ARNs) of the subnets in which DataSync will create elastic network interfaces for each data transfer task. The agent that runs a task must be private. When you start a task that is associated with an agent created in a VPC, or one that has access to an IP address in a VPC, then the task is also private. In this case, DataSync creates four network interfaces for each task in your subnet. For a data transfer to work, the agent must be able to route to all these four network interfaces.
 - `Tags`: The key-value pair that represents the tag that you want to associate with the agent. The value can be an empty string. This value helps you manage, filter, and search for your agents.  Valid characters for key and value are letters, spaces, and numbers representable in UTF-8 format, and the following special characters: + - = . _ : / @.  
 - `VpcEndpointId`: The ID of the VPC (virtual private cloud) endpoint that the agent has access to. This is the client-side VPC endpoint, also called a PrivateLink. If you don't have a PrivateLink VPC endpoint, see Creating a VPC Endpoint Service Configuration in the Amazon VPC User Guide. VPC endpoint ID looks like this: vpce-01234d5aff67890e1.
diff --git a/src/services/dax.jl b/src/services/dax.jl
index ce0d2e44b0..cabd63231e 100644
--- a/src/services/dax.jl
+++ b/src/services/dax.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: dax
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateCluster()
 
diff --git a/src/services/detective.jl b/src/services/detective.jl
index c4c72af11d..806f02f368 100644
--- a/src/services/detective.jl
+++ b/src/services/detective.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: detective
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptInvitation()
 
diff --git a/src/services/device_farm.jl b/src/services/device_farm.jl
index 3758851ae8..279d0a3351 100644
--- a/src/services/device_farm.jl
+++ b/src/services/device_farm.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: device_farm
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateDevicePool()
 
@@ -484,7 +484,7 @@ get_test_grid_project(projectArn, args::AbstractDict{String, <:Any}; aws_config:
 """
     GetTestGridSession()
 
-A session is an instance of a browser created through a RemoteWebDriver with the URL from CreateTestGridUrlResult url. You can use the following to look up sessions:   The session ARN (GetTestGridSessionRequest sessionArn).   The project ARN and a session ID (GetTestGridSessionRequest projectArn and GetTestGridSessionRequest sessionId).   
+A session is an instance of a browser created through a RemoteWebDriver with the URL from CreateTestGridUrlResulturl. You can use the following to look up sessions:   The session ARN (GetTestGridSessionRequestsessionArn).   The project ARN and a session ID (GetTestGridSessionRequestprojectArn and GetTestGridSessionRequestsessionId).   
 
 # Optional Parameters
 - `projectArn`: The ARN for the project that this session belongs to. See CreateTestGridProject and ListTestGridProjects.
diff --git a/src/services/direct_connect.jl b/src/services/direct_connect.jl
index 4343935a25..71b317e1d8 100644
--- a/src/services/direct_connect.jl
+++ b/src/services/direct_connect.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: direct_connect
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptDirectConnectGatewayAssociationProposal()
 
diff --git a/src/services/directory_service.jl b/src/services/directory_service.jl
index 7191e1995b..529307a013 100644
--- a/src/services/directory_service.jl
+++ b/src/services/directory_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: directory_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptSharedDirectory()
 
@@ -761,7 +761,7 @@ Applies a schema extension to a Microsoft AD directory.
 - `CreateSnapshotBeforeSchemaExtension`: If true, creates a snapshot of the directory before applying the schema extension.
 - `Description`: A description of the schema extension.
 - `DirectoryId`: The identifier of the directory for which the schema extension will be applied to.
-- `LdifContent`: The LDIF file represented as a string. To construct the LdifContent string, precede each line as it would be formatted in an ldif file with  n. See the example request below for more details. The file size can be no larger than 1MB.
+- `LdifContent`: The LDIF file represented as a string. To construct the LdifContent string, precede each line as it would be formatted in an ldif file with n. See the example request below for more details. The file size can be no larger than 1MB.
 
 """
 
diff --git a/src/services/dlm.jl b/src/services/dlm.jl
index 78dea67063..102e105a5b 100644
--- a/src/services/dlm.jl
+++ b/src/services/dlm.jl
@@ -2,15 +2,15 @@
 using AWS
 using AWS.AWSServices: dlm
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateLifecyclePolicy()
 
 Creates a policy to manage the lifecycle of the specified AWS resources. You can create up to 100 lifecycle policies.
 
 # Required Parameters
-- `Description`: A description of the lifecycle policy. The characters ^[0-9A-Za-z _-]+  are supported.
+- `Description`: A description of the lifecycle policy. The characters ^[0-9A-Za-z _-]+ are supported.
 - `ExecutionRoleArn`: The Amazon Resource Name (ARN) of the IAM role used to run the operations specified by the lifecycle policy.
 - `PolicyDetails`: The configuration details of the lifecycle policy.
 - `State`: The desired activation state of the lifecycle policy after creation.
diff --git a/src/services/docdb.jl b/src/services/docdb.jl
index e0897cc36a..7de78c5fe4 100644
--- a/src/services/docdb.jl
+++ b/src/services/docdb.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: docdb
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTagsToResource()
 
diff --git a/src/services/dynamodb.jl b/src/services/dynamodb.jl
index aeb1ffc277..ebed98dfc6 100644
--- a/src/services/dynamodb.jl
+++ b/src/services/dynamodb.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: dynamodb
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchGetItem()
 
diff --git a/src/services/dynamodb_streams.jl b/src/services/dynamodb_streams.jl
index 16f7908da5..d3a0c4fc55 100644
--- a/src/services/dynamodb_streams.jl
+++ b/src/services/dynamodb_streams.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: dynamodb_streams
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeStream()
 
diff --git a/src/services/ebs.jl b/src/services/ebs.jl
index 1b2b6f5904..329249629b 100644
--- a/src/services/ebs.jl
+++ b/src/services/ebs.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ebs
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CompleteSnapshot()
 
diff --git a/src/services/ec2.jl b/src/services/ec2.jl
index 1ca3a2d079..f3a3810d47 100644
--- a/src/services/ec2.jl
+++ b/src/services/ec2.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ec2
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptReservedInstancesExchangeQuote()
 
@@ -4058,7 +4058,7 @@ Describes one or more attachments between resources and transit gateways. By def
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    association.state - The state of the association (associating | associated | disassociating).    association.transit-gateway-route-table-id - The ID of the route table for the transit gateway.    resource-id - The ID of the resource.    resource-owner-id - The ID of the AWS account that owns the resource.    resource-type - The resource type (vpc | vpn | direct-connect-gateway | tgw-peering).    state - The state of the attachment (available | deleted | deleting | failed | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting).    transit-gateway-attachment-id - The ID of the attachment.    transit-gateway-id - The ID of the transit gateway.    transit-gateway-owner-id - The ID of the AWS account that owns the transit gateway.  
+- `Filter`: One or more filters. The possible values are:    association.state - The state of the association (associating | associated | disassociating).    association.transit-gateway-route-table-id - The ID of the route table for the transit gateway.    resource-id - The ID of the resource.    resource-owner-id - The ID of the AWS account that owns the resource.    resource-type - The resource type. Valid values are vpc | vpn | direct-connect-gateway | peering.    state - The state of the attachment. Valid values are available | deleted | deleting | failed | failing | initiatingRequest | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting.    transit-gateway-attachment-id - The ID of the attachment.    transit-gateway-id - The ID of the transit gateway.    transit-gateway-owner-id - The ID of the AWS account that owns the transit gateway.  
 - `MaxResults`: The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned nextToken value.
 - `NextToken`: The token for the next page of results.
 - `TransitGatewayAttachmentIds`: The IDs of the attachments.
@@ -4090,7 +4090,7 @@ Describes your transit gateway peering attachments.
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    transit-gateway-attachment-id - The ID of the transit gateway attachment.    local-owner-id - The ID of your AWS account.    remote-owner-id - The ID of the AWS account in the remote Region that owns the transit gateway.    state - The state of the peering attachment (available | deleted | deleting | failed | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting).    transit-gateway-id - The ID of the transit gateway.  
+- `Filter`: One or more filters. The possible values are:    transit-gateway-attachment-id - The ID of the transit gateway attachment.    local-owner-id - The ID of your AWS account.    remote-owner-id - The ID of the AWS account in the remote Region that owns the transit gateway.    state - The state of the peering attachment. Valid values are available | deleted | deleting | failed | failing | initiatingRequest | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting).    transit-gateway-id - The ID of the transit gateway.  
 - `MaxResults`: The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned nextToken value.
 - `NextToken`: The token for the next page of results.
 - `TransitGatewayAttachmentIds`: One or more IDs of the transit gateway peering attachments.
@@ -4106,7 +4106,7 @@ Describes one or more transit gateway route tables. By default, all transit gate
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    default-association-route-table - Indicates whether this is the default association route table for the transit gateway (true | false).    default-propagation-route-table - Indicates whether this is the default propagation route table for the transit gateway (true | false).    state - The state of the attachment (available | deleted | deleting | failed | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting).    transit-gateway-id - The ID of the transit gateway.    transit-gateway-route-table-id - The ID of the transit gateway route table.  
+- `Filter`: One or more filters. The possible values are:    default-association-route-table - Indicates whether this is the default association route table for the transit gateway (true | false).    default-propagation-route-table - Indicates whether this is the default propagation route table for the transit gateway (true | false).    state - The state of the route table (available | deleting | deleted | pending).    transit-gateway-id - The ID of the transit gateway.    transit-gateway-route-table-id - The ID of the transit gateway route table.  
 - `MaxResults`: The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned nextToken value.
 - `NextToken`: The token for the next page of results.
 - `TransitGatewayRouteTableIds`: The IDs of the transit gateway route tables.
@@ -4122,7 +4122,7 @@ Describes one or more VPC attachments. By default, all VPC attachments are descr
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    state - The state of the attachment (available | deleted | deleting | failed | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting).    transit-gateway-attachment-id - The ID of the attachment.    transit-gateway-id - The ID of the transit gateway.    vpc-id - The ID of the VPC.  
+- `Filter`: One or more filters. The possible values are:    state - The state of the attachment. Valid values are available | deleted | deleting | failed | failing | initiatingRequest | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting.    transit-gateway-attachment-id - The ID of the attachment.    transit-gateway-id - The ID of the transit gateway.    vpc-id - The ID of the VPC.  
 - `MaxResults`: The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned nextToken value.
 - `NextToken`: The token for the next page of results.
 - `TransitGatewayAttachmentIds`: The IDs of the attachments.
@@ -4138,7 +4138,7 @@ Describes one or more transit gateways. By default, all transit gateways are des
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    options.propagation-default-route-table-id - The ID of the default propagation route table.    options.amazon-side-asn - The private ASN for the Amazon side of a BGP session.    options.association-default-route-table-id - The ID of the default association route table.    options.auto-accept-shared-attachments - Indicates whether there is automatic acceptance of attachment requests (enable | disable).    options.default-route-table-association - Indicates whether resource attachments are automatically associated with the default association route table (enable | disable).    options.default-route-table-propagation - Indicates whether resource attachments automatically propagate routes to the default propagation route table (enable | disable).    options.dns-support - Indicates whether DNS support is enabled (enable | disable).    options.vpn-ecmp-support - Indicates whether Equal Cost Multipath Protocol support is enabled (enable | disable).    owner-id - The ID of the AWS account that owns the transit gateway.    state - The state of the attachment (available | deleted | deleting | failed | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting).    transit-gateway-id - The ID of the transit gateway.  
+- `Filter`: One or more filters. The possible values are:    options.propagation-default-route-table-id - The ID of the default propagation route table.    options.amazon-side-asn - The private ASN for the Amazon side of a BGP session.    options.association-default-route-table-id - The ID of the default association route table.    options.auto-accept-shared-attachments - Indicates whether there is automatic acceptance of attachment requests (enable | disable).    options.default-route-table-association - Indicates whether resource attachments are automatically associated with the default association route table (enable | disable).    options.default-route-table-propagation - Indicates whether resource attachments automatically propagate routes to the default propagation route table (enable | disable).    options.dns-support - Indicates whether DNS support is enabled (enable | disable).    options.vpn-ecmp-support - Indicates whether Equal Cost Multipath Protocol support is enabled (enable | disable).    owner-id - The ID of the AWS account that owns the transit gateway.    state - The state of the transit gateway (available | deleted | deleting | modifying | pending).    transit-gateway-id - The ID of the transit gateway.  
 - `MaxResults`: The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned nextToken value.
 - `NextToken`: The token for the next page of results.
 - `TransitGatewayIds`: The IDs of the transit gateways.
@@ -4860,7 +4860,7 @@ Exports routes from the specified transit gateway route table to the specified S
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    attachment.transit-gateway-attachment-id - The id of the transit gateway attachment.    attachment.resource-id - The resource id of the transit gateway attachment.    route-search.exact-match - The exact match of the specified filter.    route-search.longest-prefix-match - The longest prefix that matches the route.    route-search.subnet-of-match - The routes with a subnet that match the specified CIDR filter.    route-search.supernet-of-match - The routes with a CIDR that encompass the CIDR filter. For example, if you have 10.0.1.0/29 and 10.0.1.0/31 routes in your route table and you specify supernet-of-match as 10.0.1.0/30, then the result returns 10.0.1.0/29.    state - The state of the attachment (available | deleted | deleting | failed | modifying | pendingAcceptance | pending | rollingBack | rejected | rejecting).    transit-gateway-route-destination-cidr-block - The CIDR range.    type - The type of route (active | blackhole).  
+- `Filter`: One or more filters. The possible values are:    attachment.transit-gateway-attachment-id - The id of the transit gateway attachment.    attachment.resource-id - The resource id of the transit gateway attachment.    route-search.exact-match - The exact match of the specified filter.    route-search.longest-prefix-match - The longest prefix that matches the route.    route-search.subnet-of-match - The routes with a subnet that match the specified CIDR filter.    route-search.supernet-of-match - The routes with a CIDR that encompass the CIDR filter. For example, if you have 10.0.1.0/29 and 10.0.1.0/31 routes in your route table and you specify supernet-of-match as 10.0.1.0/30, then the result returns 10.0.1.0/29.    state - The state of the route (active | blackhole).    transit-gateway-route-destination-cidr-block - The CIDR range.    type - The type of route (propagated | static).  
 """
 
 export_transit_gateway_routes(S3Bucket, TransitGatewayRouteTableId; aws_config::AWSConfig=global_aws_config()) = ec2("ExportTransitGatewayRoutes", Dict{String, Any}("S3Bucket"=>S3Bucket, "TransitGatewayRouteTableId"=>TransitGatewayRouteTableId); aws_config=aws_config)
@@ -5147,7 +5147,7 @@ Gets information about the prefix list references in a specified transit gateway
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    attachment.resource-id - The ID of the resource for the attachment.    attachment.resource-type - The type of resource for the attachment (vpc | vpn | direct-connect-gateway | tgw-peering).    attachment.transit-gateway-attachment-id - The ID of the attachment.    is-blackhole - Whether traffic matching the route is blocked (true | false).    prefix-list-id - The ID of the prefix list.    prefix-list-owner-id - The ID of the owner of the prefix list.    state - The state of the prefix list reference (pending | available | modifying | deleting).  
+- `Filter`: One or more filters. The possible values are:    attachment.resource-id - The ID of the resource for the attachment.    attachment.resource-type - The type of resource for the attachment. Valid values are vpc | vpn | direct-connect-gateway | peering.    attachment.transit-gateway-attachment-id - The ID of the attachment.    is-blackhole - Whether traffic matching the route is blocked (true | false).    prefix-list-id - The ID of the prefix list.    prefix-list-owner-id - The ID of the owner of the prefix list.    state - The state of the prefix list reference (pending | available | modifying | deleting).  
 - `MaxResults`: The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned nextToken value.
 - `NextToken`: The token for the next page of results.
 """
@@ -5165,7 +5165,7 @@ Gets information about the associations for the specified transit gateway route
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    resource-id - The ID of the resource.    resource-type - The resource type (vpc | vpn | direct-connect-gateway | tgw-peering).    transit-gateway-attachment-id - The ID of the attachment.  
+- `Filter`: One or more filters. The possible values are:    resource-id - The ID of the resource.    resource-type - The resource type. Valid values are vpc | vpn | direct-connect-gateway | peering.    transit-gateway-attachment-id - The ID of the attachment.  
 - `MaxResults`: The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned nextToken value.
 - `NextToken`: The token for the next page of results.
 """
@@ -5183,7 +5183,7 @@ Gets information about the route table propagations for the specified transit ga
 
 # Optional Parameters
 - `DryRun`: Checks whether you have the required permissions for the action, without actually making the request, and provides an error response. If you have the required permissions, the error response is DryRunOperation. Otherwise, it is UnauthorizedOperation.
-- `Filter`: One or more filters. The possible values are:    resource-id - The ID of the resource.    resource-type - The resource type (vpc | vpn | direct-connect-gateway | tgw-peering).    transit-gateway-attachment-id - The ID of the attachment.  
+- `Filter`: One or more filters. The possible values are:    resource-id - The ID of the resource.    resource-type - The resource type. Valid values are vpc | vpn | direct-connect-gateway | peering.    transit-gateway-attachment-id - The ID of the attachment.  
 - `MaxResults`: The maximum number of results to return with a single call. To retrieve the remaining results, make another call with the returned nextToken value.
 - `NextToken`: The token for the next page of results.
 """
@@ -6836,7 +6836,7 @@ search_transit_gateway_multicast_groups(args::AbstractDict{String, <:Any}; aws_c
 Searches for routes in the specified transit gateway route table.
 
 # Required Parameters
-- `Filter`: One or more filters. The possible values are:    attachment.transit-gateway-attachment-id- The id of the transit gateway attachment.    attachment.resource-id - The resource id of the transit gateway attachment.    attachment.resource-type - The attachment resource type (vpc | vpn | direct-connect-gateway | tgw-peering).    prefix-list-id - The ID of the prefix list.    route-search.exact-match - The exact match of the specified filter.    route-search.longest-prefix-match - The longest prefix that matches the route.    route-search.subnet-of-match - The routes with a subnet that match the specified CIDR filter.    route-search.supernet-of-match - The routes with a CIDR that encompass the CIDR filter. For example, if you have 10.0.1.0/29 and 10.0.1.0/31 routes in your route table and you specify supernet-of-match as 10.0.1.0/30, then the result returns 10.0.1.0/29.    state - The state of the route (active | blackhole).    type - The type of route (propagated | static).  
+- `Filter`: One or more filters. The possible values are:    attachment.transit-gateway-attachment-id- The id of the transit gateway attachment.    attachment.resource-id - The resource id of the transit gateway attachment.    attachment.resource-type - The attachment resource type. Valid values are vpc | vpn | direct-connect-gateway | peering.    prefix-list-id - The ID of the prefix list.    route-search.exact-match - The exact match of the specified filter.    route-search.longest-prefix-match - The longest prefix that matches the route.    route-search.subnet-of-match - The routes with a subnet that match the specified CIDR filter.    route-search.supernet-of-match - The routes with a CIDR that encompass the CIDR filter. For example, if you have 10.0.1.0/29 and 10.0.1.0/31 routes in your route table and you specify supernet-of-match as 10.0.1.0/30, then the result returns 10.0.1.0/29.    state - The state of the route (active | blackhole).    type - The type of route (propagated | static).  
 - `TransitGatewayRouteTableId`: The ID of the transit gateway route table.
 
 # Optional Parameters
diff --git a/src/services/ec2_instance_connect.jl b/src/services/ec2_instance_connect.jl
index f58a5b6083..636e1cece5 100644
--- a/src/services/ec2_instance_connect.jl
+++ b/src/services/ec2_instance_connect.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ec2_instance_connect
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     SendSSHPublicKey()
 
diff --git a/src/services/ecr.jl b/src/services/ecr.jl
index decb9b7d39..5b4e5b1ba2 100644
--- a/src/services/ecr.jl
+++ b/src/services/ecr.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ecr
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchCheckLayerAvailability()
 
diff --git a/src/services/ecs.jl b/src/services/ecs.jl
index a5d660e7a6..a3815bdaf3 100644
--- a/src/services/ecs.jl
+++ b/src/services/ecs.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ecs
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateCapacityProvider()
 
diff --git a/src/services/efs.jl b/src/services/efs.jl
index c2d044ac48..5f43be61d8 100644
--- a/src/services/efs.jl
+++ b/src/services/efs.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: efs
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateAccessPoint()
 
@@ -31,8 +31,8 @@ Creates a new, empty file system. The operation requires a creation token in the
 - `CreationToken`: A string of up to 64 ASCII characters. Amazon EFS uses this to ensure idempotent creation.
 
 # Optional Parameters
-- `Encrypted`: A Boolean value that, if true, creates an encrypted file system. When creating an encrypted file system, you have the option of specifying CreateFileSystemRequest KmsKeyId for an existing AWS Key Management Service (AWS KMS) customer master key (CMK). If you don't specify a CMK, then the default CMK for Amazon EFS, /aws/elasticfilesystem, is used to protect the encrypted file system. 
-- `KmsKeyId`: The ID of the AWS KMS CMK to be used to protect the encrypted file system. This parameter is only required if you want to use a nondefault CMK. If this parameter is not specified, the default CMK for Amazon EFS is used. This ID can be in one of the following formats:   Key ID - A unique identifier of the key, for example 1234abcd-12ab-34cd-56ef-1234567890ab.   ARN - An Amazon Resource Name (ARN) for the key, for example arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab.   Key alias - A previously created display name for a key, for example alias/projectKey1.   Key alias ARN - An ARN for a key alias, for example arn:aws:kms:us-west-2:444455556666:alias/projectKey1.   If KmsKeyId is specified, the CreateFileSystemRequest Encrypted parameter must be set to true.  EFS accepts only symmetric CMKs. You cannot use asymmetric CMKs with EFS file systems. 
+- `Encrypted`: A Boolean value that, if true, creates an encrypted file system. When creating an encrypted file system, you have the option of specifying CreateFileSystemRequestKmsKeyId for an existing AWS Key Management Service (AWS KMS) customer master key (CMK). If you don't specify a CMK, then the default CMK for Amazon EFS, /aws/elasticfilesystem, is used to protect the encrypted file system. 
+- `KmsKeyId`: The ID of the AWS KMS CMK to be used to protect the encrypted file system. This parameter is only required if you want to use a nondefault CMK. If this parameter is not specified, the default CMK for Amazon EFS is used. This ID can be in one of the following formats:   Key ID - A unique identifier of the key, for example 1234abcd-12ab-34cd-56ef-1234567890ab.   ARN - An Amazon Resource Name (ARN) for the key, for example arn:aws:kms:us-west-2:111122223333:key/1234abcd-12ab-34cd-56ef-1234567890ab.   Key alias - A previously created display name for a key, for example alias/projectKey1.   Key alias ARN - An ARN for a key alias, for example arn:aws:kms:us-west-2:444455556666:alias/projectKey1.   If KmsKeyId is specified, the CreateFileSystemRequestEncrypted parameter must be set to true.  EFS accepts only symmetric CMKs. You cannot use asymmetric CMKs with EFS file systems. 
 - `PerformanceMode`: The performance mode of the file system. We recommend generalPurpose performance mode for most file systems. File systems using the maxIO performance mode can scale to higher levels of aggregate throughput and operations per second with a tradeoff of slightly higher latencies for most file operations. The performance mode can't be changed after the file system has been created.
 - `ProvisionedThroughputInMibps`: The throughput, measured in MiB/s, that you want to provision for a file system that you're creating. Valid values are 1-1024. Required if ThroughputMode is set to provisioned. The upper limit for throughput is 1024 MiB/s. You can get this limit increased by contacting AWS Support. For more information, see Amazon EFS Limits That You Can Increase in the Amazon EFS User Guide. 
 - `Tags`: A value that specifies to create one or more tags associated with the file system. Each tag is a user-defined key-value pair. Name your file system on creation by including a \"Key\":\"Name\",\"Value\":\"{value}\" key-value pair.
diff --git a/src/services/eks.jl b/src/services/eks.jl
index d7d4716251..1d49903142 100644
--- a/src/services/eks.jl
+++ b/src/services/eks.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: eks
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateCluster()
 
diff --git a/src/services/elastic_beanstalk.jl b/src/services/elastic_beanstalk.jl
index 0bf03ced00..5214fa4408 100644
--- a/src/services/elastic_beanstalk.jl
+++ b/src/services/elastic_beanstalk.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: elastic_beanstalk
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AbortEnvironmentUpdate()
 
diff --git a/src/services/elastic_inference.jl b/src/services/elastic_inference.jl
index ce1e3daf27..a992e30773 100644
--- a/src/services/elastic_inference.jl
+++ b/src/services/elastic_inference.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: elastic_inference
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeAcceleratorOfferings()
 
diff --git a/src/services/elastic_load_balancing.jl b/src/services/elastic_load_balancing.jl
index 633833882a..1d04102728 100644
--- a/src/services/elastic_load_balancing.jl
+++ b/src/services/elastic_load_balancing.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: elastic_load_balancing
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTags()
 
diff --git a/src/services/elastic_load_balancing_v2.jl b/src/services/elastic_load_balancing_v2.jl
index 1bc4ecf35a..d31d65b59a 100644
--- a/src/services/elastic_load_balancing_v2.jl
+++ b/src/services/elastic_load_balancing_v2.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: elastic_load_balancing_v2
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddListenerCertificates()
 
diff --git a/src/services/elastic_transcoder.jl b/src/services/elastic_transcoder.jl
index a0ed8150a1..f35358626d 100644
--- a/src/services/elastic_transcoder.jl
+++ b/src/services/elastic_transcoder.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: elastic_transcoder
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelJob()
 
diff --git a/src/services/elasticache.jl b/src/services/elasticache.jl
index 44e4499153..dd337e2f02 100644
--- a/src/services/elasticache.jl
+++ b/src/services/elasticache.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: elasticache
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTagsToResource()
 
@@ -109,7 +109,7 @@ Creates a cluster. All nodes in the cluster run the same protocol-compliant cach
 
 # Optional Parameters
 - `AZMode`: Specifies whether the nodes in this Memcached cluster are created in a single Availability Zone or created across multiple Availability Zones in the cluster's region. This parameter is only supported for Memcached clusters. If the AZMode and PreferredAvailabilityZones are not specified, ElastiCache assumes single-az mode.
-- `AuthToken`:  Reserved parameter. The password used to access a password protected server. Password constraints:   Must be only printable ASCII characters.   Must be at least 16 characters and no more than 128 characters in length.   The only permitted printable special characters are !, &amp;, #,  , ^, &lt;, &gt;, and -. Other printable special characters cannot be used in the AUTH token.   For more information, see AUTH password at http://redis.io/commands/AUTH.
+- `AuthToken`:  Reserved parameter. The password used to access a password protected server. Password constraints:   Must be only printable ASCII characters.   Must be at least 16 characters and no more than 128 characters in length.   The only permitted printable special characters are !, &amp;, #, , ^, &lt;, &gt;, and -. Other printable special characters cannot be used in the AUTH token.   For more information, see AUTH password at http://redis.io/commands/AUTH.
 - `AutoMinorVersionUpgrade`: This parameter is currently disabled.
 - `CacheNodeType`: The compute and memory capacity of the nodes in the node group (shard). The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.   General purpose:   Current generation:   M5 node types: cache.m5.large, cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, cache.m5.24xlarge   M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, cache.m4.4xlarge, cache.m4.10xlarge   T3 node types: cache.t3.micro, cache.t3.small, cache.t3.medium   T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium    Previous generation: (not recommended)  T1 node types: cache.t1.micro   M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge   M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge      Compute optimized:   Previous generation: (not recommended)  C1 node types: cache.c1.xlarge      Memory optimized:   Current generation:   R5 node types: cache.r5.large, cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, cache.r5.24xlarge   R4 node types: cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, cache.r4.8xlarge, cache.r4.16xlarge    Previous generation: (not recommended)  M2 node types: cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge   R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, cache.r3.8xlarge       Additional node type info    All current generation instance types are created in Amazon VPC by default.   Redis append-only files (AOF) are not supported for T1 or T2 instances.   Redis Multi-AZ with automatic failover is not supported on T1 instances.   Redis configuration variables appendonly and appendfsync are not supported on Redis version 2.8.22 and later.  
 - `CacheParameterGroupName`: The name of the parameter group to associate with this cluster. If this argument is omitted, the default parameter group for the specified engine is used. You cannot use any parameter group which has cluster-enabled='yes' when creating a cluster.
@@ -208,7 +208,7 @@ Creates a Redis (cluster mode disabled) or a Redis (cluster mode enabled) replic
 
 # Optional Parameters
 - `AtRestEncryptionEnabled`: A flag that enables encryption at rest when set to true. You cannot modify the value of AtRestEncryptionEnabled after the replication group is created. To enable encryption at rest on a replication group you must set AtRestEncryptionEnabled to true when you create the replication group.   Required: Only available when creating a replication group in an Amazon VPC using redis version 3.2.6, 4.x or later. Default: false 
-- `AuthToken`:  Reserved parameter. The password used to access a password protected server.  AuthToken can be specified only on replication groups where TransitEncryptionEnabled is true.  For HIPAA compliance, you must specify TransitEncryptionEnabled as true, an AuthToken, and a CacheSubnetGroup.  Password constraints:   Must be only printable ASCII characters.   Must be at least 16 characters and no more than 128 characters in length.   The only permitted printable special characters are !, &amp;, #,  , ^, &lt;, &gt;, and -. Other printable special characters cannot be used in the AUTH token.   For more information, see AUTH password at http://redis.io/commands/AUTH.
+- `AuthToken`:  Reserved parameter. The password used to access a password protected server.  AuthToken can be specified only on replication groups where TransitEncryptionEnabled is true.  For HIPAA compliance, you must specify TransitEncryptionEnabled as true, an AuthToken, and a CacheSubnetGroup.  Password constraints:   Must be only printable ASCII characters.   Must be at least 16 characters and no more than 128 characters in length.   The only permitted printable special characters are !, &amp;, #, , ^, &lt;, &gt;, and -. Other printable special characters cannot be used in the AUTH token.   For more information, see AUTH password at http://redis.io/commands/AUTH.
 - `AutoMinorVersionUpgrade`: This parameter is currently disabled.
 - `AutomaticFailoverEnabled`: Specifies whether a read-only replica is automatically promoted to read/write primary if the existing primary fails.  AutomaticFailoverEnabled must be enabled for Redis (cluster mode enabled) replication groups. Default: false
 - `CacheNodeType`: The compute and memory capacity of the nodes in the node group (shard). The following node types are supported by ElastiCache. Generally speaking, the current generation types provide more memory and computational power at lower cost when compared to their equivalent previous generation counterparts.   General purpose:   Current generation:   M5 node types: cache.m5.large, cache.m5.xlarge, cache.m5.2xlarge, cache.m5.4xlarge, cache.m5.12xlarge, cache.m5.24xlarge   M4 node types: cache.m4.large, cache.m4.xlarge, cache.m4.2xlarge, cache.m4.4xlarge, cache.m4.10xlarge   T3 node types: cache.t3.micro, cache.t3.small, cache.t3.medium   T2 node types: cache.t2.micro, cache.t2.small, cache.t2.medium    Previous generation: (not recommended)  T1 node types: cache.t1.micro   M1 node types: cache.m1.small, cache.m1.medium, cache.m1.large, cache.m1.xlarge   M3 node types: cache.m3.medium, cache.m3.large, cache.m3.xlarge, cache.m3.2xlarge      Compute optimized:   Previous generation: (not recommended)  C1 node types: cache.c1.xlarge      Memory optimized:   Current generation:   R5 node types: cache.r5.large, cache.r5.xlarge, cache.r5.2xlarge, cache.r5.4xlarge, cache.r5.12xlarge, cache.r5.24xlarge   R4 node types: cache.r4.large, cache.r4.xlarge, cache.r4.2xlarge, cache.r4.4xlarge, cache.r4.8xlarge, cache.r4.16xlarge    Previous generation: (not recommended)  M2 node types: cache.m2.xlarge, cache.m2.2xlarge, cache.m2.4xlarge   R3 node types: cache.r3.large, cache.r3.xlarge, cache.r3.2xlarge, cache.r3.4xlarge, cache.r3.8xlarge       Additional node type info    All current generation instance types are created in Amazon VPC by default.   Redis append-only files (AOF) are not supported for T1 or T2 instances.   Redis Multi-AZ with automatic failover is not supported on T1 instances.   Redis configuration variables appendonly and appendfsync are not supported on Redis version 2.8.22 and later.  
diff --git a/src/services/elasticsearch_service.jl b/src/services/elasticsearch_service.jl
index cc79399f2c..25c0d455b4 100644
--- a/src/services/elasticsearch_service.jl
+++ b/src/services/elasticsearch_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: elasticsearch_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptInboundCrossClusterSearchConnection()
 
diff --git a/src/services/emr.jl b/src/services/emr.jl
index bf412e9f40..93d2880e4f 100644
--- a/src/services/emr.jl
+++ b/src/services/emr.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: emr
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddInstanceFleet()
 
diff --git a/src/services/eventbridge.jl b/src/services/eventbridge.jl
index 9131bf01d2..085a0e89d1 100644
--- a/src/services/eventbridge.jl
+++ b/src/services/eventbridge.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: eventbridge
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     ActivateEventSource()
 
@@ -376,7 +376,7 @@ put_rule(Name, args::AbstractDict{String, <:Any}; aws_config::AWSConfig=global_a
 """
     PutTargets()
 
-Adds the specified targets to the specified rule, or updates the targets if they are already associated with the rule. Targets are the resources that are invoked when a rule is triggered. You can configure the following as targets for Events:   EC2 instances   SSM Run Command   SSM Automation   AWS Lambda functions   Data streams in Amazon Kinesis Data Streams   Data delivery streams in Amazon Kinesis Data Firehose   Amazon ECS tasks   AWS Step Functions state machines   AWS Batch jobs   AWS CodeBuild projects   Pipelines in AWS CodePipeline   Amazon Inspector assessment templates   Amazon SNS topics   Amazon SQS queues, including FIFO queues   The default event bus of another AWS account   Amazon API Gateway REST APIs   Creating rules with built-in targets is supported only in the AWS Management Console. The built-in targets are EC2 CreateSnapshot API call, EC2 RebootInstances API call, EC2 StopInstances API call, and EC2 TerminateInstances API call.  For some target types, PutTargets provides target-specific parameters. If the target is a Kinesis data stream, you can optionally specify which shard the event goes to by using the KinesisParameters argument. To invoke a command on multiple EC2 instances with one rule, you can use the RunCommandParameters field. To be able to make API calls against the resources that you own, Amazon EventBridge (CloudWatch Events) needs the appropriate permissions. For AWS Lambda and Amazon SNS resources, EventBridge relies on resource-based policies. For EC2 instances, Kinesis data streams, AWS Step Functions state machines and API Gateway REST APIs, EventBridge relies on IAM roles that you specify in the RoleARN argument in PutTargets. For more information, see Authentication and Access Control in the Amazon EventBridge User Guide. If another AWS account is in the same region and has granted you permission (using PutPermission), you can send events to that account. Set that account's event bus as a target of the rules in your account. To send the matched events to the other account, specify that account's event bus as the Arn value when you run PutTargets. If your account sends events to another account, your account is charged for each sent event. Each event sent to another account is charged as a custom event. The account receiving the event is not charged. For more information, see Amazon EventBridge (CloudWatch Events) Pricing.   Input, InputPath, and InputTransformer are not available with PutTarget if the target is an event bus of a different AWS account.  If you are setting the event bus of another account as the target, and that account granted permission to your account through an organization instead of directly by the account ID, then you must specify a RoleArn with proper permissions in the Target structure. For more information, see Sending and Receiving Events Between AWS Accounts in the Amazon EventBridge User Guide. For more information about enabling cross-account events, see PutPermission.  Input, InputPath, and InputTransformer are mutually exclusive and optional parameters of a target. When a rule is triggered due to a matched event:   If none of the following arguments are specified for a target, then the entire event is passed to the target in JSON format (unless the target is Amazon EC2 Run Command or Amazon ECS task, in which case nothing from the event is passed to the target).   If Input is specified in the form of valid JSON, then the matched event is overridden with this constant.   If InputPath is specified in the form of JSONPath (for example,  .detail), then only the part of the event specified in the path is passed to the target (for example, only the detail part of the event is passed).   If InputTransformer is specified, then one or more specified JSONPaths are extracted from the event and used as values in a template that you specify as the input to the target.   When you specify InputPath or InputTransformer, you must use JSON dot notation, not bracket notation. When you add targets to a rule and the associated rule triggers soon after, new or updated targets might not be immediately invoked. Allow a short period of time for changes to take effect. This action can partially fail if too many requests are made at the same time. If that happens, FailedEntryCount is non-zero in the response and each entry in FailedEntries provides the ID of the failed target and the error code.
+Adds the specified targets to the specified rule, or updates the targets if they are already associated with the rule. Targets are the resources that are invoked when a rule is triggered. You can configure the following as targets for Events:   EC2 instances   SSM Run Command   SSM Automation   AWS Lambda functions   Data streams in Amazon Kinesis Data Streams   Data delivery streams in Amazon Kinesis Data Firehose   Amazon ECS tasks   AWS Step Functions state machines   AWS Batch jobs   AWS CodeBuild projects   Pipelines in AWS CodePipeline   Amazon Inspector assessment templates   Amazon SNS topics   Amazon SQS queues, including FIFO queues   The default event bus of another AWS account   Amazon API Gateway REST APIs   Creating rules with built-in targets is supported only in the AWS Management Console. The built-in targets are EC2 CreateSnapshot API call, EC2 RebootInstances API call, EC2 StopInstances API call, and EC2 TerminateInstances API call.  For some target types, PutTargets provides target-specific parameters. If the target is a Kinesis data stream, you can optionally specify which shard the event goes to by using the KinesisParameters argument. To invoke a command on multiple EC2 instances with one rule, you can use the RunCommandParameters field. To be able to make API calls against the resources that you own, Amazon EventBridge (CloudWatch Events) needs the appropriate permissions. For AWS Lambda and Amazon SNS resources, EventBridge relies on resource-based policies. For EC2 instances, Kinesis data streams, AWS Step Functions state machines and API Gateway REST APIs, EventBridge relies on IAM roles that you specify in the RoleARN argument in PutTargets. For more information, see Authentication and Access Control in the Amazon EventBridge User Guide. If another AWS account is in the same region and has granted you permission (using PutPermission), you can send events to that account. Set that account's event bus as a target of the rules in your account. To send the matched events to the other account, specify that account's event bus as the Arn value when you run PutTargets. If your account sends events to another account, your account is charged for each sent event. Each event sent to another account is charged as a custom event. The account receiving the event is not charged. For more information, see Amazon EventBridge (CloudWatch Events) Pricing.   Input, InputPath, and InputTransformer are not available with PutTarget if the target is an event bus of a different AWS account.  If you are setting the event bus of another account as the target, and that account granted permission to your account through an organization instead of directly by the account ID, then you must specify a RoleArn with proper permissions in the Target structure. For more information, see Sending and Receiving Events Between AWS Accounts in the Amazon EventBridge User Guide. For more information about enabling cross-account events, see PutPermission.  Input, InputPath, and InputTransformer are mutually exclusive and optional parameters of a target. When a rule is triggered due to a matched event:   If none of the following arguments are specified for a target, then the entire event is passed to the target in JSON format (unless the target is Amazon EC2 Run Command or Amazon ECS task, in which case nothing from the event is passed to the target).   If Input is specified in the form of valid JSON, then the matched event is overridden with this constant.   If InputPath is specified in the form of JSONPath (for example, .detail), then only the part of the event specified in the path is passed to the target (for example, only the detail part of the event is passed).   If InputTransformer is specified, then one or more specified JSONPaths are extracted from the event and used as values in a template that you specify as the input to the target.   When you specify InputPath or InputTransformer, you must use JSON dot notation, not bracket notation. When you add targets to a rule and the associated rule triggers soon after, new or updated targets might not be immediately invoked. Allow a short period of time for changes to take effect. This action can partially fail if too many requests are made at the same time. If that happens, FailedEntryCount is non-zero in the response and each entry in FailedEntries provides the ID of the failed target and the error code.
 
 # Required Parameters
 - `Rule`: The name of the rule.
diff --git a/src/services/firehose.jl b/src/services/firehose.jl
index 8bf9041975..1d3cb9f036 100644
--- a/src/services/firehose.jl
+++ b/src/services/firehose.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: firehose
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateDeliveryStream()
 
@@ -46,7 +46,7 @@ delete_delivery_stream(DeliveryStreamName, args::AbstractDict{String, <:Any}; aw
 """
     DescribeDeliveryStream()
 
-Describes the specified delivery stream and its status. For example, after your delivery stream is created, call DescribeDeliveryStream to see whether the delivery stream is ACTIVE and therefore ready for data to be sent to it.  If the status of a delivery stream is CREATING_FAILED, this status doesn't change, and you can't invoke CreateDeliveryStream again on it. However, you can invoke the DeleteDeliveryStream operation to delete it. If the status is DELETING_FAILED, you can force deletion by invoking DeleteDeliveryStream again but with DeleteDeliveryStreamInput AllowForceDelete set to true.
+Describes the specified delivery stream and its status. For example, after your delivery stream is created, call DescribeDeliveryStream to see whether the delivery stream is ACTIVE and therefore ready for data to be sent to it.  If the status of a delivery stream is CREATING_FAILED, this status doesn't change, and you can't invoke CreateDeliveryStream again on it. However, you can invoke the DeleteDeliveryStream operation to delete it. If the status is DELETING_FAILED, you can force deletion by invoking DeleteDeliveryStream again but with DeleteDeliveryStreamInputAllowForceDelete set to true.
 
 # Required Parameters
 - `DeliveryStreamName`: The name of the delivery stream.
@@ -92,7 +92,7 @@ list_tags_for_delivery_stream(DeliveryStreamName, args::AbstractDict{String, <:A
 """
     PutRecord()
 
-Writes a single data record into an Amazon Kinesis Data Firehose delivery stream. To write multiple data records into a delivery stream, use PutRecordBatch. Applications using these operations are referred to as producers. By default, each delivery stream can take in up to 2,000 transactions per second, 5,000 records per second, or 5 MB per second. If you use PutRecord and PutRecordBatch, the limits are an aggregate across these two operations for each delivery stream. For more information about limits and how to request an increase, see Amazon Kinesis Data Firehose Limits.  You must specify the name of the delivery stream and the data record when using PutRecord. The data record consists of a data blob that can be up to 1,000 KB in size, and any kind of data. For example, it can be a segment from a log file, geographic location data, website clickstream data, and so on. Kinesis Data Firehose buffers records before delivering them to the destination. To disambiguate the data blobs at the destination, a common solution is to use delimiters in the data, such as a newline ( n) or some other character unique within the data. This allows the consumer application to parse individual data items when reading the data from the destination. The PutRecord operation returns a RecordId, which is a unique string assigned to each record. Producer applications can use this ID for purposes such as auditability and investigation. If the PutRecord operation throws a ServiceUnavailableException, back off and retry. If the exception persists, it is possible that the throughput limits have been exceeded for the delivery stream.  Data records sent to Kinesis Data Firehose are stored for 24 hours from the time they are added to a delivery stream as it tries to send the records to the destination. If the destination is unreachable for more than 24 hours, the data is no longer available.  Don't concatenate two or more base64 strings to form the data fields of your records. Instead, concatenate the raw data, then perform base64 encoding. 
+Writes a single data record into an Amazon Kinesis Data Firehose delivery stream. To write multiple data records into a delivery stream, use PutRecordBatch. Applications using these operations are referred to as producers. By default, each delivery stream can take in up to 2,000 transactions per second, 5,000 records per second, or 5 MB per second. If you use PutRecord and PutRecordBatch, the limits are an aggregate across these two operations for each delivery stream. For more information about limits and how to request an increase, see Amazon Kinesis Data Firehose Limits.  You must specify the name of the delivery stream and the data record when using PutRecord. The data record consists of a data blob that can be up to 1,000 KB in size, and any kind of data. For example, it can be a segment from a log file, geographic location data, website clickstream data, and so on. Kinesis Data Firehose buffers records before delivering them to the destination. To disambiguate the data blobs at the destination, a common solution is to use delimiters in the data, such as a newline (n) or some other character unique within the data. This allows the consumer application to parse individual data items when reading the data from the destination. The PutRecord operation returns a RecordId, which is a unique string assigned to each record. Producer applications can use this ID for purposes such as auditability and investigation. If the PutRecord operation throws a ServiceUnavailableException, back off and retry. If the exception persists, it is possible that the throughput limits have been exceeded for the delivery stream.  Data records sent to Kinesis Data Firehose are stored for 24 hours from the time they are added to a delivery stream as it tries to send the records to the destination. If the destination is unreachable for more than 24 hours, the data is no longer available.  Don't concatenate two or more base64 strings to form the data fields of your records. Instead, concatenate the raw data, then perform base64 encoding. 
 
 # Required Parameters
 - `DeliveryStreamName`: The name of the delivery stream.
@@ -106,7 +106,7 @@ put_record(DeliveryStreamName, Record, args::AbstractDict{String, <:Any}; aws_co
 """
     PutRecordBatch()
 
-Writes multiple data records into a delivery stream in a single call, which can achieve higher throughput per producer than when writing single records. To write single data records into a delivery stream, use PutRecord. Applications using these operations are referred to as producers. For information about service quota, see Amazon Kinesis Data Firehose Quota. Each PutRecordBatch request supports up to 500 records. Each record in the request can be as large as 1,000 KB (before 64-bit encoding), up to a limit of 4 MB for the entire request. These limits cannot be changed. You must specify the name of the delivery stream and the data record when using PutRecord. The data record consists of a data blob that can be up to 1,000 KB in size, and any kind of data. For example, it could be a segment from a log file, geographic location data, website clickstream data, and so on. Kinesis Data Firehose buffers records before delivering them to the destination. To disambiguate the data blobs at the destination, a common solution is to use delimiters in the data, such as a newline ( n) or some other character unique within the data. This allows the consumer application to parse individual data items when reading the data from the destination. The PutRecordBatch response includes a count of failed records, FailedPutCount, and an array of responses, RequestResponses. Even if the PutRecordBatch call succeeds, the value of FailedPutCount may be greater than 0, indicating that there are records for which the operation didn't succeed. Each entry in the RequestResponses array provides additional information about the processed record. It directly correlates with a record in the request array using the same ordering, from the top to the bottom. The response array always includes the same number of records as the request array. RequestResponses includes both successfully and unsuccessfully processed records. Kinesis Data Firehose tries to process all records in each PutRecordBatch request. A single record failure does not stop the processing of subsequent records.  A successfully processed record includes a RecordId value, which is unique for the record. An unsuccessfully processed record includes ErrorCode and ErrorMessage values. ErrorCode reflects the type of error, and is one of the following values: ServiceUnavailableException or InternalFailure. ErrorMessage provides more detailed information about the error. If there is an internal server error or a timeout, the write might have completed or it might have failed. If FailedPutCount is greater than 0, retry the request, resending only those records that might have failed processing. This minimizes the possible duplicate records and also reduces the total bytes sent (and corresponding charges). We recommend that you handle any duplicates at the destination. If PutRecordBatch throws ServiceUnavailableException, back off and retry. If the exception persists, it is possible that the throughput limits have been exceeded for the delivery stream. Data records sent to Kinesis Data Firehose are stored for 24 hours from the time they are added to a delivery stream as it attempts to send the records to the destination. If the destination is unreachable for more than 24 hours, the data is no longer available.  Don't concatenate two or more base64 strings to form the data fields of your records. Instead, concatenate the raw data, then perform base64 encoding. 
+Writes multiple data records into a delivery stream in a single call, which can achieve higher throughput per producer than when writing single records. To write single data records into a delivery stream, use PutRecord. Applications using these operations are referred to as producers. For information about service quota, see Amazon Kinesis Data Firehose Quota. Each PutRecordBatch request supports up to 500 records. Each record in the request can be as large as 1,000 KB (before 64-bit encoding), up to a limit of 4 MB for the entire request. These limits cannot be changed. You must specify the name of the delivery stream and the data record when using PutRecord. The data record consists of a data blob that can be up to 1,000 KB in size, and any kind of data. For example, it could be a segment from a log file, geographic location data, website clickstream data, and so on. Kinesis Data Firehose buffers records before delivering them to the destination. To disambiguate the data blobs at the destination, a common solution is to use delimiters in the data, such as a newline (n) or some other character unique within the data. This allows the consumer application to parse individual data items when reading the data from the destination. The PutRecordBatch response includes a count of failed records, FailedPutCount, and an array of responses, RequestResponses. Even if the PutRecordBatch call succeeds, the value of FailedPutCount may be greater than 0, indicating that there are records for which the operation didn't succeed. Each entry in the RequestResponses array provides additional information about the processed record. It directly correlates with a record in the request array using the same ordering, from the top to the bottom. The response array always includes the same number of records as the request array. RequestResponses includes both successfully and unsuccessfully processed records. Kinesis Data Firehose tries to process all records in each PutRecordBatch request. A single record failure does not stop the processing of subsequent records.  A successfully processed record includes a RecordId value, which is unique for the record. An unsuccessfully processed record includes ErrorCode and ErrorMessage values. ErrorCode reflects the type of error, and is one of the following values: ServiceUnavailableException or InternalFailure. ErrorMessage provides more detailed information about the error. If there is an internal server error or a timeout, the write might have completed or it might have failed. If FailedPutCount is greater than 0, retry the request, resending only those records that might have failed processing. This minimizes the possible duplicate records and also reduces the total bytes sent (and corresponding charges). We recommend that you handle any duplicates at the destination. If PutRecordBatch throws ServiceUnavailableException, back off and retry. If the exception persists, it is possible that the throughput limits have been exceeded for the delivery stream. Data records sent to Kinesis Data Firehose are stored for 24 hours from the time they are added to a delivery stream as it attempts to send the records to the destination. If the destination is unreachable for more than 24 hours, the data is no longer available.  Don't concatenate two or more base64 strings to form the data fields of your records. Instead, concatenate the raw data, then perform base64 encoding. 
 
 # Required Parameters
 - `DeliveryStreamName`: The name of the delivery stream.
@@ -120,7 +120,7 @@ put_record_batch(DeliveryStreamName, Records, args::AbstractDict{String, <:Any};
 """
     StartDeliveryStreamEncryption()
 
-Enables server-side encryption (SSE) for the delivery stream.  This operation is asynchronous. It returns immediately. When you invoke it, Kinesis Data Firehose first sets the encryption status of the stream to ENABLING, and then to ENABLED. The encryption status of a delivery stream is the Status property in DeliveryStreamEncryptionConfiguration. If the operation fails, the encryption status changes to ENABLING_FAILED. You can continue to read and write data to your delivery stream while the encryption status is ENABLING, but the data is not encrypted. It can take up to 5 seconds after the encryption status changes to ENABLED before all records written to the delivery stream are encrypted. To find out whether a record or a batch of records was encrypted, check the response elements PutRecordOutput Encrypted and PutRecordBatchOutput Encrypted, respectively. To check the encryption status of a delivery stream, use DescribeDeliveryStream. Even if encryption is currently enabled for a delivery stream, you can still invoke this operation on it to change the ARN of the CMK or both its type and ARN. If you invoke this method to change the CMK, and the old CMK is of type CUSTOMER_MANAGED_CMK, Kinesis Data Firehose schedules the grant it had on the old CMK for retirement. If the new CMK is of type CUSTOMER_MANAGED_CMK, Kinesis Data Firehose creates a grant that enables it to use the new CMK to encrypt and decrypt data and to manage the grant. If a delivery stream already has encryption enabled and then you invoke this operation to change the ARN of the CMK or both its type and ARN and you get ENABLING_FAILED, this only means that the attempt to change the CMK failed. In this case, encryption remains enabled with the old CMK. If the encryption status of your delivery stream is ENABLING_FAILED, you can invoke this operation again with a valid CMK. The CMK must be enabled and the key policy mustn't explicitly deny the permission for Kinesis Data Firehose to invoke KMS encrypt and decrypt operations. You can enable SSE for a delivery stream only if it's a delivery stream that uses DirectPut as its source.  The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call StartDeliveryStreamEncryption 13 times and StopDeliveryStreamEncryption 12 times for the same delivery stream in a 24-hour period.
+Enables server-side encryption (SSE) for the delivery stream.  This operation is asynchronous. It returns immediately. When you invoke it, Kinesis Data Firehose first sets the encryption status of the stream to ENABLING, and then to ENABLED. The encryption status of a delivery stream is the Status property in DeliveryStreamEncryptionConfiguration. If the operation fails, the encryption status changes to ENABLING_FAILED. You can continue to read and write data to your delivery stream while the encryption status is ENABLING, but the data is not encrypted. It can take up to 5 seconds after the encryption status changes to ENABLED before all records written to the delivery stream are encrypted. To find out whether a record or a batch of records was encrypted, check the response elements PutRecordOutputEncrypted and PutRecordBatchOutputEncrypted, respectively. To check the encryption status of a delivery stream, use DescribeDeliveryStream. Even if encryption is currently enabled for a delivery stream, you can still invoke this operation on it to change the ARN of the CMK or both its type and ARN. If you invoke this method to change the CMK, and the old CMK is of type CUSTOMER_MANAGED_CMK, Kinesis Data Firehose schedules the grant it had on the old CMK for retirement. If the new CMK is of type CUSTOMER_MANAGED_CMK, Kinesis Data Firehose creates a grant that enables it to use the new CMK to encrypt and decrypt data and to manage the grant. If a delivery stream already has encryption enabled and then you invoke this operation to change the ARN of the CMK or both its type and ARN and you get ENABLING_FAILED, this only means that the attempt to change the CMK failed. In this case, encryption remains enabled with the old CMK. If the encryption status of your delivery stream is ENABLING_FAILED, you can invoke this operation again with a valid CMK. The CMK must be enabled and the key policy mustn't explicitly deny the permission for Kinesis Data Firehose to invoke KMS encrypt and decrypt operations. You can enable SSE for a delivery stream only if it's a delivery stream that uses DirectPut as its source.  The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call StartDeliveryStreamEncryption 13 times and StopDeliveryStreamEncryption 12 times for the same delivery stream in a 24-hour period.
 
 # Required Parameters
 - `DeliveryStreamName`: The name of the delivery stream for which you want to enable server-side encryption (SSE).
@@ -135,7 +135,7 @@ start_delivery_stream_encryption(DeliveryStreamName, args::AbstractDict{String,
 """
     StopDeliveryStreamEncryption()
 
-Disables server-side encryption (SSE) for the delivery stream.  This operation is asynchronous. It returns immediately. When you invoke it, Kinesis Data Firehose first sets the encryption status of the stream to DISABLING, and then to DISABLED. You can continue to read and write data to your stream while its status is DISABLING. It can take up to 5 seconds after the encryption status changes to DISABLED before all records written to the delivery stream are no longer subject to encryption. To find out whether a record or a batch of records was encrypted, check the response elements PutRecordOutput Encrypted and PutRecordBatchOutput Encrypted, respectively. To check the encryption state of a delivery stream, use DescribeDeliveryStream.  If SSE is enabled using a customer managed CMK and then you invoke StopDeliveryStreamEncryption, Kinesis Data Firehose schedules the related KMS grant for retirement and then retires it after it ensures that it is finished delivering records to the destination. The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call StartDeliveryStreamEncryption 13 times and StopDeliveryStreamEncryption 12 times for the same delivery stream in a 24-hour period.
+Disables server-side encryption (SSE) for the delivery stream.  This operation is asynchronous. It returns immediately. When you invoke it, Kinesis Data Firehose first sets the encryption status of the stream to DISABLING, and then to DISABLED. You can continue to read and write data to your stream while its status is DISABLING. It can take up to 5 seconds after the encryption status changes to DISABLED before all records written to the delivery stream are no longer subject to encryption. To find out whether a record or a batch of records was encrypted, check the response elements PutRecordOutputEncrypted and PutRecordBatchOutputEncrypted, respectively. To check the encryption state of a delivery stream, use DescribeDeliveryStream.  If SSE is enabled using a customer managed CMK and then you invoke StopDeliveryStreamEncryption, Kinesis Data Firehose schedules the related KMS grant for retirement and then retires it after it ensures that it is finished delivering records to the destination. The StartDeliveryStreamEncryption and StopDeliveryStreamEncryption operations have a combined limit of 25 calls per delivery stream per 24 hours. For example, you reach the limit if you call StartDeliveryStreamEncryption 13 times and StopDeliveryStreamEncryption 12 times for the same delivery stream in a 24-hour period.
 
 # Required Parameters
 - `DeliveryStreamName`: The name of the delivery stream for which you want to disable server-side encryption (SSE).
diff --git a/src/services/fms.jl b/src/services/fms.jl
index 92898c1b9e..e548fb2901 100644
--- a/src/services/fms.jl
+++ b/src/services/fms.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: fms
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateAdminAccount()
 
diff --git a/src/services/forecast.jl b/src/services/forecast.jl
index 85880c3433..7b8bc20ea3 100644
--- a/src/services/forecast.jl
+++ b/src/services/forecast.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: forecast
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateDataset()
 
diff --git a/src/services/forecastquery.jl b/src/services/forecastquery.jl
index 84f9577f81..19c8b5cd65 100644
--- a/src/services/forecastquery.jl
+++ b/src/services/forecastquery.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: forecastquery
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     QueryForecast()
 
diff --git a/src/services/frauddetector.jl b/src/services/frauddetector.jl
index c7cf620be1..8979dda453 100644
--- a/src/services/frauddetector.jl
+++ b/src/services/frauddetector.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: frauddetector
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchCreateVariable()
 
diff --git a/src/services/fsx.jl b/src/services/fsx.jl
index a83b0ee641..2f1042dc51 100644
--- a/src/services/fsx.jl
+++ b/src/services/fsx.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: fsx
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelDataRepositoryTask()
 
diff --git a/src/services/gamelift.jl b/src/services/gamelift.jl
index 58ed70890e..e21b1612f6 100644
--- a/src/services/gamelift.jl
+++ b/src/services/gamelift.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: gamelift
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptMatch()
 
diff --git a/src/services/glacier.jl b/src/services/glacier.jl
index 0052695381..3053f27e09 100644
--- a/src/services/glacier.jl
+++ b/src/services/glacier.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: glacier
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AbortMultipartUpload()
 
@@ -297,7 +297,7 @@ This operation initiates the vault locking process by doing the following:   Ins
 - `vaultName`: The name of the vault.
 
 # Optional Parameters
-- `policy`: The vault lock policy as a JSON string, which uses \" \" as an escape character.
+- `policy`: The vault lock policy as a JSON string, which uses \"\" as an escape character.
 """
 
 initiate_vault_lock(accountId, vaultName; aws_config::AWSConfig=global_aws_config()) = glacier("POST", "/$(accountId)/vaults/$(vaultName)/lock-policy"; aws_config=aws_config)
diff --git a/src/services/global_accelerator.jl b/src/services/global_accelerator.jl
index 55ea96dcc9..3074a60a1e 100644
--- a/src/services/global_accelerator.jl
+++ b/src/services/global_accelerator.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: global_accelerator
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AdvertiseByoipCidr()
 
diff --git a/src/services/glue.jl b/src/services/glue.jl
index 165e960a56..5fb89d068d 100644
--- a/src/services/glue.jl
+++ b/src/services/glue.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: glue
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchCreatePartition()
 
diff --git a/src/services/greengrass.jl b/src/services/greengrass.jl
index c4dbbeeed9..3a23168977 100644
--- a/src/services/greengrass.jl
+++ b/src/services/greengrass.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: greengrass
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateRoleToGroup()
 
diff --git a/src/services/groundstation.jl b/src/services/groundstation.jl
index 73fcd8d340..5fe58b4f7b 100644
--- a/src/services/groundstation.jl
+++ b/src/services/groundstation.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: groundstation
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelContact()
 
diff --git a/src/services/guardduty.jl b/src/services/guardduty.jl
index ff2aeb5c11..7ed1e59312 100644
--- a/src/services/guardduty.jl
+++ b/src/services/guardduty.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: guardduty
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptInvitation()
 
diff --git a/src/services/health.jl b/src/services/health.jl
index 3cf7f90ef5..98a2202115 100644
--- a/src/services/health.jl
+++ b/src/services/health.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: health
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeAffectedAccountsForOrganization()
 
diff --git a/src/services/honeycode.jl b/src/services/honeycode.jl
index 4779861924..15c93d32a3 100644
--- a/src/services/honeycode.jl
+++ b/src/services/honeycode.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: honeycode
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GetScreenData()
 
diff --git a/src/services/iam.jl b/src/services/iam.jl
index 701f440366..032e94fdd7 100644
--- a/src/services/iam.jl
+++ b/src/services/iam.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iam
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddClientIDToOpenIDConnectProvider()
 
@@ -94,7 +94,7 @@ attach_user_policy(PolicyArn, UserName, args::AbstractDict{String, <:Any}; aws_c
 Changes the password of the IAM user who is calling this operation. The AWS account root user password is not affected by this operation. To change the password for a different user, see UpdateLoginProfile. For more information about modifying passwords, see Managing Passwords in the IAM User Guide.
 
 # Required Parameters
-- `NewPassword`: The new password. The new password must conform to the AWS account's password policy, if one exists. The regex pattern that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space ( u0020) through the end of the ASCII character range ( u00FF). You can also include the tab ( u0009), line feed ( u000A), and carriage return ( u000D) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.
+- `NewPassword`: The new password. The new password must conform to the AWS account's password policy, if one exists. The regex pattern that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space (u0020) through the end of the ASCII character range (u00FF). You can also include the tab (u0009), line feed (u000A), and carriage return (u000D) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.
 - `OldPassword`: The IAM user's current password.
 
 """
@@ -136,7 +136,7 @@ Creates a new group. The number and size of IAM resources in an AWS account are
 - `GroupName`: The name of the group to create. Do not include the path in this value. IAM user, group, role, and policy names must be unique within the account. Names are not distinguished by case. For example, you cannot create resources named both \"MyResource\" and \"myresource\".
 
 # Optional Parameters
-- `Path`:  The path to the group. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `Path`:  The path to the group. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 create_group(GroupName; aws_config::AWSConfig=global_aws_config()) = iam("CreateGroup", Dict{String, Any}("GroupName"=>GroupName); aws_config=aws_config)
@@ -151,7 +151,7 @@ create_group(GroupName, args::AbstractDict{String, <:Any}; aws_config::AWSConfig
 - `InstanceProfileName`: The name of the instance profile to create. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 # Optional Parameters
-- `Path`:  The path to the instance profile. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `Path`:  The path to the instance profile. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 create_instance_profile(InstanceProfileName; aws_config::AWSConfig=global_aws_config()) = iam("CreateInstanceProfile", Dict{String, Any}("InstanceProfileName"=>InstanceProfileName); aws_config=aws_config)
@@ -163,7 +163,7 @@ create_instance_profile(InstanceProfileName, args::AbstractDict{String, <:Any};
  Creates a password for the specified user, giving the user the ability to access AWS services through the AWS Management Console. For more information about managing passwords, see Managing Passwords in the IAM User Guide.
 
 # Required Parameters
-- `Password`: The new password for the user. The regex pattern that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space ( u0020) through the end of the ASCII character range ( u00FF). You can also include the tab ( u0009), line feed ( u000A), and carriage return ( u000D) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.
+- `Password`: The new password for the user. The regex pattern that is used to validate this parameter is a string of characters. That string can include almost any printable ASCII character from the space (u0020) through the end of the ASCII character range (u00FF). You can also include the tab (u0009), line feed (u000A), and carriage return (u000D) characters. Any of these characters are valid in a password. However, many tools, such as the AWS Management Console, might restrict the ability to type certain characters because they have special meaning within that tool.
 - `UserName`: The name of the IAM user to create a password for. The user must already exist. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 # Optional Parameters
@@ -195,12 +195,12 @@ create_open_idconnect_provider(ThumbprintList, Url, args::AbstractDict{String, <
 Creates a new managed policy for your AWS account. This operation creates a policy version with a version identifier of v1 and sets v1 as the policy's default version. For more information about policy versions, see Versioning for Managed Policies in the IAM User Guide. For more information about managed policies in general, see Managed Policies and Inline Policies in the IAM User Guide.
 
 # Required Parameters
-- `PolicyDocument`: The JSON policy document that you want to use as the content for the new policy. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyDocument`: The JSON policy document that you want to use as the content for the new policy. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `PolicyName`: The friendly name of the policy. IAM user, group, role, and policy names must be unique within the account. Names are not distinguished by case. For example, you cannot create resources named both \"MyResource\" and \"myresource\".
 
 # Optional Parameters
 - `Description`: A friendly description of the policy. Typically used to store information about the permissions defined in the policy. For example, \"Grants access to production DynamoDB tables.\" The policy description is immutable. After a value is assigned, it cannot be changed.
-- `Path`: The path for the policy. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `Path`: The path for the policy. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 create_policy(PolicyDocument, PolicyName; aws_config::AWSConfig=global_aws_config()) = iam("CreatePolicy", Dict{String, Any}("PolicyDocument"=>PolicyDocument, "PolicyName"=>PolicyName); aws_config=aws_config)
@@ -213,7 +213,7 @@ Creates a new version of the specified managed policy. To update a managed polic
 
 # Required Parameters
 - `PolicyArn`: The Amazon Resource Name (ARN) of the IAM policy to which you want to add a new version. For more information about ARNs, see Amazon Resource Names (ARNs) and AWS Service Namespaces in the AWS General Reference.
-- `PolicyDocument`: The JSON policy document that you want to use as the content for this new version of the policy. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyDocument`: The JSON policy document that you want to use as the content for this new version of the policy. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 
 # Optional Parameters
 - `SetAsDefault`: Specifies whether to set this version as the policy's default version. When this parameter is true, the new policy version becomes the operative version. That is, it becomes the version that is in effect for the IAM users, groups, and roles that the policy is attached to. For more information about managed policy versions, see Versioning for Managed Policies in the IAM User Guide.
@@ -228,13 +228,13 @@ create_policy_version(PolicyArn, PolicyDocument, args::AbstractDict{String, <:An
 Creates a new role for your AWS account. For more information about roles, go to IAM Roles. The number and size of IAM resources in an AWS account are limited. For more information, see IAM and STS Quotas in the IAM User Guide.
 
 # Required Parameters
-- `AssumeRolePolicyDocument`: The trust relationship policy document that grants an entity permission to assume the role. In IAM, you must provide a JSON policy that has been converted to a string. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)    Upon success, the response includes the same trust policy in JSON format.
+- `AssumeRolePolicyDocument`: The trust relationship policy document that grants an entity permission to assume the role. In IAM, you must provide a JSON policy that has been converted to a string. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)    Upon success, the response includes the same trust policy in JSON format.
 - `RoleName`: The name of the role to create. IAM user, group, role, and policy names must be unique within the account. Names are not distinguished by case. For example, you cannot create resources named both \"MyResource\" and \"myresource\".
 
 # Optional Parameters
 - `Description`: A description of the role.
 - `MaxSessionDuration`: The maximum session duration (in seconds) that you want to set for the specified role. If you do not specify a value for this setting, the default maximum of one hour is applied. This setting can have a value from 1 hour to 12 hours. Anyone who assumes the role from the AWS CLI or API can use the DurationSeconds API parameter or the duration-seconds CLI parameter to request a longer session. The MaxSessionDuration setting determines the maximum duration that can be requested using the DurationSeconds parameter. If users don't specify a value for the DurationSeconds parameter, their security credentials are valid for one hour by default. This applies when you use the AssumeRole* API operations or the assume-role* CLI operations but does not apply when you use those operations to create a console URL. For more information, see Using IAM Roles in the IAM User Guide.
-- `Path`:  The path to the role. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `Path`:  The path to the role. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 - `PermissionsBoundary`: The ARN of the policy that is used to set the permissions boundary for the role.
 - `Tags`: A list of tags that you want to attach to the newly created role. Each tag consists of a key name and an associated value. For more information about tagging, see Tagging IAM Identities in the IAM User Guide.  If any one of the tags is invalid or if you exceed the allowed number of tags per role, then the entire request fails and the role is not created. 
 """
@@ -295,7 +295,7 @@ Creates a new IAM user for your AWS account. The number and size of IAM resource
 - `UserName`: The name of the user to create. IAM user, group, role, and policy names must be unique within the account. Names are not distinguished by case. For example, you cannot create resources named both \"MyResource\" and \"myresource\".
 
 # Optional Parameters
-- `Path`:  The path for the user name. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `Path`:  The path for the user name. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 - `PermissionsBoundary`: The ARN of the policy that is used to set the permissions boundary for the user.
 - `Tags`: A list of tags that you want to attach to the newly created user. Each tag consists of a key name and an associated value. For more information about tagging, see Tagging IAM Identities in the IAM User Guide.  If any one of the tags is invalid or if you exceed the allowed number of tags per user, then the entire request fails and the user is not created. 
 """
@@ -312,7 +312,7 @@ Creates a new virtual MFA device for the AWS account. After creating the virtual
 - `VirtualMFADeviceName`: The name of the virtual MFA device. Use with path to uniquely identify a virtual MFA device. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 # Optional Parameters
-- `Path`:  The path for the virtual MFA device. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `Path`:  The path for the virtual MFA device. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 create_virtual_mfadevice(VirtualMFADeviceName; aws_config::AWSConfig=global_aws_config()) = iam("CreateVirtualMFADevice", Dict{String, Any}("VirtualMFADeviceName"=>VirtualMFADeviceName); aws_config=aws_config)
@@ -790,7 +790,7 @@ get_account_summary(args::AbstractDict{String, <:Any}; aws_config::AWSConfig=glo
 Gets a list of all of the context keys referenced in the input policies. The policies are supplied as a list of one or more strings. To get the context keys from policies associated with an IAM user, group, or role, use GetContextKeysForPrincipalPolicy. Context keys are variables maintained by AWS and its services that provide details about the context of an API query request. Context keys can be evaluated by testing against a value specified in an IAM policy. Use GetContextKeysForCustomPolicy to understand what key names and values you must supply when you call SimulateCustomPolicy. Note that all parameters are shown in unencoded form here for clarity but must be URL encoded to be included as a part of a real HTML request.
 
 # Required Parameters
-- `PolicyInputList`: A list of policies for which you want the list of context keys referenced in those policies. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyInputList`: A list of policies for which you want the list of context keys referenced in those policies. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 
 """
 
@@ -806,7 +806,7 @@ Gets a list of all of the context keys referenced in all the IAM policies that a
 - `PolicySourceArn`: The ARN of a user, group, or role whose policies contain the context keys that you want listed. If you specify a user, the list includes context keys that are found in all policies that are attached to the user. The list also includes all groups that the user is a member of. If you pick a group or a role, then it includes only those context keys that are found in policies attached to that entity. Note that all parameters are shown in unencoded form here for clarity, but must be URL encoded to be included as a part of a real HTML request. For more information about ARNs, see Amazon Resource Names (ARNs) and AWS Service Namespaces in the AWS General Reference.
 
 # Optional Parameters
-- `PolicyInputList`: An optional list of additional policies for which you want the list of context keys that are referenced. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyInputList`: An optional list of additional policies for which you want the list of context keys that are referenced. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 """
 
 get_context_keys_for_principal_policy(PolicySourceArn; aws_config::AWSConfig=global_aws_config()) = iam("GetContextKeysForPrincipalPolicy", Dict{String, Any}("PolicySourceArn"=>PolicySourceArn); aws_config=aws_config)
@@ -1113,7 +1113,7 @@ Lists all managed policies that are attached to the specified IAM group. An IAM
 # Optional Parameters
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 list_attached_group_policies(GroupName; aws_config::AWSConfig=global_aws_config()) = iam("ListAttachedGroupPolicies", Dict{String, Any}("GroupName"=>GroupName); aws_config=aws_config)
@@ -1130,7 +1130,7 @@ Lists all managed policies that are attached to the specified IAM role. An IAM r
 # Optional Parameters
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 list_attached_role_policies(RoleName; aws_config::AWSConfig=global_aws_config()) = iam("ListAttachedRolePolicies", Dict{String, Any}("RoleName"=>RoleName); aws_config=aws_config)
@@ -1147,7 +1147,7 @@ Lists all managed policies that are attached to the specified IAM user. An IAM u
 # Optional Parameters
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 list_attached_user_policies(UserName; aws_config::AWSConfig=global_aws_config()) = iam("ListAttachedUserPolicies", Dict{String, Any}("UserName"=>UserName); aws_config=aws_config)
@@ -1165,7 +1165,7 @@ Lists all IAM users, groups, and roles that the specified managed policy is atta
 - `EntityFilter`: The entity type to use for filtering the results. For example, when EntityFilter is Role, only the roles that are attached to the specified policy are returned. This parameter is optional. If it is not included, all attached entities (users, groups, and roles) are returned. The argument for this parameter must be one of the valid values listed below.
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all entities. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all entities. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 - `PolicyUsageFilter`: The policy usage method to use for filtering the results. To list only permissions policies, set PolicyUsageFilter to PermissionsPolicy. To list only the policies used to set permissions boundaries, set the value to PermissionsBoundary. This parameter is optional. If it is not included, all policies are returned. 
 """
 
@@ -1196,7 +1196,7 @@ Lists the IAM groups that have the specified path prefix.  You can paginate the
 # Optional Parameters
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`:  The path prefix for filtering the results. For example, the prefix /division_abc/subdivision_xyz/ gets all groups whose path starts with /division_abc/subdivision_xyz/. This parameter is optional. If it is not included, it defaults to a slash (/), listing all groups. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`:  The path prefix for filtering the results. For example, the prefix /division_abc/subdivision_xyz/ gets all groups whose path starts with /division_abc/subdivision_xyz/. This parameter is optional. If it is not included, it defaults to a slash (/), listing all groups. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 list_groups(; aws_config::AWSConfig=global_aws_config()) = iam("ListGroups"; aws_config=aws_config)
@@ -1226,7 +1226,7 @@ Lists the instance profiles that have the specified path prefix. If there are no
 # Optional Parameters
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`:  The path prefix for filtering the results. For example, the prefix /application_abc/component_xyz/ gets all instance profiles whose path starts with /application_abc/component_xyz/. This parameter is optional. If it is not included, it defaults to a slash (/), listing all instance profiles. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`:  The path prefix for filtering the results. For example, the prefix /application_abc/component_xyz/ gets all instance profiles whose path starts with /application_abc/component_xyz/. This parameter is optional. If it is not included, it defaults to a slash (/), listing all instance profiles. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 list_instance_profiles(; aws_config::AWSConfig=global_aws_config()) = iam("ListInstanceProfiles"; aws_config=aws_config)
@@ -1281,7 +1281,7 @@ Lists all the managed policies that are available in your AWS account, including
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
 - `OnlyAttached`: A flag to filter the results to only the attached policies. When OnlyAttached is true, the returned list contains only the policies that are attached to an IAM user, group, or role. When OnlyAttached is false, or when the parameter is not included, all policies are returned.
-- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`: The path prefix for filtering the results. This parameter is optional. If it is not included, it defaults to a slash (/), listing all policies. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 - `PolicyUsageFilter`: The policy usage method to use for filtering the results. To list only permissions policies, set PolicyUsageFilter to PermissionsPolicy. To list only the policies used to set permissions boundaries, set the value to PermissionsBoundary. This parameter is optional. If it is not included, all policies are returned. 
 - `Scope`: The scope to use for filtering the results. To list only AWS managed policies, set Scope to AWS. To list only the customer managed policies in your AWS account, set Scope to Local. This parameter is optional. If it is not included, or if it is set to All, all policies are returned.
 """
@@ -1361,7 +1361,7 @@ Lists the IAM roles that have the specified path prefix. If there are none, the
 # Optional Parameters
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`:  The path prefix for filtering the results. For example, the prefix /application_abc/component_xyz/ gets all roles whose path starts with /application_abc/component_xyz/. This parameter is optional. If it is not included, it defaults to a slash (/), listing all roles. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`:  The path prefix for filtering the results. For example, the prefix /application_abc/component_xyz/ gets all roles whose path starts with /application_abc/component_xyz/. This parameter is optional. If it is not included, it defaults to a slash (/), listing all roles. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 list_roles(; aws_config::AWSConfig=global_aws_config()) = iam("ListRoles"; aws_config=aws_config)
@@ -1399,7 +1399,7 @@ Lists the server certificates stored in IAM that have the specified path prefix.
 # Optional Parameters
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`:  The path prefix for filtering the results. For example: /company/servercerts would get all server certificates for which the path starts with /company/servercerts. This parameter is optional. If it is not included, it defaults to a slash (/), listing all server certificates. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`:  The path prefix for filtering the results. For example: /company/servercerts would get all server certificates for which the path starts with /company/servercerts. This parameter is optional. If it is not included, it defaults to a slash (/), listing all server certificates. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 list_server_certificates(; aws_config::AWSConfig=global_aws_config()) = iam("ListServerCertificates"; aws_config=aws_config)
@@ -1472,7 +1472,7 @@ Lists the IAM users that have the specified path prefix. If no path prefix is sp
 # Optional Parameters
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PathPrefix`:  The path prefix for filtering the results. For example: /division_abc/subdivision_xyz/, which would get all user names whose path starts with /division_abc/subdivision_xyz/. This parameter is optional. If it is not included, it defaults to a slash (/), listing all user names. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `PathPrefix`:  The path prefix for filtering the results. For example: /division_abc/subdivision_xyz/, which would get all user names whose path starts with /division_abc/subdivision_xyz/. This parameter is optional. If it is not included, it defaults to a slash (/), listing all user names. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 list_users(; aws_config::AWSConfig=global_aws_config()) = iam("ListUsers"; aws_config=aws_config)
@@ -1499,7 +1499,7 @@ Adds or updates an inline policy document that is embedded in the specified IAM
 
 # Required Parameters
 - `GroupName`: The name of the group to associate the policy with. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-.
-- `PolicyDocument`: The policy document. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyDocument`: The policy document. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `PolicyName`: The name of the policy document. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 """
@@ -1527,7 +1527,7 @@ put_role_permissions_boundary(PermissionsBoundary, RoleName, args::AbstractDict{
 Adds or updates an inline policy document that is embedded in the specified IAM role. When you embed an inline policy in a role, the inline policy is used as part of the role's access (permissions) policy. The role's trust policy is created at the same time as the role, using CreateRole. You can update a role's trust policy using UpdateAssumeRolePolicy. For more information about IAM roles, go to Using Roles to Delegate Permissions and Federate Identities. A role can also have a managed policy attached to it. To attach a managed policy to a role, use AttachRolePolicy. To create a new managed policy, use CreatePolicy. For information about policies, see Managed Policies and Inline Policies in the IAM User Guide. For information about limits on the number of inline policies that you can embed with a role, see Limitations on IAM Entities in the IAM User Guide.  Because policy documents can be large, you should use POST rather than GET when calling PutRolePolicy. For general information about using the Query API with IAM, go to Making Query Requests in the IAM User Guide. 
 
 # Required Parameters
-- `PolicyDocument`: The policy document. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyDocument`: The policy document. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `PolicyName`: The name of the policy document. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 - `RoleName`: The name of the role to associate the policy with. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
@@ -1556,7 +1556,7 @@ put_user_permissions_boundary(PermissionsBoundary, UserName, args::AbstractDict{
 Adds or updates an inline policy document that is embedded in the specified IAM user. An IAM user can also have a managed policy attached to it. To attach a managed policy to a user, use AttachUserPolicy. To create a new managed policy, use CreatePolicy. For information about policies, see Managed Policies and Inline Policies in the IAM User Guide. For information about limits on the number of inline policies that you can embed in a user, see Limitations on IAM Entities in the IAM User Guide.  Because policy documents can be large, you should use POST rather than GET when calling PutUserPolicy. For general information about using the Query API with IAM, go to Making Query Requests in the IAM User Guide. 
 
 # Required Parameters
-- `PolicyDocument`: The policy document. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyDocument`: The policy document. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `PolicyName`: The name of the policy document. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 - `UserName`: The name of the user to associate the policy with. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
@@ -1672,18 +1672,18 @@ Simulate how a set of IAM policies and optionally a resource-based policy works
 
 # Required Parameters
 - `ActionNames`: A list of names of API operations to evaluate in the simulation. Each operation is evaluated against each resource. Each operation must include the service identifier, such as iam:CreateUser. This operation does not support using wildcards (*) in an action name.
-- `PolicyInputList`: A list of policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. Do not include any resource-based policies in this parameter. Any resource-based policy must be submitted with the ResourcePolicy parameter. The policies cannot be \"scope-down\" policies, such as you could include in a call to GetFederationToken or one of the AssumeRole API operations. In other words, do not use policies designed to restrict what a user can do while using the temporary credentials. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyInputList`: A list of policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. Do not include any resource-based policies in this parameter. Any resource-based policy must be submitted with the ResourcePolicy parameter. The policies cannot be \"scope-down\" policies, such as you could include in a call to GetFederationToken or one of the AssumeRole API operations. In other words, do not use policies designed to restrict what a user can do while using the temporary credentials. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 
 # Optional Parameters
 - `CallerArn`: The ARN of the IAM user that you want to use as the simulated caller of the API operations. CallerArn is required if you include a ResourcePolicy so that the policy's Principal element has a value to use in evaluating the policy. You can specify only the ARN of an IAM user. You cannot specify the ARN of an assumed role, federated user, or a service principal.
 - `ContextEntries`: A list of context keys and corresponding values for the simulation to use. Whenever a context key is evaluated in one of the simulated IAM permissions policies, the corresponding value is supplied.
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PermissionsBoundaryPolicyInputList`: The IAM permissions boundary policy to simulate. The permissions boundary sets the maximum permissions that an IAM entity can have. You can input only one permissions boundary when you pass a policy to this operation. For more information about permissions boundaries, see Permissions Boundaries for IAM Entities in the IAM User Guide. The policy input is specified as a string that contains the complete, valid JSON text of a permissions boundary policy. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PermissionsBoundaryPolicyInputList`: The IAM permissions boundary policy to simulate. The permissions boundary sets the maximum permissions that an IAM entity can have. You can input only one permissions boundary when you pass a policy to this operation. For more information about permissions boundaries, see Permissions Boundaries for IAM Entities in the IAM User Guide. The policy input is specified as a string that contains the complete, valid JSON text of a permissions boundary policy. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `ResourceArns`: A list of ARNs of AWS resources to include in the simulation. If this parameter is not provided, then the value defaults to * (all resources). Each API in the ActionNames parameter is evaluated for each resource in this list. The simulation determines the access result (allowed or denied) of each combination and reports it in the response. The simulation does not automatically retrieve policies for the specified resources. If you want to include a resource policy in the simulation, then you must include the policy as a string in the ResourcePolicy parameter. If you include a ResourcePolicy, then it must be applicable to all of the resources included in the simulation or you receive an invalid input error. For more information about ARNs, see Amazon Resource Names (ARNs) and AWS Service Namespaces in the AWS General Reference.
 - `ResourceHandlingOption`: Specifies the type of simulation to run. Different API operations that support resource-based policies require different combinations of resources. By specifying the type of simulation to run, you enable the policy simulator to enforce the presence of the required resources to ensure reliable simulation results. If your simulation does not match one of the following scenarios, then you can omit this parameter. The following list shows each of the supported scenario values and the resources that you must define to run the simulation. Each of the EC2 scenarios requires that you specify instance, image, and security-group resources. If your scenario includes an EBS volume, then you must specify that volume as a resource. If the EC2 scenario includes VPC, then you must supply the network-interface resource. If it includes an IP subnet, then you must specify the subnet resource. For more information on the EC2 scenario options, see Supported Platforms in the Amazon EC2 User Guide.    EC2-Classic-InstanceStore  instance, image, security-group    EC2-Classic-EBS  instance, image, security-group, volume    EC2-VPC-InstanceStore  instance, image, security-group, network-interface    EC2-VPC-InstanceStore-Subnet  instance, image, security-group, network-interface, subnet    EC2-VPC-EBS  instance, image, security-group, network-interface, volume    EC2-VPC-EBS-Subnet  instance, image, security-group, network-interface, subnet, volume  
 - `ResourceOwner`: An ARN representing the AWS account ID that specifies the owner of any simulated resource that does not identify its owner in the resource ARN. Examples of resource ARNs include an S3 bucket or object. If ResourceOwner is specified, it is also used as the account owner of any ResourcePolicy included in the simulation. If the ResourceOwner parameter is not specified, then the owner of the resources and the resource policy defaults to the account of the identity provided in CallerArn. This parameter is required only if you specify a resource-based policy and account that owns the resource is different from the account that owns the simulated calling user CallerArn. The ARN for an account uses the following syntax: arn:aws:iam::AWS-account-ID:root. For example, to represent the account with the 112233445566 ID, use the following ARN: arn:aws:iam::112233445566-ID:root. 
-- `ResourcePolicy`: A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `ResourcePolicy`: A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 """
 
 simulate_custom_policy(ActionNames, PolicyInputList; aws_config::AWSConfig=global_aws_config()) = iam("SimulateCustomPolicy", Dict{String, Any}("ActionNames"=>ActionNames, "PolicyInputList"=>PolicyInputList); aws_config=aws_config)
@@ -1703,12 +1703,12 @@ Simulate how a set of IAM policies attached to an IAM entity works with a list o
 - `ContextEntries`: A list of context keys and corresponding values for the simulation to use. Whenever a context key is evaluated in one of the simulated IAM permissions policies, the corresponding value is supplied.
 - `Marker`: Use this parameter only when paginating results and only after you receive a response indicating that the results are truncated. Set it to the value of the Marker element in the response that you received to indicate where the next call should start.
 - `MaxItems`: Use this only when paginating results to indicate the maximum number of items you want in the response. If additional items exist beyond the maximum you specify, the IsTruncated response element is true. If you do not include this parameter, the number of items defaults to 100. Note that IAM might return fewer results, even when there are more results available. In that case, the IsTruncated response element returns true, and Marker contains a value to include in the subsequent call that tells the service where to continue from.
-- `PermissionsBoundaryPolicyInputList`: The IAM permissions boundary policy to simulate. The permissions boundary sets the maximum permissions that the entity can have. You can input only one permissions boundary when you pass a policy to this operation. An IAM entity can only have one permissions boundary in effect at a time. For example, if a permissions boundary is attached to an entity and you pass in a different permissions boundary policy using this parameter, then the new permissions boundary policy is used for the simulation. For more information about permissions boundaries, see Permissions Boundaries for IAM Entities in the IAM User Guide. The policy input is specified as a string containing the complete, valid JSON text of a permissions boundary policy. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
-- `PolicyInputList`: An optional list of additional policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PermissionsBoundaryPolicyInputList`: The IAM permissions boundary policy to simulate. The permissions boundary sets the maximum permissions that the entity can have. You can input only one permissions boundary when you pass a policy to this operation. An IAM entity can only have one permissions boundary in effect at a time. For example, if a permissions boundary is attached to an entity and you pass in a different permissions boundary policy using this parameter, then the new permissions boundary policy is used for the simulation. For more information about permissions boundaries, see Permissions Boundaries for IAM Entities in the IAM User Guide. The policy input is specified as a string containing the complete, valid JSON text of a permissions boundary policy. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
+- `PolicyInputList`: An optional list of additional policy documents to include in the simulation. Each document is specified as a string containing the complete, valid JSON text of an IAM policy. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `ResourceArns`: A list of ARNs of AWS resources to include in the simulation. If this parameter is not provided, then the value defaults to * (all resources). Each API in the ActionNames parameter is evaluated for each resource in this list. The simulation determines the access result (allowed or denied) of each combination and reports it in the response. The simulation does not automatically retrieve policies for the specified resources. If you want to include a resource policy in the simulation, then you must include the policy as a string in the ResourcePolicy parameter. For more information about ARNs, see Amazon Resource Names (ARNs) and AWS Service Namespaces in the AWS General Reference.
 - `ResourceHandlingOption`: Specifies the type of simulation to run. Different API operations that support resource-based policies require different combinations of resources. By specifying the type of simulation to run, you enable the policy simulator to enforce the presence of the required resources to ensure reliable simulation results. If your simulation does not match one of the following scenarios, then you can omit this parameter. The following list shows each of the supported scenario values and the resources that you must define to run the simulation. Each of the EC2 scenarios requires that you specify instance, image, and security group resources. If your scenario includes an EBS volume, then you must specify that volume as a resource. If the EC2 scenario includes VPC, then you must supply the network interface resource. If it includes an IP subnet, then you must specify the subnet resource. For more information on the EC2 scenario options, see Supported Platforms in the Amazon EC2 User Guide.    EC2-Classic-InstanceStore  instance, image, security group    EC2-Classic-EBS  instance, image, security group, volume    EC2-VPC-InstanceStore  instance, image, security group, network interface    EC2-VPC-InstanceStore-Subnet  instance, image, security group, network interface, subnet    EC2-VPC-EBS  instance, image, security group, network interface, volume    EC2-VPC-EBS-Subnet  instance, image, security group, network interface, subnet, volume  
 - `ResourceOwner`: An AWS account ID that specifies the owner of any simulated resource that does not identify its owner in the resource ARN. Examples of resource ARNs include an S3 bucket or object. If ResourceOwner is specified, it is also used as the account owner of any ResourcePolicy included in the simulation. If the ResourceOwner parameter is not specified, then the owner of the resources and the resource policy defaults to the account of the identity provided in CallerArn. This parameter is required only if you specify a resource-based policy and account that owns the resource is different from the account that owns the simulated calling user CallerArn.
-- `ResourcePolicy`: A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `ResourcePolicy`: A resource-based policy to include in the simulation provided as a string. Each resource in the simulation is treated as if it had this policy attached. You can include only one resource-based policy in a simulation. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 """
 
 simulate_principal_policy(ActionNames, PolicySourceArn; aws_config::AWSConfig=global_aws_config()) = iam("SimulatePrincipalPolicy", Dict{String, Any}("ActionNames"=>ActionNames, "PolicySourceArn"=>PolicySourceArn); aws_config=aws_config)
@@ -1799,7 +1799,7 @@ Updates the password policy settings for the AWS account.    This operation does
 - `PasswordReusePrevention`: Specifies the number of previous passwords that IAM users are prevented from reusing. If you do not specify a value for this parameter, then the operation uses the default value of 0. The result is that IAM users are not prevented from reusing previous passwords.
 - `RequireLowercaseCharacters`: Specifies whether IAM user passwords must contain at least one lowercase character from the ISO basic Latin alphabet (a to z). If you do not specify a value for this parameter, then the operation uses the default value of false. The result is that passwords do not require at least one lowercase character.
 - `RequireNumbers`: Specifies whether IAM user passwords must contain at least one numeric character (0 to 9). If you do not specify a value for this parameter, then the operation uses the default value of false. The result is that passwords do not require at least one numeric character.
-- `RequireSymbols`: Specifies whether IAM user passwords must contain at least one of the following non-alphanumeric characters: ! @ #   % ^ &amp; * ( ) _ + - = [ ] { } | ' If you do not specify a value for this parameter, then the operation uses the default value of false. The result is that passwords do not require at least one symbol character.
+- `RequireSymbols`: Specifies whether IAM user passwords must contain at least one of the following non-alphanumeric characters: ! @ #  % ^ &amp; * ( ) _ + - = [ ] { } | ' If you do not specify a value for this parameter, then the operation uses the default value of false. The result is that passwords do not require at least one symbol character.
 - `RequireUppercaseCharacters`: Specifies whether IAM user passwords must contain at least one uppercase character from the ISO basic Latin alphabet (A to Z). If you do not specify a value for this parameter, then the operation uses the default value of false. The result is that passwords do not require at least one uppercase character.
 """
 
@@ -1812,7 +1812,7 @@ update_account_password_policy(args::AbstractDict{String, <:Any}; aws_config::AW
 Updates the policy that grants an IAM entity permission to assume a role. This is typically referred to as the \"role trust policy\". For more information about roles, go to Using Roles to Delegate Permissions and Federate Identities.
 
 # Required Parameters
-- `PolicyDocument`: The policy that grants an entity permission to assume the role. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `PolicyDocument`: The policy that grants an entity permission to assume the role. You must provide policies in JSON format in IAM. However, for AWS CloudFormation templates formatted in YAML, you can provide the policy in JSON or YAML format. AWS CloudFormation always converts a YAML policy to JSON format before submitting it to IAM. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `RoleName`: The name of the role to update with the new policy. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 """
@@ -1830,7 +1830,7 @@ Updates the name and/or the path of the specified IAM group.   You should unders
 
 # Optional Parameters
 - `NewGroupName`: New name for the IAM group. Only include this if changing the group's name. IAM user, group, role, and policy names must be unique within the account. Names are not distinguished by case. For example, you cannot create resources named both \"MyResource\" and \"myresource\".
-- `NewPath`: New path for the IAM group. Only include this if changing the group's path. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `NewPath`: New path for the IAM group. Only include this if changing the group's path. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 """
 
 update_group(GroupName; aws_config::AWSConfig=global_aws_config()) = iam("UpdateGroup", Dict{String, Any}("GroupName"=>GroupName); aws_config=aws_config)
@@ -1845,7 +1845,7 @@ Changes the password for the specified IAM user. IAM users can change their own
 - `UserName`: The name of the user whose password you want to update. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 # Optional Parameters
-- `Password`: The new password for the specified IAM user. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)   However, the format can be further restricted by the account administrator by setting a password policy on the AWS account. For more information, see UpdateAccountPasswordPolicy.
+- `Password`: The new password for the specified IAM user. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)   However, the format can be further restricted by the account administrator by setting a password policy on the AWS account. For more information, see UpdateAccountPasswordPolicy.
 - `PasswordResetRequired`: Allows this new password to be used only once by requiring the specified IAM user to set a new password on next sign-in.
 """
 
@@ -1934,7 +1934,7 @@ Updates the name and/or the path of the specified server certificate stored in I
 - `ServerCertificateName`: The name of the server certificate that you want to update. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 # Optional Parameters
-- `NewPath`: The new path for the server certificate. Include this only if you are updating the server certificate's path. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `NewPath`: The new path for the server certificate. Include this only if you are updating the server certificate's path. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 - `NewServerCertificateName`: The new name for the server certificate. Include this only if you are updating the server certificate's name. The name of the certificate cannot contain any spaces. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 """
 
@@ -1982,7 +1982,7 @@ Updates the name and/or the path of the specified IAM user.   You should underst
 - `UserName`: Name of the user to update. If you're changing the name of the user, this is the original user name. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 # Optional Parameters
-- `NewPath`: New path for the IAM user. Include this parameter only if you're changing the user's path. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.
+- `NewPath`: New path for the IAM user. Include this parameter only if you're changing the user's path. This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.
 - `NewUserName`: New name for the user. Include this parameter only if you're changing the user's name. IAM user, group, role, and policy names must be unique within the account. Names are not distinguished by case. For example, you cannot create resources named both \"MyResource\" and \"myresource\".
 """
 
@@ -1995,7 +1995,7 @@ update_user(UserName, args::AbstractDict{String, <:Any}; aws_config::AWSConfig=g
 Uploads an SSH public key and associates it with the specified IAM user. The SSH public key uploaded by this operation can be used only for authenticating the associated IAM user to an AWS CodeCommit repository. For more information about using SSH keys to authenticate to an AWS CodeCommit repository, see Set up AWS CodeCommit for SSH Connections in the AWS CodeCommit User Guide.
 
 # Required Parameters
-- `SSHPublicKeyBody`: The SSH public key. The public key must be encoded in ssh-rsa format or PEM format. The minimum bit-length of the public key is 2048 bits. For example, you can generate a 2048-bit key, and the resulting PEM file is 1679 bytes long. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `SSHPublicKeyBody`: The SSH public key. The public key must be encoded in ssh-rsa format or PEM format. The minimum bit-length of the public key is 2048 bits. For example, you can generate a 2048-bit key, and the resulting PEM file is 1679 bytes long. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `UserName`: The name of the IAM user to associate the SSH public key with. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 """
@@ -2009,13 +2009,13 @@ upload_sshpublic_key(SSHPublicKeyBody, UserName, args::AbstractDict{String, <:An
 Uploads a server certificate entity for the AWS account. The server certificate entity includes a public key certificate, a private key, and an optional certificate chain, which should all be PEM-encoded. We recommend that you use AWS Certificate Manager to provision, manage, and deploy your server certificates. With ACM you can request a certificate, deploy it to AWS resources, and let ACM handle certificate renewals for you. Certificates provided by ACM are free. For more information about using ACM, see the AWS Certificate Manager User Guide. For more information about working with server certificates, see Working with Server Certificates in the IAM User Guide. This topic includes a list of AWS services that can use the server certificates that you manage with IAM. For information about the number of server certificates you can upload, see Limitations on IAM Entities and Objects in the IAM User Guide.  Because the body of the public key certificate, private key, and the certificate chain can be large, you should use POST rather than GET when calling UploadServerCertificate. For information about setting up signatures and authorization through the API, go to Signing AWS API Requests in the AWS General Reference. For general information about using the Query API with IAM, go to Calling the API by Making HTTP Query Requests in the IAM User Guide. 
 
 # Required Parameters
-- `CertificateBody`: The contents of the public key certificate in PEM-encoded format. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
-- `PrivateKey`: The contents of the private key in PEM-encoded format. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `CertificateBody`: The contents of the public key certificate in PEM-encoded format. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
+- `PrivateKey`: The contents of the private key in PEM-encoded format. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 - `ServerCertificateName`: The name for the server certificate. Do not include the path in this value. The name of the certificate cannot contain any spaces. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
 
 # Optional Parameters
-- `CertificateChain`: The contents of the certificate chain. This is typically a concatenation of the PEM-encoded public key certificates of the chain. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
-- `Path`: The path for the server certificate. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! ( u0021) through the DEL character ( u007F), including most punctuation characters, digits, and upper and lowercased letters.   If you are uploading a server certificate specifically for use with Amazon CloudFront distributions, you must specify a path using the path parameter. The path must begin with /cloudfront and must include a trailing slash (for example, /cloudfront/test/). 
+- `CertificateChain`: The contents of the certificate chain. This is typically a concatenation of the PEM-encoded public key certificates of the chain. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
+- `Path`: The path for the server certificate. For more information about paths, see IAM Identifiers in the IAM User Guide. This parameter is optional. If it is not included, it defaults to a slash (/). This parameter allows (through its regex pattern) a string of characters consisting of either a forward slash (/) by itself or a string that must begin and end with forward slashes. In addition, it can contain any ASCII character from the ! (u0021) through the DEL character (u007F), including most punctuation characters, digits, and upper and lowercased letters.   If you are uploading a server certificate specifically for use with Amazon CloudFront distributions, you must specify a path using the path parameter. The path must begin with /cloudfront and must include a trailing slash (for example, /cloudfront/test/). 
 """
 
 upload_server_certificate(CertificateBody, PrivateKey, ServerCertificateName; aws_config::AWSConfig=global_aws_config()) = iam("UploadServerCertificate", Dict{String, Any}("CertificateBody"=>CertificateBody, "PrivateKey"=>PrivateKey, "ServerCertificateName"=>ServerCertificateName); aws_config=aws_config)
@@ -2027,7 +2027,7 @@ upload_server_certificate(CertificateBody, PrivateKey, ServerCertificateName, ar
 Uploads an X.509 signing certificate and associates it with the specified IAM user. Some AWS services use X.509 signing certificates to validate requests that are signed with a corresponding private key. When you upload the certificate, its default status is Active. If the UserName is not specified, the IAM user name is determined implicitly based on the AWS access key ID used to sign the request. This operation works for access keys under the AWS account. Consequently, you can use this operation to manage AWS account root user credentials even if the AWS account has no associated users.  Because the body of an X.509 certificate can be large, you should use POST rather than GET when calling UploadSigningCertificate. For information about setting up signatures and authorization through the API, go to Signing AWS API Requests in the AWS General Reference. For general information about using the Query API with IAM, go to Making Query Requests in the IAM User Guide. 
 
 # Required Parameters
-- `CertificateBody`: The contents of the signing certificate. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character ( u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through  u00FF)   The special characters tab ( u0009), line feed ( u000A), and carriage return ( u000D)  
+- `CertificateBody`: The contents of the signing certificate. The regex pattern used to validate this parameter is a string of characters consisting of the following:   Any printable ASCII character ranging from the space character (u0020) through the end of the ASCII character range   The printable characters in the Basic Latin and Latin-1 Supplement character set (through u00FF)   The special characters tab (u0009), line feed (u000A), and carriage return (u000D)  
 
 # Optional Parameters
 - `UserName`: The name of the user the signing certificate is for. This parameter allows (through its regex pattern) a string of characters consisting of upper and lowercase alphanumeric characters with no spaces. You can also include any of the following characters: _+=,.@-
diff --git a/src/services/identitystore.jl b/src/services/identitystore.jl
index 1c4c97846a..49b71eb7bb 100644
--- a/src/services/identitystore.jl
+++ b/src/services/identitystore.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: identitystore
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeGroup()
 
diff --git a/src/services/imagebuilder.jl b/src/services/imagebuilder.jl
index 998d1f4ebe..40483ad399 100644
--- a/src/services/imagebuilder.jl
+++ b/src/services/imagebuilder.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: imagebuilder
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelImageCreation()
 
@@ -236,7 +236,7 @@ delete_infrastructure_configuration(infrastructureConfigurationArn, args::Abstra
  Gets a component object. 
 
 # Required Parameters
-- `componentBuildVersionArn`: The Amazon Resource Name (ARN) of the component that you want to retrieve. Regex requires \"/ d+ \" suffix.
+- `componentBuildVersionArn`: The Amazon Resource Name (ARN) of the component that you want to retrieve. Regex requires \"/d+\" suffix.
 
 """
 
diff --git a/src/services/importexport.jl b/src/services/importexport.jl
index 85495cb80b..310f1a37ff 100644
--- a/src/services/importexport.jl
+++ b/src/services/importexport.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: importexport
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelJob()
 
diff --git a/src/services/inspector.jl b/src/services/inspector.jl
index 8493f2418b..0d99d874c1 100644
--- a/src/services/inspector.jl
+++ b/src/services/inspector.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: inspector
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddAttributesToFindings()
 
diff --git a/src/services/iot.jl b/src/services/iot.jl
index ba07ef23bd..f5dda7868c 100644
--- a/src/services/iot.jl
+++ b/src/services/iot.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iot
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptCertificateTransfer()
 
@@ -277,7 +277,7 @@ create_billing_group(billingGroupName, args::AbstractDict{String, <:Any}; aws_co
 """
     CreateCertificateFromCsr()
 
-Creates an X.509 certificate using the specified certificate signing request.  Note: The CSR must include a public key that is either an RSA key with a length of at least 2048 bits or an ECC key from NIST P-256 or NIST P-384 curves.   Note: Reusing the same certificate signing request (CSR) results in a distinct certificate. You can create multiple certificates in a batch by creating a directory, copying multiple .csr files into that directory, and then specifying that directory on the command line. The following commands show how to create a batch of certificates given a batch of CSRs. Assuming a set of CSRs are located inside of the directory my-csr-directory: On Linux and OS X, the command is:   ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{} This command lists all of the CSRs in my-csr-directory and pipes each CSR file name to the aws iot create-certificate-from-csr AWS CLI command to create a certificate for the corresponding CSR. The aws iot create-certificate-from-csr part of the command can also be run in parallel to speed up the certificate creation process:   ls my-csr-directory/ | xargs -P 10 -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{} On Windows PowerShell, the command to create certificates for all CSRs in my-csr-directory is: &gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/ _} On a Windows command prompt, the command to create certificates for all CSRs in my-csr-directory is: &gt; forfiles /p my-csr-directory /c \"cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path\"
+Creates an X.509 certificate using the specified certificate signing request.  Note: The CSR must include a public key that is either an RSA key with a length of at least 2048 bits or an ECC key from NIST P-256 or NIST P-384 curves.   Note: Reusing the same certificate signing request (CSR) results in a distinct certificate. You can create multiple certificates in a batch by creating a directory, copying multiple .csr files into that directory, and then specifying that directory on the command line. The following commands show how to create a batch of certificates given a batch of CSRs. Assuming a set of CSRs are located inside of the directory my-csr-directory: On Linux and OS X, the command is:  ls my-csr-directory/ | xargs -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{} This command lists all of the CSRs in my-csr-directory and pipes each CSR file name to the aws iot create-certificate-from-csr AWS CLI command to create a certificate for the corresponding CSR. The aws iot create-certificate-from-csr part of the command can also be run in parallel to speed up the certificate creation process:  ls my-csr-directory/ | xargs -P 10 -I {} aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/{} On Windows PowerShell, the command to create certificates for all CSRs in my-csr-directory is: &gt; ls -Name my-csr-directory | %{aws iot create-certificate-from-csr --certificate-signing-request file://my-csr-directory/_} On a Windows command prompt, the command to create certificates for all CSRs in my-csr-directory is: &gt; forfiles /p my-csr-directory /c \"cmd /c aws iot create-certificate-from-csr --certificate-signing-request file://@path\"
 
 # Required Parameters
 - `certificateSigningRequest`: The certificate signing request (CSR).
@@ -358,7 +358,7 @@ Creates a job.
 # Optional Parameters
 - `abortConfig`: Allows you to create criteria to abort a job.
 - `description`: A short text description of the job.
-- `document`: The job document.  If the job document resides in an S3 bucket, you must use a placeholder link when specifying the document. The placeholder link is of the following form:   {aws:iot:s3-presigned-url:https://s3.amazonaws.com/bucket/key}  where bucket is your bucket name and key is the object in the bucket to which you are linking. 
+- `document`: The job document.  If the job document resides in an S3 bucket, you must use a placeholder link when specifying the document. The placeholder link is of the following form:  {aws:iot:s3-presigned-url:https://s3.amazonaws.com/bucket/key}  where bucket is your bucket name and key is the object in the bucket to which you are linking. 
 - `documentSource`: An S3 link to the job document.
 - `jobExecutionsRolloutConfig`: Allows you to create a staged rollout of the job.
 - `presignedUrlConfig`: Configuration information for pre-signed S3 URLs.
@@ -551,7 +551,7 @@ Creates a Device Defender security profile.
 - `securityProfileName`: The name you are giving to the security profile.
 
 # Optional Parameters
-- `additionalMetricsToRetain`: A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.  Note: This API field is deprecated. Please use CreateSecurityProfileRequest additionalMetricsToRetainV2 instead.
+- `additionalMetricsToRetain`: A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.  Note: This API field is deprecated. Please use CreateSecurityProfileRequestadditionalMetricsToRetainV2 instead.
 - `additionalMetricsToRetainV2`: A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.
 - `alertTargets`: Specifies the destinations to which alerts are sent. (Alerts are always sent to the console.) Alerts are generated when a device (thing) violates a behavior.
 - `behaviors`: Specifies the behaviors that, when violated by a device (thing), cause an alert.
@@ -589,7 +589,7 @@ Creates a thing record in the registry. If this call is made multiple times usin
 - `thingName`: The name of the thing to create. You can't change a thing's name after you create it. To change a thing's name, you must create a new thing, give it the new name, and then delete the old thing.
 
 # Optional Parameters
-- `attributePayload`: The attribute payload, which consists of up to three name/value pairs in a JSON document. For example:  { \"attributes \":{ \"string1 \": \"string2 \"}} 
+- `attributePayload`: The attribute payload, which consists of up to three name/value pairs in a JSON document. For example:  {\"attributes\":{\"string1\":\"string2\"}} 
 - `billingGroupName`: The name of the billing group the thing will be added to.
 - `thingTypeName`: The name of the thing type associated with the new thing.
 """
@@ -3063,7 +3063,7 @@ Updates a Device Defender security profile.
 - `securityProfileName`: The name of the security profile you want to update.
 
 # Optional Parameters
-- `additionalMetricsToRetain`: A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.  Note: This API field is deprecated. Please use UpdateSecurityProfileRequest additionalMetricsToRetainV2 instead.
+- `additionalMetricsToRetain`: A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.  Note: This API field is deprecated. Please use UpdateSecurityProfileRequestadditionalMetricsToRetainV2 instead.
 - `additionalMetricsToRetainV2`: A list of metrics whose data is retained (stored). By default, data is retained for any metric used in the profile's behaviors, but it is also retained for any metric specified here.
 - `alertTargets`: Where the alerts are sent. (Alerts are always sent to the console.)
 - `behaviors`: Specifies the behaviors that, when violated by a device (thing), cause an alert.
@@ -3103,7 +3103,7 @@ Updates the data for a thing.
 - `thingName`: The name of the thing to update. You can't change a thing's name. To change a thing's name, you must create a new thing, give it the new name, and then delete the old thing.
 
 # Optional Parameters
-- `attributePayload`: A list of thing attributes, a JSON string containing name-value pairs. For example:  { \"attributes \":{ \"name1 \": \"value2 \"}}  This data is used to add new attributes or update existing attributes.
+- `attributePayload`: A list of thing attributes, a JSON string containing name-value pairs. For example:  {\"attributes\":{\"name1\":\"value2\"}}  This data is used to add new attributes or update existing attributes.
 - `expectedVersion`: The expected version of the thing record in the registry. If the version of the record in the registry does not match the expected version specified in the request, the UpdateThing request is rejected with a VersionConflictException.
 - `removeThingType`: Remove a thing type association. If true, the association is removed.
 - `thingTypeName`: The name of the thing type.
diff --git a/src/services/iot_1click_devices_service.jl b/src/services/iot_1click_devices_service.jl
index d797daaf87..4b17bfe22a 100644
--- a/src/services/iot_1click_devices_service.jl
+++ b/src/services/iot_1click_devices_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iot_1click_devices_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     ClaimDevicesByClaimCode()
 
diff --git a/src/services/iot_1click_projects.jl b/src/services/iot_1click_projects.jl
index 01abbf5a2d..83161afa96 100644
--- a/src/services/iot_1click_projects.jl
+++ b/src/services/iot_1click_projects.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iot_1click_projects
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateDeviceWithPlacement()
 
diff --git a/src/services/iot_data_plane.jl b/src/services/iot_data_plane.jl
index 0c7bf46d76..5264b6c028 100644
--- a/src/services/iot_data_plane.jl
+++ b/src/services/iot_data_plane.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iot_data_plane
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteThingShadow()
 
diff --git a/src/services/iot_events.jl b/src/services/iot_events.jl
index c6df32a138..fbad1097d8 100644
--- a/src/services/iot_events.jl
+++ b/src/services/iot_events.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iot_events
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateDetectorModel()
 
diff --git a/src/services/iot_events_data.jl b/src/services/iot_events_data.jl
index c7b7f3278e..be433d6b64 100644
--- a/src/services/iot_events_data.jl
+++ b/src/services/iot_events_data.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iot_events_data
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchPutMessage()
 
diff --git a/src/services/iot_jobs_data_plane.jl b/src/services/iot_jobs_data_plane.jl
index a491e27ff8..2568703a38 100644
--- a/src/services/iot_jobs_data_plane.jl
+++ b/src/services/iot_jobs_data_plane.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iot_jobs_data_plane
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeJobExecution()
 
diff --git a/src/services/iotanalytics.jl b/src/services/iotanalytics.jl
index 6873a2dbd6..63f6b3ebd0 100644
--- a/src/services/iotanalytics.jl
+++ b/src/services/iotanalytics.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iotanalytics
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchPutMessage()
 
@@ -11,7 +11,7 @@ Sends messages to a channel.
 
 # Required Parameters
 - `channelName`: The name of the channel where the messages are sent.
-- `messages`: The list of messages to be sent. Each message has format: '{ \"messageId\": \"string\", \"payload\": \"string\"}'. Note that the field names of message payloads (data) that you send to AWS IoT Analytics:   Must contain only alphanumeric characters and undescores (_); no other special characters are allowed.   Must begin with an alphabetic character or single underscore (_).   Cannot contain hyphens (-).   In regular expression terms: \"^[A-Za-z_]([A-Za-z0-9]*|[A-Za-z0-9][A-Za-z0-9_]*) \".    Cannot be greater than 255 characters.   Are case-insensitive. (Fields named \"foo\" and \"FOO\" in the same payload are considered duplicates.)   For example, {\"temp_01\": 29} or {\"_temp_01\": 29} are valid, but {\"temp-01\": 29}, {\"01_temp\": 29} or {\"__temp_01\": 29} are invalid in message payloads. 
+- `messages`: The list of messages to be sent. Each message has format: '{ \"messageId\": \"string\", \"payload\": \"string\"}'. Note that the field names of message payloads (data) that you send to AWS IoT Analytics:   Must contain only alphanumeric characters and undescores (_); no other special characters are allowed.   Must begin with an alphabetic character or single underscore (_).   Cannot contain hyphens (-).   In regular expression terms: \"^[A-Za-z_]([A-Za-z0-9]*|[A-Za-z0-9][A-Za-z0-9_]*)\".    Cannot be greater than 255 characters.   Are case-insensitive. (Fields named \"foo\" and \"FOO\" in the same payload are considered duplicates.)   For example, {\"temp_01\": 29} or {\"_temp_01\": 29} are valid, but {\"temp-01\": 29}, {\"01_temp\": 29} or {\"__temp_01\": 29} are invalid in message payloads. 
 
 """
 
@@ -150,7 +150,7 @@ Deletes the content of the specified data set.
 - `datasetName`: The name of the data set whose content is deleted.
 
 # Optional Parameters
-- `versionId`: The version of the data set whose content is deleted. You can also use the strings \" LATEST\" or \" LATEST_SUCCEEDED\" to delete the latest or latest successfully completed data set. If not specified, \" LATEST_SUCCEEDED\" is the default.
+- `versionId`: The version of the data set whose content is deleted. You can also use the strings \"LATEST\" or \"LATEST_SUCCEEDED\" to delete the latest or latest successfully completed data set. If not specified, \"LATEST_SUCCEEDED\" is the default.
 """
 
 delete_dataset_content(datasetName; aws_config::AWSConfig=global_aws_config()) = iotanalytics("DELETE", "/datasets/$(datasetName)/content"; aws_config=aws_config)
@@ -257,7 +257,7 @@ Retrieves the contents of a data set as pre-signed URIs.
 - `datasetName`: The name of the data set whose contents are retrieved.
 
 # Optional Parameters
-- `versionId`: The version of the data set whose contents are retrieved. You can also use the strings \" LATEST\" or \" LATEST_SUCCEEDED\" to retrieve the contents of the latest or latest successfully completed data set. If not specified, \" LATEST_SUCCEEDED\" is the default.
+- `versionId`: The version of the data set whose contents are retrieved. You can also use the strings \"LATEST\" or \"LATEST_SUCCEEDED\" to retrieve the contents of the latest or latest successfully completed data set. If not specified, \"LATEST_SUCCEEDED\" is the default.
 """
 
 get_dataset_content(datasetName; aws_config::AWSConfig=global_aws_config()) = iotanalytics("GET", "/datasets/$(datasetName)/content"; aws_config=aws_config)
diff --git a/src/services/iotsecuretunneling.jl b/src/services/iotsecuretunneling.jl
index 61f3e7cfea..f4f76d55a9 100644
--- a/src/services/iotsecuretunneling.jl
+++ b/src/services/iotsecuretunneling.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iotsecuretunneling
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CloseTunnel()
 
diff --git a/src/services/iotsitewise.jl b/src/services/iotsitewise.jl
index 6775744e3f..97090e31fd 100644
--- a/src/services/iotsitewise.jl
+++ b/src/services/iotsitewise.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iotsitewise
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateAssets()
 
diff --git a/src/services/iotthingsgraph.jl b/src/services/iotthingsgraph.jl
index 8ad120dee2..d91398f542 100644
--- a/src/services/iotthingsgraph.jl
+++ b/src/services/iotthingsgraph.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: iotthingsgraph
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateEntityToThing()
 
diff --git a/src/services/ivs.jl b/src/services/ivs.jl
index 6ce12edf04..53ed1efe6a 100644
--- a/src/services/ivs.jl
+++ b/src/services/ivs.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ivs
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchGetChannel()
 
@@ -39,7 +39,7 @@ Creates a new channel and an associated stream key to start streaming.
 - `authorized`: Whether the channel is authorized. Default: false.
 - `latencyMode`: Channel latency mode. Default: LOW.
 - `name`: Channel name.
-- `tags`: See Channel tags.
+- `tags`: See Channeltags.
 - `type`: Channel type, which determines the allowable resolution and bitrate. If you exceed the allowable resolution or bitrate, the stream probably will disconnect immediately. Valid values:    STANDARD: Multiple qualities are generated from the original input, to automatically give viewers the best experience for their devices and network conditions. Vertical resolution can be up to 1080 and bitrate can be up to 8.5 Mbps.    BASIC: Amazon IVS delivers the original input to viewers. The viewer’s video-quality choice is limited to the original input. Vertical resolution can be up to 480 and bitrate can be up to 1.5 Mbps.   Default: STANDARD.
 """
 
@@ -55,7 +55,7 @@ Creates a stream key, used to initiate a stream, for the specified channel ARN.
 - `channelArn`: ARN of the channel for which to create the stream key.
 
 # Optional Parameters
-- `tags`: See Channel tags.
+- `tags`: See Channeltags.
 """
 
 create_stream_key(channelArn; aws_config::AWSConfig=global_aws_config()) = ivs("POST", "/CreateStreamKey", Dict{String, Any}("channelArn"=>channelArn); aws_config=aws_config)
diff --git a/src/services/kafka.jl b/src/services/kafka.jl
index 8260734e62..72bbbe3ad8 100644
--- a/src/services/kafka.jl
+++ b/src/services/kafka.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kafka
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateCluster()
 
diff --git a/src/services/kendra.jl b/src/services/kendra.jl
index 875da17085..6a4b945e38 100644
--- a/src/services/kendra.jl
+++ b/src/services/kendra.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kendra
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchDeleteDocument()
 
diff --git a/src/services/kinesis.jl b/src/services/kinesis.jl
index 006422d3d3..b9e45759bd 100644
--- a/src/services/kinesis.jl
+++ b/src/services/kinesis.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kinesis
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTagsToStream()
 
diff --git a/src/services/kinesis_analytics.jl b/src/services/kinesis_analytics.jl
index b01beebf17..7176f0a7c3 100644
--- a/src/services/kinesis_analytics.jl
+++ b/src/services/kinesis_analytics.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kinesis_analytics
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddApplicationCloudWatchLoggingOption()
 
diff --git a/src/services/kinesis_analytics_v2.jl b/src/services/kinesis_analytics_v2.jl
index f493da12be..5abe78e531 100644
--- a/src/services/kinesis_analytics_v2.jl
+++ b/src/services/kinesis_analytics_v2.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kinesis_analytics_v2
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddApplicationCloudWatchLoggingOption()
 
diff --git a/src/services/kinesis_video.jl b/src/services/kinesis_video.jl
index b70e41bc05..4adc993ad4 100644
--- a/src/services/kinesis_video.jl
+++ b/src/services/kinesis_video.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kinesis_video
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateSignalingChannel()
 
diff --git a/src/services/kinesis_video_archived_media.jl b/src/services/kinesis_video_archived_media.jl
index 84f1ff4e15..285febb62a 100644
--- a/src/services/kinesis_video_archived_media.jl
+++ b/src/services/kinesis_video_archived_media.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kinesis_video_archived_media
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GetClip()
 
@@ -83,8 +83,8 @@ Returns a list of Fragment objects from the specified stream and timestamp range
 
 # Optional Parameters
 - `FragmentSelector`: Describes the timestamp range and timestamp origin for the range of fragments to return.
-- `MaxResults`: The total number of fragments to return. If the total number of fragments available is more than the value specified in max-results, then a ListFragmentsOutput NextToken is provided in the output that you can use to resume pagination.
-- `NextToken`: A token to specify where to start paginating. This is the ListFragmentsOutput NextToken from a previously truncated response.
+- `MaxResults`: The total number of fragments to return. If the total number of fragments available is more than the value specified in max-results, then a ListFragmentsOutputNextToken is provided in the output that you can use to resume pagination.
+- `NextToken`: A token to specify where to start paginating. This is the ListFragmentsOutputNextToken from a previously truncated response.
 """
 
 list_fragments(StreamName; aws_config::AWSConfig=global_aws_config()) = kinesis_video_archived_media("POST", "/listFragments", Dict{String, Any}("StreamName"=>StreamName); aws_config=aws_config)
diff --git a/src/services/kinesis_video_media.jl b/src/services/kinesis_video_media.jl
index f4d2041dcc..65efa75935 100644
--- a/src/services/kinesis_video_media.jl
+++ b/src/services/kinesis_video_media.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kinesis_video_media
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GetMedia()
 
diff --git a/src/services/kinesis_video_signaling.jl b/src/services/kinesis_video_signaling.jl
index 97f68c8c0b..c02f97510b 100644
--- a/src/services/kinesis_video_signaling.jl
+++ b/src/services/kinesis_video_signaling.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kinesis_video_signaling
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GetIceServerConfig()
 
diff --git a/src/services/kms.jl b/src/services/kms.jl
index 22af7aa39d..8bc20871e3 100644
--- a/src/services/kms.jl
+++ b/src/services/kms.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: kms
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelKeyDeletion()
 
diff --git a/src/services/lakeformation.jl b/src/services/lakeformation.jl
index 1327e2b0ea..b279c6c40a 100644
--- a/src/services/lakeformation.jl
+++ b/src/services/lakeformation.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: lakeformation
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchGrantPermissions()
 
diff --git a/src/services/lambda.jl b/src/services/lambda.jl
index 555e04900c..f9a15d08f9 100644
--- a/src/services/lambda.jl
+++ b/src/services/lambda.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: lambda
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddLayerVersionPermission()
 
diff --git a/src/services/lex_model_building_service.jl b/src/services/lex_model_building_service.jl
index 4e495acef3..db69bcf777 100644
--- a/src/services/lex_model_building_service.jl
+++ b/src/services/lex_model_building_service.jl
@@ -2,18 +2,18 @@
 using AWS
 using AWS.AWSServices: lex_model_building_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateBotVersion()
 
-Creates a new version of the bot based on the  LATEST version. If the  LATEST version of this resource hasn't changed since you created the last version, Amazon Lex doesn't create a new version. It returns the last created version.  You can update only the  LATEST version of the bot. You can't update the numbered versions that you create with the CreateBotVersion operation.   When you create the first version of a bot, Amazon Lex sets the version to 1. Subsequent versions increment by 1. For more information, see versioning-intro.   This operation requires permission for the lex:CreateBotVersion action. 
+Creates a new version of the bot based on the LATEST version. If the LATEST version of this resource hasn't changed since you created the last version, Amazon Lex doesn't create a new version. It returns the last created version.  You can update only the LATEST version of the bot. You can't update the numbered versions that you create with the CreateBotVersion operation.   When you create the first version of a bot, Amazon Lex sets the version to 1. Subsequent versions increment by 1. For more information, see versioning-intro.   This operation requires permission for the lex:CreateBotVersion action. 
 
 # Required Parameters
 - `name`: The name of the bot that you want to create a new version of. The name is case sensitive. 
 
 # Optional Parameters
-- `checksum`: Identifies a specific revision of the  LATEST version of the bot. If you specify a checksum and the  LATEST version of the bot has a different checksum, a PreconditionFailedException exception is returned and Amazon Lex doesn't publish a new version. If you don't specify a checksum, Amazon Lex publishes the  LATEST version.
+- `checksum`: Identifies a specific revision of the LATEST version of the bot. If you specify a checksum and the LATEST version of the bot has a different checksum, a PreconditionFailedException exception is returned and Amazon Lex doesn't publish a new version. If you don't specify a checksum, Amazon Lex publishes the LATEST version.
 """
 
 create_bot_version(name; aws_config::AWSConfig=global_aws_config()) = lex_model_building_service("POST", "/bots/$(name)/versions"; aws_config=aws_config)
@@ -22,13 +22,13 @@ create_bot_version(name, args::AbstractDict{String, <:Any}; aws_config::AWSConfi
 """
     CreateIntentVersion()
 
-Creates a new version of an intent based on the  LATEST version of the intent. If the  LATEST version of this intent hasn't changed since you last updated it, Amazon Lex doesn't create a new version. It returns the last version you created.  You can update only the  LATEST version of the intent. You can't update the numbered versions that you create with the CreateIntentVersion operation.   When you create a version of an intent, Amazon Lex sets the version to 1. Subsequent versions increment by 1. For more information, see versioning-intro.  This operation requires permissions to perform the lex:CreateIntentVersion action. 
+Creates a new version of an intent based on the LATEST version of the intent. If the LATEST version of this intent hasn't changed since you last updated it, Amazon Lex doesn't create a new version. It returns the last version you created.  You can update only the LATEST version of the intent. You can't update the numbered versions that you create with the CreateIntentVersion operation.   When you create a version of an intent, Amazon Lex sets the version to 1. Subsequent versions increment by 1. For more information, see versioning-intro.  This operation requires permissions to perform the lex:CreateIntentVersion action. 
 
 # Required Parameters
 - `name`: The name of the intent that you want to create a new version of. The name is case sensitive. 
 
 # Optional Parameters
-- `checksum`: Checksum of the  LATEST version of the intent that should be used to create the new version. If you specify a checksum and the  LATEST version of the intent has a different checksum, Amazon Lex returns a PreconditionFailedException exception and doesn't publish a new version. If you don't specify a checksum, Amazon Lex publishes the  LATEST version.
+- `checksum`: Checksum of the LATEST version of the intent that should be used to create the new version. If you specify a checksum and the LATEST version of the intent has a different checksum, Amazon Lex returns a PreconditionFailedException exception and doesn't publish a new version. If you don't specify a checksum, Amazon Lex publishes the LATEST version.
 """
 
 create_intent_version(name; aws_config::AWSConfig=global_aws_config()) = lex_model_building_service("POST", "/intents/$(name)/versions"; aws_config=aws_config)
@@ -37,13 +37,13 @@ create_intent_version(name, args::AbstractDict{String, <:Any}; aws_config::AWSCo
 """
     CreateSlotTypeVersion()
 
-Creates a new version of a slot type based on the  LATEST version of the specified slot type. If the  LATEST version of this resource has not changed since the last version that you created, Amazon Lex doesn't create a new version. It returns the last version that you created.   You can update only the  LATEST version of a slot type. You can't update the numbered versions that you create with the CreateSlotTypeVersion operation.  When you create a version of a slot type, Amazon Lex sets the version to 1. Subsequent versions increment by 1. For more information, see versioning-intro.  This operation requires permissions for the lex:CreateSlotTypeVersion action.
+Creates a new version of a slot type based on the LATEST version of the specified slot type. If the LATEST version of this resource has not changed since the last version that you created, Amazon Lex doesn't create a new version. It returns the last version that you created.   You can update only the LATEST version of a slot type. You can't update the numbered versions that you create with the CreateSlotTypeVersion operation.  When you create a version of a slot type, Amazon Lex sets the version to 1. Subsequent versions increment by 1. For more information, see versioning-intro.  This operation requires permissions for the lex:CreateSlotTypeVersion action.
 
 # Required Parameters
 - `name`: The name of the slot type that you want to create a new version for. The name is case sensitive. 
 
 # Optional Parameters
-- `checksum`: Checksum for the  LATEST version of the slot type that you want to publish. If you specify a checksum and the  LATEST version of the slot type has a different checksum, Amazon Lex returns a PreconditionFailedException exception and doesn't publish the new version. If you don't specify a checksum, Amazon Lex publishes the  LATEST version.
+- `checksum`: Checksum for the LATEST version of the slot type that you want to publish. If you specify a checksum and the LATEST version of the slot type has a different checksum, Amazon Lex returns a PreconditionFailedException exception and doesn't publish the new version. If you don't specify a checksum, Amazon Lex publishes the LATEST version.
 """
 
 create_slot_type_version(name; aws_config::AWSConfig=global_aws_config()) = lex_model_building_service("POST", "/slottypes/$(name)/versions"; aws_config=aws_config)
@@ -52,7 +52,7 @@ create_slot_type_version(name, args::AbstractDict{String, <:Any}; aws_config::AW
 """
     DeleteBot()
 
-Deletes all versions of the bot, including the  LATEST version. To delete a specific version of the bot, use the DeleteBotVersion operation. The DeleteBot operation doesn't immediately remove the bot schema. Instead, it is marked for deletion and removed later. Amazon Lex stores utterances indefinitely for improving the ability of your bot to respond to user inputs. These utterances are not removed when the bot is deleted. To remove the utterances, use the DeleteUtterances operation. If a bot has an alias, you can't delete it. Instead, the DeleteBot operation returns a ResourceInUseException exception that includes a reference to the alias that refers to the bot. To remove the reference to the bot, delete the alias. If you get the same exception again, delete the referring alias until the DeleteBot operation is successful. This operation requires permissions for the lex:DeleteBot action.
+Deletes all versions of the bot, including the LATEST version. To delete a specific version of the bot, use the DeleteBotVersion operation. The DeleteBot operation doesn't immediately remove the bot schema. Instead, it is marked for deletion and removed later. Amazon Lex stores utterances indefinitely for improving the ability of your bot to respond to user inputs. These utterances are not removed when the bot is deleted. To remove the utterances, use the DeleteUtterances operation. If a bot has an alias, you can't delete it. Instead, the DeleteBot operation returns a ResourceInUseException exception that includes a reference to the alias that refers to the bot. To remove the reference to the bot, delete the alias. If you get the same exception again, delete the referring alias until the DeleteBot operation is successful. This operation requires permissions for the lex:DeleteBot action.
 
 # Required Parameters
 - `name`: The name of the bot. The name is case sensitive. 
@@ -98,7 +98,7 @@ Deletes a specific version of a bot. To delete all versions of a bot, use the De
 
 # Required Parameters
 - `name`: The name of the bot.
-- `version`: The version of the bot to delete. You cannot delete the  LATEST version of the bot. To delete the  LATEST version, use the DeleteBot operation.
+- `version`: The version of the bot to delete. You cannot delete the LATEST version of the bot. To delete the LATEST version, use the DeleteBot operation.
 
 """
 
@@ -108,7 +108,7 @@ delete_bot_version(name, version, args::AbstractDict{String, <:Any}; aws_config:
 """
     DeleteIntent()
 
-Deletes all versions of the intent, including the  LATEST version. To delete a specific version of the intent, use the DeleteIntentVersion operation.  You can delete a version of an intent only if it is not referenced. To delete an intent that is referred to in one or more bots (see how-it-works), you must remove those references first.    If you get the ResourceInUseException exception, it provides an example reference that shows where the intent is referenced. To remove the reference to the intent, either update the bot or delete it. If you get the same exception when you attempt to delete the intent again, repeat until the intent has no references and the call to DeleteIntent is successful.    This operation requires permission for the lex:DeleteIntent action. 
+Deletes all versions of the intent, including the LATEST version. To delete a specific version of the intent, use the DeleteIntentVersion operation.  You can delete a version of an intent only if it is not referenced. To delete an intent that is referred to in one or more bots (see how-it-works), you must remove those references first.    If you get the ResourceInUseException exception, it provides an example reference that shows where the intent is referenced. To remove the reference to the intent, either update the bot or delete it. If you get the same exception when you attempt to delete the intent again, repeat until the intent has no references and the call to DeleteIntent is successful.    This operation requires permission for the lex:DeleteIntent action. 
 
 # Required Parameters
 - `name`: The name of the intent. The name is case sensitive. 
@@ -125,7 +125,7 @@ Deletes a specific version of an intent. To delete all versions of a intent, use
 
 # Required Parameters
 - `name`: The name of the intent.
-- `version`: The version of the intent to delete. You cannot delete the  LATEST version of the intent. To delete the  LATEST version, use the DeleteIntent operation.
+- `version`: The version of the intent to delete. You cannot delete the LATEST version of the intent. To delete the LATEST version, use the DeleteIntent operation.
 
 """
 
@@ -135,7 +135,7 @@ delete_intent_version(name, version, args::AbstractDict{String, <:Any}; aws_conf
 """
     DeleteSlotType()
 
-Deletes all versions of the slot type, including the  LATEST version. To delete a specific version of the slot type, use the DeleteSlotTypeVersion operation.  You can delete a version of a slot type only if it is not referenced. To delete a slot type that is referred to in one or more intents, you must remove those references first.    If you get the ResourceInUseException exception, the exception provides an example reference that shows the intent where the slot type is referenced. To remove the reference to the slot type, either update the intent or delete it. If you get the same exception when you attempt to delete the slot type again, repeat until the slot type has no references and the DeleteSlotType call is successful.   This operation requires permission for the lex:DeleteSlotType action.
+Deletes all versions of the slot type, including the LATEST version. To delete a specific version of the slot type, use the DeleteSlotTypeVersion operation.  You can delete a version of a slot type only if it is not referenced. To delete a slot type that is referred to in one or more intents, you must remove those references first.    If you get the ResourceInUseException exception, the exception provides an example reference that shows the intent where the slot type is referenced. To remove the reference to the slot type, either update the intent or delete it. If you get the same exception when you attempt to delete the slot type again, repeat until the slot type has no references and the DeleteSlotType call is successful.   This operation requires permission for the lex:DeleteSlotType action.
 
 # Required Parameters
 - `name`: The name of the slot type. The name is case sensitive. 
@@ -152,7 +152,7 @@ Deletes a specific version of a slot type. To delete all versions of a slot type
 
 # Required Parameters
 - `name`: The name of the slot type.
-- `version`: The version of the slot type to delete. You cannot delete the  LATEST version of the slot type. To delete the  LATEST version, use the DeleteSlotType operation.
+- `version`: The version of the slot type to delete. You cannot delete the LATEST version of the slot type. To delete the LATEST version, use the DeleteSlotType operation.
 
 """
 
@@ -254,7 +254,7 @@ get_bot_channel_associations(aliasName, botName, args::AbstractDict{String, <:An
 """
     GetBotVersions()
 
-Gets information about all of the versions of a bot. The GetBotVersions operation returns a BotMetadata object for each version of a bot. For example, if a bot has three numbered versions, the GetBotVersions operation returns four BotMetadata objects in the response, one for each numbered version and one for the  LATEST version.  The GetBotVersions operation always returns at least one version, the  LATEST version. This operation requires permissions for the lex:GetBotVersions action.
+Gets information about all of the versions of a bot. The GetBotVersions operation returns a BotMetadata object for each version of a bot. For example, if a bot has three numbered versions, the GetBotVersions operation returns four BotMetadata objects in the response, one for each numbered version and one for the LATEST version.  The GetBotVersions operation always returns at least one version, the LATEST version. This operation requires permissions for the lex:GetBotVersions action.
 
 # Required Parameters
 - `name`: The name of the bot for which versions should be returned.
@@ -270,7 +270,7 @@ get_bot_versions(name, args::AbstractDict{String, <:Any}; aws_config::AWSConfig=
 """
     GetBots()
 
-Returns bot information as follows:    If you provide the nameContains field, the response includes information for the  LATEST version of all bots whose name contains the specified string.   If you don't specify the nameContains field, the operation returns information about the  LATEST version of all of your bots.   This operation requires permission for the lex:GetBots action.
+Returns bot information as follows:    If you provide the nameContains field, the response includes information for the LATEST version of all bots whose name contains the specified string.   If you don't specify the nameContains field, the operation returns information about the LATEST version of all of your bots.   This operation requires permission for the lex:GetBots action.
 
 # Optional Parameters
 - `maxResults`: The maximum number of bots to return in the response that the request will return. The default is 10.
@@ -370,7 +370,7 @@ get_intent(name, version, args::AbstractDict{String, <:Any}; aws_config::AWSConf
 """
     GetIntentVersions()
 
-Gets information about all of the versions of an intent. The GetIntentVersions operation returns an IntentMetadata object for each version of an intent. For example, if an intent has three numbered versions, the GetIntentVersions operation returns four IntentMetadata objects in the response, one for each numbered version and one for the  LATEST version.  The GetIntentVersions operation always returns at least one version, the  LATEST version. This operation requires permissions for the lex:GetIntentVersions action.
+Gets information about all of the versions of an intent. The GetIntentVersions operation returns an IntentMetadata object for each version of an intent. For example, if an intent has three numbered versions, the GetIntentVersions operation returns four IntentMetadata objects in the response, one for each numbered version and one for the LATEST version.  The GetIntentVersions operation always returns at least one version, the LATEST version. This operation requires permissions for the lex:GetIntentVersions action.
 
 # Required Parameters
 - `name`: The name of the intent for which versions should be returned.
@@ -386,7 +386,7 @@ get_intent_versions(name, args::AbstractDict{String, <:Any}; aws_config::AWSConf
 """
     GetIntents()
 
-Returns intent information as follows:    If you specify the nameContains field, returns the  LATEST version of all intents that contain the specified string.    If you don't specify the nameContains field, returns information about the  LATEST version of all intents.     The operation requires permission for the lex:GetIntents action. 
+Returns intent information as follows:    If you specify the nameContains field, returns the LATEST version of all intents that contain the specified string.    If you don't specify the nameContains field, returns information about the LATEST version of all intents.     The operation requires permission for the lex:GetIntents action. 
 
 # Optional Parameters
 - `maxResults`: The maximum number of intents to return in the response. The default is 10.
@@ -414,7 +414,7 @@ get_slot_type(name, version, args::AbstractDict{String, <:Any}; aws_config::AWSC
 """
     GetSlotTypeVersions()
 
-Gets information about all versions of a slot type. The GetSlotTypeVersions operation returns a SlotTypeMetadata object for each version of a slot type. For example, if a slot type has three numbered versions, the GetSlotTypeVersions operation returns four SlotTypeMetadata objects in the response, one for each numbered version and one for the  LATEST version.  The GetSlotTypeVersions operation always returns at least one version, the  LATEST version. This operation requires permissions for the lex:GetSlotTypeVersions action.
+Gets information about all versions of a slot type. The GetSlotTypeVersions operation returns a SlotTypeMetadata object for each version of a slot type. For example, if a slot type has three numbered versions, the GetSlotTypeVersions operation returns four SlotTypeMetadata objects in the response, one for each numbered version and one for the LATEST version.  The GetSlotTypeVersions operation always returns at least one version, the LATEST version. This operation requires permissions for the lex:GetSlotTypeVersions action.
 
 # Required Parameters
 - `name`: The name of the slot type for which versions should be returned.
@@ -430,7 +430,7 @@ get_slot_type_versions(name, args::AbstractDict{String, <:Any}; aws_config::AWSC
 """
     GetSlotTypes()
 
-Returns slot type information as follows:    If you specify the nameContains field, returns the  LATEST version of all slot types that contain the specified string.    If you don't specify the nameContains field, returns information about the  LATEST version of all slot types.     The operation requires permission for the lex:GetSlotTypes action. 
+Returns slot type information as follows:    If you specify the nameContains field, returns the LATEST version of all slot types that contain the specified string.    If you don't specify the nameContains field, returns information about the LATEST version of all slot types.     The operation requires permission for the lex:GetSlotTypes action. 
 
 # Optional Parameters
 - `maxResults`: The maximum number of slot types to return in the response. The default is 10.
@@ -472,7 +472,7 @@ list_tags_for_resource(resourceArn, args::AbstractDict{String, <:Any}; aws_confi
 """
     PutBot()
 
-Creates an Amazon Lex conversational bot or replaces an existing bot. When you create or update a bot you are only required to specify a name, a locale, and whether the bot is directed toward children under age 13. You can use this to add intents later, or to remove intents from an existing bot. When you create a bot with the minimum information, the bot is created or updated but Amazon Lex returns the  response FAILED. You can build the bot after you add one or more intents. For more information about Amazon Lex bots, see how-it-works.  If you specify the name of an existing bot, the fields in the request replace the existing values in the  LATEST version of the bot. Amazon Lex removes any fields that you don't provide values for in the request, except for the idleTTLInSeconds and privacySettings fields, which are set to their default values. If you don't specify values for required fields, Amazon Lex throws an exception. This operation requires permissions for the lex:PutBot action. For more information, see security-iam.
+Creates an Amazon Lex conversational bot or replaces an existing bot. When you create or update a bot you are only required to specify a name, a locale, and whether the bot is directed toward children under age 13. You can use this to add intents later, or to remove intents from an existing bot. When you create a bot with the minimum information, the bot is created or updated but Amazon Lex returns the  response FAILED. You can build the bot after you add one or more intents. For more information about Amazon Lex bots, see how-it-works.  If you specify the name of an existing bot, the fields in the request replace the existing values in the LATEST version of the bot. Amazon Lex removes any fields that you don't provide values for in the request, except for the idleTTLInSeconds and privacySettings fields, which are set to their default values. If you don't specify values for required fields, Amazon Lex throws an exception. This operation requires permissions for the lex:PutBot action. For more information, see security-iam.
 
 # Required Parameters
 - `childDirected`: For each Amazon Lex bot created with the Amazon Lex Model Building Service, you must specify whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to the Children's Online Privacy Protection Act (COPPA) by specifying true or false in the childDirected field. By specifying true in the childDirected field, you confirm that your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. By specifying false in the childDirected field, you confirm that your use of Amazon Lex is not related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. You may not specify a default value for the childDirected field that does not accurately reflect whether your use of Amazon Lex is related to a website, program, or other application that is directed or targeted, in whole or in part, to children under age 13 and subject to COPPA. If your use of Amazon Lex relates to a website, program, or other application that is directed in whole or in part, to children under age 13, you must obtain any required verifiable parental consent under COPPA. For information regarding the use of Amazon Lex in connection with websites, programs, or other applications that are directed or targeted, in whole or in part, to children under age 13, see the Amazon Lex FAQ. 
@@ -481,7 +481,7 @@ Creates an Amazon Lex conversational bot or replaces an existing bot. When you c
 
 # Optional Parameters
 - `abortStatement`: When Amazon Lex can't understand the user's input in context, it tries to elicit the information a few times. After that, Amazon Lex sends the message defined in abortStatement to the user, and then aborts the conversation. To set the number of retries, use the valueElicitationPrompt field for the slot type.  For example, in a pizza ordering bot, Amazon Lex might ask a user \"What type of crust would you like?\" If the user's response is not one of the expected responses (for example, \"thin crust, \"deep dish,\" etc.), Amazon Lex tries to elicit a correct response a few more times.  For example, in a pizza ordering application, OrderPizza might be one of the intents. This intent might require the CrustType slot. You specify the valueElicitationPrompt field when you create the CrustType slot. If you have defined a fallback intent the abort statement will not be sent to the user, the fallback intent is used instead. For more information, see  AMAZON.FallbackIntent.
-- `checksum`: Identifies a specific revision of the  LATEST version. When you create a new bot, leave the checksum field blank. If you specify a checksum you get a BadRequestException exception. When you want to update a bot, set the checksum field to the checksum of the most recent revision of the  LATEST version. If you don't specify the  checksum field, or if the checksum does not match the  LATEST version, you get a PreconditionFailedException exception.
+- `checksum`: Identifies a specific revision of the LATEST version. When you create a new bot, leave the checksum field blank. If you specify a checksum you get a BadRequestException exception. When you want to update a bot, set the checksum field to the checksum of the most recent revision of the LATEST version. If you don't specify the  checksum field, or if the checksum does not match the LATEST version, you get a PreconditionFailedException exception.
 - `clarificationPrompt`: When Amazon Lex doesn't understand the user's intent, it uses this message to get clarification. To specify how many times Amazon Lex should repeat the clarification prompt, use the maxAttempts field. If Amazon Lex still doesn't understand, it sends the message in the abortStatement field.  When you create a clarification prompt, make sure that it suggests the correct response from the user. for example, for a bot that orders pizza and drinks, you might create this clarification prompt: \"What would you like to do? You can say 'Order a pizza' or 'Order a drink.'\" If you have defined a fallback intent, it will be invoked if the clarification prompt is repeated the number of times defined in the maxAttempts field. For more information, see  AMAZON.FallbackIntent. If you don't define a clarification prompt, at runtime Amazon Lex will return a 400 Bad Request exception in three cases:    Follow-up prompt - When the user responds to a follow-up prompt but does not provide an intent. For example, in response to a follow-up prompt that says \"Would you like anything else today?\" the user says \"Yes.\" Amazon Lex will return a 400 Bad Request exception because it does not have a clarification prompt to send to the user to get an intent.   Lambda function - When using a Lambda function, you return an ElicitIntent dialog type. Since Amazon Lex does not have a clarification prompt to get an intent from the user, it returns a 400 Bad Request exception.   PutSession operation - When using the PutSession operation, you send an ElicitIntent dialog type. Since Amazon Lex does not have a clarification prompt to get an intent from the user, it returns a 400 Bad Request exception.  
 - `createVersion`: When set to true a new numbered version of the bot is created. This is the same as calling the CreateBotVersion operation. If you don't specify createVersion, the default is false.
 - `description`: A description of the bot.
@@ -509,7 +509,7 @@ Creates an alias for the specified version of the bot or replaces an alias for t
 - `name`: The name of the alias. The name is not case sensitive.
 
 # Optional Parameters
-- `checksum`: Identifies a specific revision of the  LATEST version. When you create a new bot alias, leave the checksum field blank. If you specify a checksum you get a BadRequestException exception. When you want to update a bot alias, set the checksum field to the checksum of the most recent revision of the  LATEST version. If you don't specify the  checksum field, or if the checksum does not match the  LATEST version, you get a PreconditionFailedException exception.
+- `checksum`: Identifies a specific revision of the LATEST version. When you create a new bot alias, leave the checksum field blank. If you specify a checksum you get a BadRequestException exception. When you want to update a bot alias, set the checksum field to the checksum of the most recent revision of the LATEST version. If you don't specify the  checksum field, or if the checksum does not match the LATEST version, you get a PreconditionFailedException exception.
 - `conversationLogs`: Settings for conversation logs for the alias.
 - `description`: A description of the alias.
 - `tags`: A list of tags to add to the bot alias. You can only add tags when you create an alias, you can't use the PutBotAlias operation to update the tags on a bot alias. To update tags, use the TagResource operation.
@@ -521,13 +521,13 @@ put_bot_alias(botName, botVersion, name, args::AbstractDict{String, <:Any}; aws_
 """
     PutIntent()
 
-Creates an intent or replaces an existing intent. To define the interaction between the user and your bot, you use one or more intents. For a pizza ordering bot, for example, you would create an OrderPizza intent.  To create an intent or replace an existing intent, you must provide the following:   Intent name. For example, OrderPizza.   Sample utterances. For example, \"Can I order a pizza, please.\" and \"I want to order a pizza.\"   Information to be gathered. You specify slot types for the information that your bot will request from the user. You can specify standard slot types, such as a date or a time, or custom slot types such as the size and crust of a pizza.   How the intent will be fulfilled. You can provide a Lambda function or configure the intent to return the intent information to the client application. If you use a Lambda function, when all of the intent information is available, Amazon Lex invokes your Lambda function. If you configure your intent to return the intent information to the client application.    You can specify other optional information in the request, such as:   A confirmation prompt to ask the user to confirm an intent. For example, \"Shall I order your pizza?\"   A conclusion statement to send to the user after the intent has been fulfilled. For example, \"I placed your pizza order.\"   A follow-up prompt that asks the user for additional activity. For example, asking \"Do you want to order a drink with your pizza?\"   If you specify an existing intent name to update the intent, Amazon Lex replaces the values in the  LATEST version of the intent with the values in the request. Amazon Lex removes fields that you don't provide in the request. If you don't specify the required fields, Amazon Lex throws an exception. When you update the  LATEST version of an intent, the status field of any bot that uses the  LATEST version of the intent is set to NOT_BUILT. For more information, see how-it-works. This operation requires permissions for the lex:PutIntent action.
+Creates an intent or replaces an existing intent. To define the interaction between the user and your bot, you use one or more intents. For a pizza ordering bot, for example, you would create an OrderPizza intent.  To create an intent or replace an existing intent, you must provide the following:   Intent name. For example, OrderPizza.   Sample utterances. For example, \"Can I order a pizza, please.\" and \"I want to order a pizza.\"   Information to be gathered. You specify slot types for the information that your bot will request from the user. You can specify standard slot types, such as a date or a time, or custom slot types such as the size and crust of a pizza.   How the intent will be fulfilled. You can provide a Lambda function or configure the intent to return the intent information to the client application. If you use a Lambda function, when all of the intent information is available, Amazon Lex invokes your Lambda function. If you configure your intent to return the intent information to the client application.    You can specify other optional information in the request, such as:   A confirmation prompt to ask the user to confirm an intent. For example, \"Shall I order your pizza?\"   A conclusion statement to send to the user after the intent has been fulfilled. For example, \"I placed your pizza order.\"   A follow-up prompt that asks the user for additional activity. For example, asking \"Do you want to order a drink with your pizza?\"   If you specify an existing intent name to update the intent, Amazon Lex replaces the values in the LATEST version of the intent with the values in the request. Amazon Lex removes fields that you don't provide in the request. If you don't specify the required fields, Amazon Lex throws an exception. When you update the LATEST version of an intent, the status field of any bot that uses the LATEST version of the intent is set to NOT_BUILT. For more information, see how-it-works. This operation requires permissions for the lex:PutIntent action.
 
 # Required Parameters
 - `name`: The name of the intent. The name is not case sensitive.  The name can't match a built-in intent name, or a built-in intent name with \"AMAZON.\" removed. For example, because there is a built-in intent called AMAZON.HelpIntent, you can't create a custom intent called HelpIntent. For a list of built-in intents, see Standard Built-in Intents in the Alexa Skills Kit.
 
 # Optional Parameters
-- `checksum`: Identifies a specific revision of the  LATEST version. When you create a new intent, leave the checksum field blank. If you specify a checksum you get a BadRequestException exception. When you want to update a intent, set the checksum field to the checksum of the most recent revision of the  LATEST version. If you don't specify the  checksum field, or if the checksum does not match the  LATEST version, you get a PreconditionFailedException exception.
+- `checksum`: Identifies a specific revision of the LATEST version. When you create a new intent, leave the checksum field blank. If you specify a checksum you get a BadRequestException exception. When you want to update a intent, set the checksum field to the checksum of the most recent revision of the LATEST version. If you don't specify the  checksum field, or if the checksum does not match the LATEST version, you get a PreconditionFailedException exception.
 - `conclusionStatement`:  The statement that you want Amazon Lex to convey to the user after the intent is successfully fulfilled by the Lambda function.  This element is relevant only if you provide a Lambda function in the fulfillmentActivity. If you return the intent to the client application, you can't specify this element.  The followUpPrompt and conclusionStatement are mutually exclusive. You can specify only one. 
 - `confirmationPrompt`: Prompts the user to confirm the intent. This question should have a yes or no answer. Amazon Lex uses this prompt to ensure that the user acknowledges that the intent is ready for fulfillment. For example, with the OrderPizza intent, you might want to confirm that the order is correct before placing it. For other intents, such as intents that simply respond to user questions, you might not need to ask the user for confirmation before providing the information.   You you must provide both the rejectionStatement and the confirmationPrompt, or neither. 
 - `createVersion`: When set to true a new numbered version of the intent is created. This is the same as calling the CreateIntentVersion operation. If you do not specify createVersion, the default is false.
@@ -548,13 +548,13 @@ put_intent(name, args::AbstractDict{String, <:Any}; aws_config::AWSConfig=global
 """
     PutSlotType()
 
-Creates a custom slot type or replaces an existing custom slot type. To create a custom slot type, specify a name for the slot type and a set of enumeration values, which are the values that a slot of this type can assume. For more information, see how-it-works. If you specify the name of an existing slot type, the fields in the request replace the existing values in the  LATEST version of the slot type. Amazon Lex removes the fields that you don't provide in the request. If you don't specify required fields, Amazon Lex throws an exception. When you update the  LATEST version of a slot type, if a bot uses the  LATEST version of an intent that contains the slot type, the bot's status field is set to NOT_BUILT. This operation requires permissions for the lex:PutSlotType action.
+Creates a custom slot type or replaces an existing custom slot type. To create a custom slot type, specify a name for the slot type and a set of enumeration values, which are the values that a slot of this type can assume. For more information, see how-it-works. If you specify the name of an existing slot type, the fields in the request replace the existing values in the LATEST version of the slot type. Amazon Lex removes the fields that you don't provide in the request. If you don't specify required fields, Amazon Lex throws an exception. When you update the LATEST version of a slot type, if a bot uses the LATEST version of an intent that contains the slot type, the bot's status field is set to NOT_BUILT. This operation requires permissions for the lex:PutSlotType action.
 
 # Required Parameters
 - `name`: The name of the slot type. The name is not case sensitive.  The name can't match a built-in slot type name, or a built-in slot type name with \"AMAZON.\" removed. For example, because there is a built-in slot type called AMAZON.DATE, you can't create a custom slot type called DATE. For a list of built-in slot types, see Slot Type Reference in the Alexa Skills Kit.
 
 # Optional Parameters
-- `checksum`: Identifies a specific revision of the  LATEST version. When you create a new slot type, leave the checksum field blank. If you specify a checksum you get a BadRequestException exception. When you want to update a slot type, set the checksum field to the checksum of the most recent revision of the  LATEST version. If you don't specify the  checksum field, or if the checksum does not match the  LATEST version, you get a PreconditionFailedException exception.
+- `checksum`: Identifies a specific revision of the LATEST version. When you create a new slot type, leave the checksum field blank. If you specify a checksum you get a BadRequestException exception. When you want to update a slot type, set the checksum field to the checksum of the most recent revision of the LATEST version. If you don't specify the  checksum field, or if the checksum does not match the LATEST version, you get a PreconditionFailedException exception.
 - `createVersion`: When set to true a new numbered version of the slot type is created. This is the same as calling the CreateSlotTypeVersion operation. If you do not specify createVersion, the default is false.
 - `description`: A description of the slot type.
 - `enumerationValues`: A list of EnumerationValue objects that defines the values that the slot type can take. Each value can have a list of synonyms, which are additional values that help train the machine learning model about the values that it resolves for a slot.  When Amazon Lex resolves a slot value, it generates a resolution list that contains up to five possible values for the slot. If you are using a Lambda function, this resolution list is passed to the function. If you are not using a Lambda function you can choose to return the value that the user entered or the first value in the resolution list as the slot value. The valueSelectionStrategy field indicates the option to use. 
@@ -572,7 +572,7 @@ put_slot_type(name, args::AbstractDict{String, <:Any}; aws_config::AWSConfig=glo
 Starts a job to import a resource to Amazon Lex.
 
 # Required Parameters
-- `mergeStrategy`: Specifies the action that the StartImport operation should take when there is an existing resource with the same name.   FAIL_ON_CONFLICT - The import operation is stopped on the first conflict between a resource in the import file and an existing resource. The name of the resource causing the conflict is in the failureReason field of the response to the GetImport operation. OVERWRITE_LATEST - The import operation proceeds even if there is a conflict with an existing resource. The  LASTEST version of the existing resource is overwritten with the data from the import file.  
+- `mergeStrategy`: Specifies the action that the StartImport operation should take when there is an existing resource with the same name.   FAIL_ON_CONFLICT - The import operation is stopped on the first conflict between a resource in the import file and an existing resource. The name of the resource causing the conflict is in the failureReason field of the response to the GetImport operation. OVERWRITE_LATEST - The import operation proceeds even if there is a conflict with an existing resource. The LASTEST version of the existing resource is overwritten with the data from the import file.  
 - `payload`: A zip archive in binary format. The archive should contain one file, a JSON file containing the resource to import. The resource should match the type specified in the resourceType field.
 - `resourceType`: Specifies the type of resource to export. Each resource also exports any resources that it depends on.    A bot exports dependent intents.   An intent exports dependent slot types.  
 
diff --git a/src/services/lex_runtime_service.jl b/src/services/lex_runtime_service.jl
index 32b296a44b..3a650f4ae1 100644
--- a/src/services/lex_runtime_service.jl
+++ b/src/services/lex_runtime_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: lex_runtime_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteSession()
 
diff --git a/src/services/license_manager.jl b/src/services/license_manager.jl
index 4e0230b650..b484bdc36f 100644
--- a/src/services/license_manager.jl
+++ b/src/services/license_manager.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: license_manager
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateLicenseConfiguration()
 
diff --git a/src/services/lightsail.jl b/src/services/lightsail.jl
index 1a353cff8d..0e766a349f 100644
--- a/src/services/lightsail.jl
+++ b/src/services/lightsail.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: lightsail
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AllocateStaticIp()
 
diff --git a/src/services/machine_learning.jl b/src/services/machine_learning.jl
index 327ab428f9..5afec2623f 100644
--- a/src/services/machine_learning.jl
+++ b/src/services/machine_learning.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: machine_learning
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTags()
 
@@ -44,7 +44,7 @@ Creates a DataSource object from an  Amazon Relational Database Service (Amazon
 
 # Required Parameters
 - `DataSourceId`: A user-supplied ID that uniquely identifies the DataSource. Typically, an Amazon Resource Number (ARN) becomes the ID for a DataSource.
-- `RDSData`: The data specification of an Amazon RDS DataSource:  DatabaseInformation -   DatabaseName - The name of the Amazon RDS database.  InstanceIdentifier  - A unique identifier for the Amazon RDS database instance.   DatabaseCredentials - AWS Identity and Access Management (IAM) credentials that are used to connect to the Amazon RDS database. ResourceRole - A role (DataPipelineDefaultResourceRole) assumed by an EC2 instance to carry out the copy task from Amazon RDS to Amazon Simple Storage Service (Amazon S3). For more information, see Role templates for data pipelines. ServiceRole - A role (DataPipelineDefaultRole) assumed by the AWS Data Pipeline service to monitor the progress of the copy task from Amazon RDS to Amazon S3. For more information, see Role templates for data pipelines. SecurityInfo - The security information to use to access an RDS DB instance. You need to set up appropriate ingress rules for the security entity IDs provided to allow access to the Amazon RDS instance. Specify a [SubnetId, SecurityGroupIds] pair for a VPC-based RDS DB instance. SelectSqlQuery - A query that is used to retrieve the observation data for the Datasource. S3StagingLocation - The Amazon S3 location for staging Amazon RDS data. The data retrieved from Amazon RDS using SelectSqlQuery is stored in this location. DataSchemaUri - The Amazon S3 location of the DataSchema. DataSchema - A JSON string representing the schema. This is not required if DataSchemaUri is specified.   DataRearrangement - A JSON string that represents the splitting and rearrangement requirements for the Datasource.    Sample -  \"{ \"splitting \":{ \"percentBegin \":10, \"percentEnd \":60}}\"   
+- `RDSData`: The data specification of an Amazon RDS DataSource:  DatabaseInformation -   DatabaseName - The name of the Amazon RDS database.  InstanceIdentifier  - A unique identifier for the Amazon RDS database instance.   DatabaseCredentials - AWS Identity and Access Management (IAM) credentials that are used to connect to the Amazon RDS database. ResourceRole - A role (DataPipelineDefaultResourceRole) assumed by an EC2 instance to carry out the copy task from Amazon RDS to Amazon Simple Storage Service (Amazon S3). For more information, see Role templates for data pipelines. ServiceRole - A role (DataPipelineDefaultRole) assumed by the AWS Data Pipeline service to monitor the progress of the copy task from Amazon RDS to Amazon S3. For more information, see Role templates for data pipelines. SecurityInfo - The security information to use to access an RDS DB instance. You need to set up appropriate ingress rules for the security entity IDs provided to allow access to the Amazon RDS instance. Specify a [SubnetId, SecurityGroupIds] pair for a VPC-based RDS DB instance. SelectSqlQuery - A query that is used to retrieve the observation data for the Datasource. S3StagingLocation - The Amazon S3 location for staging Amazon RDS data. The data retrieved from Amazon RDS using SelectSqlQuery is stored in this location. DataSchemaUri - The Amazon S3 location of the DataSchema. DataSchema - A JSON string representing the schema. This is not required if DataSchemaUri is specified.   DataRearrangement - A JSON string that represents the splitting and rearrangement requirements for the Datasource.    Sample -  \"{\"splitting\":{\"percentBegin\":10,\"percentEnd\":60}}\"   
 - `RoleARN`: The role that Amazon ML assumes on behalf of the user to create and activate a data pipeline in the user's account and copy data using the SelectSqlQuery query from Amazon RDS to Amazon S3.  
 
 # Optional Parameters
@@ -62,7 +62,7 @@ Creates a DataSource from a database hosted on an Amazon Redshift cluster. A Dat
 
 # Required Parameters
 - `DataSourceId`: A user-supplied ID that uniquely identifies the DataSource.
-- `DataSpec`: The data specification of an Amazon Redshift DataSource:  DatabaseInformation -   DatabaseName - The name of the Amazon Redshift database.    ClusterIdentifier - The unique ID for the Amazon Redshift cluster.  DatabaseCredentials - The AWS Identity and Access Management (IAM) credentials that are used to connect to the Amazon Redshift database. SelectSqlQuery - The query that is used to retrieve the observation data for the Datasource. S3StagingLocation - The Amazon Simple Storage Service (Amazon S3) location for staging Amazon Redshift data. The data retrieved from Amazon Redshift using the SelectSqlQuery query is stored in this location. DataSchemaUri - The Amazon S3 location of the DataSchema. DataSchema - A JSON string representing the schema. This is not required if DataSchemaUri is specified.   DataRearrangement - A JSON string that represents the splitting and rearrangement requirements for the DataSource.  Sample -  \"{ \"splitting \":{ \"percentBegin \":10, \"percentEnd \":60}}\"   
+- `DataSpec`: The data specification of an Amazon Redshift DataSource:  DatabaseInformation -   DatabaseName - The name of the Amazon Redshift database.    ClusterIdentifier - The unique ID for the Amazon Redshift cluster.  DatabaseCredentials - The AWS Identity and Access Management (IAM) credentials that are used to connect to the Amazon Redshift database. SelectSqlQuery - The query that is used to retrieve the observation data for the Datasource. S3StagingLocation - The Amazon Simple Storage Service (Amazon S3) location for staging Amazon Redshift data. The data retrieved from Amazon Redshift using the SelectSqlQuery query is stored in this location. DataSchemaUri - The Amazon S3 location of the DataSchema. DataSchema - A JSON string representing the schema. This is not required if DataSchemaUri is specified.   DataRearrangement - A JSON string that represents the splitting and rearrangement requirements for the DataSource.  Sample -  \"{\"splitting\":{\"percentBegin\":10,\"percentEnd\":60}}\"   
 - `RoleARN`: A fully specified role Amazon Resource Name (ARN). Amazon ML assumes the role on behalf of the user to create the following:    A security group to allow Amazon ML to execute the SelectSqlQuery query on an Amazon Redshift cluster An Amazon S3 bucket policy to grant Amazon ML read/write permissions on the S3StagingLocation  
 
 # Optional Parameters
@@ -80,7 +80,7 @@ Creates a DataSource object. A DataSource references data that can be used to pe
 
 # Required Parameters
 - `DataSourceId`: A user-supplied identifier that uniquely identifies the DataSource. 
-- `DataSpec`: The data specification of a DataSource:  DataLocationS3 - The Amazon S3 location of the observation data. DataSchemaLocationS3 - The Amazon S3 location of the DataSchema. DataSchema - A JSON string representing the schema. This is not required if DataSchemaUri is specified.   DataRearrangement - A JSON string that represents the splitting and rearrangement requirements for the Datasource.   Sample -  \"{ \"splitting \":{ \"percentBegin \":10, \"percentEnd \":60}}\"   
+- `DataSpec`: The data specification of a DataSource:  DataLocationS3 - The Amazon S3 location of the observation data. DataSchemaLocationS3 - The Amazon S3 location of the DataSchema. DataSchema - A JSON string representing the schema. This is not required if DataSchemaUri is specified.   DataRearrangement - A JSON string that represents the splitting and rearrangement requirements for the Datasource.   Sample -  \"{\"splitting\":{\"percentBegin\":10,\"percentEnd\":60}}\"   
 
 # Optional Parameters
 - `ComputeStatistics`: The compute statistics for a DataSource. The statistics are generated from the observation data referenced by a DataSource. Amazon ML uses the statistics internally during MLModel training. This parameter must be set to true if the DataSource needs to be used for MLModel training.
diff --git a/src/services/macie.jl b/src/services/macie.jl
index 8e0a457ac0..0f80d79246 100644
--- a/src/services/macie.jl
+++ b/src/services/macie.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: macie
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateMemberAccount()
 
diff --git a/src/services/macie2.jl b/src/services/macie2.jl
index 2407fe3f28..588d70088f 100644
--- a/src/services/macie2.jl
+++ b/src/services/macie2.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: macie2
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptInvitation()
 
@@ -44,7 +44,7 @@ batch_get_custom_data_identifiers(args::AbstractDict{String, Any}; aws_config::A
 # Optional Parameters
 - `customDataIdentifierIds`: The custom data identifiers to use for data analysis and classification.
 - `description`: A custom description of the job. The description can contain as many as 200 characters.
-- `initialRun`: Specifies whether to run the job immediately, after it's created.
+- `initialRun`: Specifies whether to analyze all existing, eligible objects immediately after the job is created.
 - `samplingPercentage`: The sampling depth, as a percentage, to apply when processing objects. This value determines the percentage of eligible objects that the job analyzes. If this value is less than 100, Amazon Macie selects the objects to analyze at random, up to the specified percentage, and analyzes all the data in those objects.
 - `scheduleFrequency`: The recurrence pattern for running the job. To run the job only once, don't specify a value for this property and set the value of the jobType property to ONE_TIME.
 - `tags`: A map of key-value pairs that specifies the tags to associate with the job. A job can have a maximum of 50 tags. Each tag consists of a tag key and an associated tag value. The maximum length of a tag key is 128 characters. The maximum length of a tag value is 256 characters.
diff --git a/src/services/managedblockchain.jl b/src/services/managedblockchain.jl
index 97f96235ef..55b141ccc8 100644
--- a/src/services/managedblockchain.jl
+++ b/src/services/managedblockchain.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: managedblockchain
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateMember()
 
diff --git a/src/services/marketplace_catalog.jl b/src/services/marketplace_catalog.jl
index f1d3bf6388..aab7e45850 100644
--- a/src/services/marketplace_catalog.jl
+++ b/src/services/marketplace_catalog.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: marketplace_catalog
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelChangeSet()
 
diff --git a/src/services/marketplace_commerce_analytics.jl b/src/services/marketplace_commerce_analytics.jl
index 2539daa662..985092a41f 100644
--- a/src/services/marketplace_commerce_analytics.jl
+++ b/src/services/marketplace_commerce_analytics.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: marketplace_commerce_analytics
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GenerateDataSet()
 
diff --git a/src/services/marketplace_entitlement_service.jl b/src/services/marketplace_entitlement_service.jl
index 7aef771519..0513b8d619 100644
--- a/src/services/marketplace_entitlement_service.jl
+++ b/src/services/marketplace_entitlement_service.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: marketplace_entitlement_service
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GetEntitlements()
 
diff --git a/src/services/marketplace_metering.jl b/src/services/marketplace_metering.jl
index 59c13bc096..4d75df5985 100644
--- a/src/services/marketplace_metering.jl
+++ b/src/services/marketplace_metering.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: marketplace_metering
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchMeterUsage()
 
diff --git a/src/services/mediaconnect.jl b/src/services/mediaconnect.jl
index a6904ee6c2..9c8cc67f2f 100644
--- a/src/services/mediaconnect.jl
+++ b/src/services/mediaconnect.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mediaconnect
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddFlowOutputs()
 
diff --git a/src/services/mediaconvert.jl b/src/services/mediaconvert.jl
index a4a5bdd6ad..8e36e45b4d 100644
--- a/src/services/mediaconvert.jl
+++ b/src/services/mediaconvert.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mediaconvert
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateCertificate()
 
diff --git a/src/services/medialive.jl b/src/services/medialive.jl
index f5f5d00a4d..40b50de7a0 100644
--- a/src/services/medialive.jl
+++ b/src/services/medialive.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: medialive
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchUpdateSchedule()
 
diff --git a/src/services/mediapackage.jl b/src/services/mediapackage.jl
index edf4e803ea..4b493fc50c 100644
--- a/src/services/mediapackage.jl
+++ b/src/services/mediapackage.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mediapackage
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateChannel()
 
diff --git a/src/services/mediapackage_vod.jl b/src/services/mediapackage_vod.jl
index da43373b4f..8d9abb5a14 100644
--- a/src/services/mediapackage_vod.jl
+++ b/src/services/mediapackage_vod.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mediapackage_vod
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateAsset()
 
diff --git a/src/services/mediastore.jl b/src/services/mediastore.jl
index b3b21ea1f3..8bbddc9943 100644
--- a/src/services/mediastore.jl
+++ b/src/services/mediastore.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mediastore
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateContainer()
 
diff --git a/src/services/mediastore_data.jl b/src/services/mediastore_data.jl
index f6685563a0..f1f97423e9 100644
--- a/src/services/mediastore_data.jl
+++ b/src/services/mediastore_data.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mediastore_data
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteObject()
 
@@ -36,7 +36,7 @@ describe_object(Path, args::AbstractDict{String, <:Any}; aws_config::AWSConfig=g
 Downloads the object at the specified path. If the object’s upload availability is set to streaming, AWS Elemental MediaStore downloads the object even if it’s still uploading the object.
 
 # Required Parameters
-- `Path`: The path (including the file name) where the object is stored in the container. Format: &lt;folder name&gt;/&lt;folder name&gt;/&lt;file name&gt; For example, to upload the file mlaw.avi to the folder path premium canada in the container movies, enter the path premium/canada/mlaw.avi. Do not include the container name in this path. If the path includes any folders that don't exist yet, the service creates them. For example, suppose you have an existing premium/usa subfolder. If you specify premium/canada, the service creates a canada subfolder in the premium folder. You then have two subfolders, usa and canada, in the premium folder.  There is no correlation between the path to the source and the path (folders) in the container in AWS Elemental MediaStore. For more information about folders and how they exist in a container, see the AWS Elemental MediaStore User Guide. The file name is the name that is assigned to the file that you upload. The file can have the same name inside and outside of AWS Elemental MediaStore, or it can have the same name. The file name can include or omit an extension. 
+- `Path`: The path (including the file name) where the object is stored in the container. Format: &lt;folder name&gt;/&lt;folder name&gt;/&lt;file name&gt; For example, to upload the file mlaw.avi to the folder path premiumcanada in the container movies, enter the path premium/canada/mlaw.avi. Do not include the container name in this path. If the path includes any folders that don't exist yet, the service creates them. For example, suppose you have an existing premium/usa subfolder. If you specify premium/canada, the service creates a canada subfolder in the premium folder. You then have two subfolders, usa and canada, in the premium folder.  There is no correlation between the path to the source and the path (folders) in the container in AWS Elemental MediaStore. For more information about folders and how they exist in a container, see the AWS Elemental MediaStore User Guide. The file name is the name that is assigned to the file that you upload. The file can have the same name inside and outside of AWS Elemental MediaStore, or it can have the same name. The file name can include or omit an extension. 
 
 # Optional Parameters
 - `Range`: The range bytes of an object to retrieve. For more information about the Range header, see http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35. AWS Elemental MediaStore ignores this header for partially uploaded objects that have streaming upload availability.
@@ -66,7 +66,7 @@ Uploads an object to the specified path. Object sizes are limited to 25 MB for s
 
 # Required Parameters
 - `Body`: The bytes to be stored. 
-- `Path`: The path (including the file name) where the object is stored in the container. Format: &lt;folder name&gt;/&lt;folder name&gt;/&lt;file name&gt; For example, to upload the file mlaw.avi to the folder path premium canada in the container movies, enter the path premium/canada/mlaw.avi. Do not include the container name in this path. If the path includes any folders that don't exist yet, the service creates them. For example, suppose you have an existing premium/usa subfolder. If you specify premium/canada, the service creates a canada subfolder in the premium folder. You then have two subfolders, usa and canada, in the premium folder.  There is no correlation between the path to the source and the path (folders) in the container in AWS Elemental MediaStore. For more information about folders and how they exist in a container, see the AWS Elemental MediaStore User Guide. The file name is the name that is assigned to the file that you upload. The file can have the same name inside and outside of AWS Elemental MediaStore, or it can have the same name. The file name can include or omit an extension. 
+- `Path`: The path (including the file name) where the object is stored in the container. Format: &lt;folder name&gt;/&lt;folder name&gt;/&lt;file name&gt; For example, to upload the file mlaw.avi to the folder path premiumcanada in the container movies, enter the path premium/canada/mlaw.avi. Do not include the container name in this path. If the path includes any folders that don't exist yet, the service creates them. For example, suppose you have an existing premium/usa subfolder. If you specify premium/canada, the service creates a canada subfolder in the premium folder. You then have two subfolders, usa and canada, in the premium folder.  There is no correlation between the path to the source and the path (folders) in the container in AWS Elemental MediaStore. For more information about folders and how they exist in a container, see the AWS Elemental MediaStore User Guide. The file name is the name that is assigned to the file that you upload. The file can have the same name inside and outside of AWS Elemental MediaStore, or it can have the same name. The file name can include or omit an extension. 
 
 # Optional Parameters
 - `Cache-Control`: An optional CacheControl header that allows the caller to control the object's cache behavior. Headers can be passed in as specified in the HTTP at https://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.9. Headers with a custom user-defined value are also accepted.
diff --git a/src/services/mediatailor.jl b/src/services/mediatailor.jl
index 988c5a800f..79f20eb130 100644
--- a/src/services/mediatailor.jl
+++ b/src/services/mediatailor.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mediatailor
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeletePlaybackConfiguration()
 
diff --git a/src/services/migration_hub.jl b/src/services/migration_hub.jl
index cb0c8cd80b..a483bb76d6 100644
--- a/src/services/migration_hub.jl
+++ b/src/services/migration_hub.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: migration_hub
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateCreatedArtifact()
 
diff --git a/src/services/migrationhub_config.jl b/src/services/migrationhub_config.jl
index 519c8443e9..3eebb0eb35 100644
--- a/src/services/migrationhub_config.jl
+++ b/src/services/migrationhub_config.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: migrationhub_config
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateHomeRegionControl()
 
diff --git a/src/services/mobile.jl b/src/services/mobile.jl
index acda4bd94a..568d71d747 100644
--- a/src/services/mobile.jl
+++ b/src/services/mobile.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mobile
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateProject()
 
diff --git a/src/services/mobile_analytics.jl b/src/services/mobile_analytics.jl
index 0646c4e839..4c02373cc8 100644
--- a/src/services/mobile_analytics.jl
+++ b/src/services/mobile_analytics.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mobile_analytics
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     PutEvents()
 
diff --git a/src/services/mq.jl b/src/services/mq.jl
index a22f9130f1..dc1427c73b 100644
--- a/src/services/mq.jl
+++ b/src/services/mq.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mq
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateBroker()
 
diff --git a/src/services/mturk.jl b/src/services/mturk.jl
index 2f85fba082..09e3e4ba61 100644
--- a/src/services/mturk.jl
+++ b/src/services/mturk.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: mturk
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptQualificationRequest()
 
@@ -519,7 +519,7 @@ reject_qualification_request(QualificationRequestId, args::AbstractDict{String,
 
 # Required Parameters
 - `AssignmentId`: The ID of the assignment for which this bonus is paid.
-- `BonusAmount`:  The Bonus amount is a US Dollar amount specified using a string (for example, \"5\" represents  5.00 USD and \"101.42\" represents  101.42 USD). Do not include currency symbols or currency codes. 
+- `BonusAmount`:  The Bonus amount is a US Dollar amount specified using a string (for example, \"5\" represents 5.00 USD and \"101.42\" represents 101.42 USD). Do not include currency symbols or currency codes. 
 - `Reason`: A message that explains the reason for the bonus payment. The Worker receiving the bonus can see this message.
 - `WorkerId`: The ID of the Worker being paid the bonus.
 
diff --git a/src/services/neptune.jl b/src/services/neptune.jl
index 35e310c5c9..7efbadcbfa 100644
--- a/src/services/neptune.jl
+++ b/src/services/neptune.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: neptune
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddRoleToDBCluster()
 
diff --git a/src/services/networkmanager.jl b/src/services/networkmanager.jl
index aad30c8a92..8729cf5b1d 100644
--- a/src/services/networkmanager.jl
+++ b/src/services/networkmanager.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: networkmanager
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateCustomerGateway()
 
@@ -83,9 +83,9 @@ Creates a new link for a specified site.
 
 # Optional Parameters
 - `Description`: A description of the link. Length Constraints: Maximum length of 256 characters.
-- `Provider`: The provider of the link. Constraints: Cannot include the following characters: |   ^ Length Constraints: Maximum length of 128 characters.
+- `Provider`: The provider of the link. Constraints: Cannot include the following characters: |  ^ Length Constraints: Maximum length of 128 characters.
 - `Tags`: The tags to apply to the resource during creation.
-- `Type`: The type of the link. Constraints: Cannot include the following characters: |   ^ Length Constraints: Maximum length of 128 characters.
+- `Type`: The type of the link. Constraints: Cannot include the following characters: |  ^ Length Constraints: Maximum length of 128 characters.
 """
 
 create_link(Bandwidth, SiteId, globalNetworkId; aws_config::AWSConfig=global_aws_config()) = networkmanager("POST", "/global-networks/$(globalNetworkId)/links", Dict{String, Any}("Bandwidth"=>Bandwidth, "SiteId"=>SiteId); aws_config=aws_config)
diff --git a/src/services/opsworks.jl b/src/services/opsworks.jl
index b32e3b33a6..00f550d800 100644
--- a/src/services/opsworks.jl
+++ b/src/services/opsworks.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: opsworks
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssignInstance()
 
@@ -79,7 +79,7 @@ Creates a clone of a specified stack. For more information, see Clone a Stack. B
 - `ClonePermissions`: Whether to clone the source stack's permissions.
 - `ConfigurationManager`: The configuration manager. When you clone a stack we recommend that you use the configuration manager to specify the Chef version: 12, 11.10, or 11.4 for Linux stacks, or 12.2 for Windows stacks. The default value for Linux stacks is currently 12.
 - `CustomCookbooksSource`: Contains the information required to retrieve an app or cookbook from a repository. For more information, see Adding Apps or Cookbooks and Recipes.
-- `CustomJson`: A string that contains user-defined, custom JSON. It is used to override the corresponding default stack configuration JSON values. The string should be in the following format:  \"{ \"key1 \":  \"value1 \",  \"key2 \":  \"value2 \",...}\"  For more information about custom JSON, see Use Custom JSON to Modify the Stack Configuration Attributes 
+- `CustomJson`: A string that contains user-defined, custom JSON. It is used to override the corresponding default stack configuration JSON values. The string should be in the following format:  \"{\"key1\": \"value1\", \"key2\": \"value2\",...}\"  For more information about custom JSON, see Use Custom JSON to Modify the Stack Configuration Attributes 
 - `DefaultAvailabilityZone`: The cloned stack's default Availability Zone, which must be in the specified region. For more information, see Regions and Endpoints. If you also specify a value for DefaultSubnetId, the subnet must be in the same zone. For more information, see the VpcId parameter description. 
 - `DefaultInstanceProfileArn`: The Amazon Resource Name (ARN) of an IAM profile that is the default profile for all of the stack's EC2 instances. For more information about IAM ARNs, see Using Identifiers.
 - `DefaultOs`: The stack's operating system, which must be set to one of the following.   A supported Linux operating system: An Amazon Linux version, such as Amazon Linux 2018.03, Amazon Linux 2017.09, Amazon Linux 2017.03, Amazon Linux 2016.09, Amazon Linux 2016.03, Amazon Linux 2015.09, or Amazon Linux 2015.03.   A supported Ubuntu operating system, such as Ubuntu 16.04 LTS, Ubuntu 14.04 LTS, or Ubuntu 12.04 LTS.    CentOS Linux 7     Red Hat Enterprise Linux 7     Microsoft Windows Server 2012 R2 Base, Microsoft Windows Server 2012 R2 with SQL Server Express, Microsoft Windows Server 2012 R2 with SQL Server Standard, or Microsoft Windows Server 2012 R2 with SQL Server Web.   A custom AMI: Custom. You specify the custom AMI you want to use when you create instances. For more information about how to use custom AMIs with OpsWorks, see Using Custom AMIs.   The default option is the parent stack's operating system. For more information about supported operating systems, see AWS OpsWorks Stacks Operating Systems.  You can specify a different Linux operating system for the cloned stack, but you cannot change from Linux to Windows or Windows to Linux. 
@@ -134,7 +134,7 @@ Runs deployment or stack commands. For more information, see Deploying Apps and
 # Optional Parameters
 - `AppId`: The app ID. This parameter is required for app deployments, but not for other deployment commands.
 - `Comment`: A user-defined comment.
-- `CustomJson`: A string that contains user-defined, custom JSON. You can use this parameter to override some corresponding default stack configuration JSON values. The string should be in the following format:  \"{ \"key1 \":  \"value1 \",  \"key2 \":  \"value2 \",...}\"  For more information about custom JSON, see Use Custom JSON to Modify the Stack Configuration Attributes and Overriding Attributes With Custom JSON.
+- `CustomJson`: A string that contains user-defined, custom JSON. You can use this parameter to override some corresponding default stack configuration JSON values. The string should be in the following format:  \"{\"key1\": \"value1\", \"key2\": \"value2\",...}\"  For more information about custom JSON, see Use Custom JSON to Modify the Stack Configuration Attributes and Overriding Attributes With Custom JSON.
 - `InstanceIds`: The instance IDs for the deployment targets.
 - `LayerIds`: The layer IDs for the deployment targets.
 """
@@ -221,7 +221,7 @@ Creates a new stack. For more information, see Create a New Stack.  Required Per
 - `ChefConfiguration`: A ChefConfiguration object that specifies whether to enable Berkshelf and the Berkshelf version on Chef 11.10 stacks. For more information, see Create a New Stack.
 - `ConfigurationManager`: The configuration manager. When you create a stack we recommend that you use the configuration manager to specify the Chef version: 12, 11.10, or 11.4 for Linux stacks, or 12.2 for Windows stacks. The default value for Linux stacks is currently 12.
 - `CustomCookbooksSource`: Contains the information required to retrieve an app or cookbook from a repository. For more information, see Adding Apps or Cookbooks and Recipes.
-- `CustomJson`: A string that contains user-defined, custom JSON. It can be used to override the corresponding default stack configuration attribute values or to pass data to recipes. The string should be in the following format:  \"{ \"key1 \":  \"value1 \",  \"key2 \":  \"value2 \",...}\"  For more information about custom JSON, see Use Custom JSON to Modify the Stack Configuration Attributes.
+- `CustomJson`: A string that contains user-defined, custom JSON. It can be used to override the corresponding default stack configuration attribute values or to pass data to recipes. The string should be in the following format:  \"{\"key1\": \"value1\", \"key2\": \"value2\",...}\"  For more information about custom JSON, see Use Custom JSON to Modify the Stack Configuration Attributes.
 - `DefaultAvailabilityZone`: The stack's default Availability Zone, which must be in the specified region. For more information, see Regions and Endpoints. If you also specify a value for DefaultSubnetId, the subnet must be in the same zone. For more information, see the VpcId parameter description. 
 - `DefaultOs`: The stack's default operating system, which is installed on every instance unless you specify a different operating system when you create the instance. You can specify one of the following.   A supported Linux operating system: An Amazon Linux version, such as Amazon Linux 2018.03, Amazon Linux 2017.09, Amazon Linux 2017.03, Amazon Linux 2016.09, Amazon Linux 2016.03, Amazon Linux 2015.09, or Amazon Linux 2015.03.   A supported Ubuntu operating system, such as Ubuntu 16.04 LTS, Ubuntu 14.04 LTS, or Ubuntu 12.04 LTS.    CentOS Linux 7     Red Hat Enterprise Linux 7    A supported Windows operating system, such as Microsoft Windows Server 2012 R2 Base, Microsoft Windows Server 2012 R2 with SQL Server Express, Microsoft Windows Server 2012 R2 with SQL Server Standard, or Microsoft Windows Server 2012 R2 with SQL Server Web.   A custom AMI: Custom. You specify the custom AMI you want to use when you create instances. For more information, see  Using Custom AMIs.   The default option is the current Amazon Linux version. For more information about supported operating systems, see AWS OpsWorks Stacks Operating Systems.
 - `DefaultRootDeviceType`: The default root device type. This value is the default for all instances in the stack, but you can override it when you create an instance. The default option is instance-store. For more information, see Storage for the Root Device.
@@ -1083,7 +1083,7 @@ Updates a specified layer.  Required Permissions: To use this action, an IAM use
 - `LifecycleEventConfiguration`: 
 - `Name`: The layer name, which is used by the console.
 - `Packages`: An array of Package objects that describe the layer's packages.
-- `Shortname`: For custom layers only, use this parameter to specify the layer's short name, which is used internally by AWS OpsWorks Stacks and by Chef. The short name is also used as the name for the directory where your app files are installed. It can have a maximum of 200 characters and must be in the following format: / A[a-z0-9 - _ .]+ Z/. The built-in layers' short names are defined by AWS OpsWorks Stacks. For more information, see the Layer Reference 
+- `Shortname`: For custom layers only, use this parameter to specify the layer's short name, which is used internally by AWS OpsWorks Stacks and by Chef. The short name is also used as the name for the directory where your app files are installed. It can have a maximum of 200 characters and must be in the following format: /A[a-z0-9-_.]+Z/. The built-in layers' short names are defined by AWS OpsWorks Stacks. For more information, see the Layer Reference 
 - `UseEbsOptimizedInstances`: Whether to use Amazon EBS-optimized instances.
 - `VolumeConfigurations`: A VolumeConfigurations object that describes the layer's Amazon EBS volumes.
 """
@@ -1133,7 +1133,7 @@ Updates a specified stack.  Required Permissions: To use this action, an IAM use
 - `ChefConfiguration`: A ChefConfiguration object that specifies whether to enable Berkshelf and the Berkshelf version on Chef 11.10 stacks. For more information, see Create a New Stack.
 - `ConfigurationManager`: The configuration manager. When you update a stack, we recommend that you use the configuration manager to specify the Chef version: 12, 11.10, or 11.4 for Linux stacks, or 12.2 for Windows stacks. The default value for Linux stacks is currently 12.
 - `CustomCookbooksSource`: Contains the information required to retrieve an app or cookbook from a repository. For more information, see Adding Apps or Cookbooks and Recipes.
-- `CustomJson`: A string that contains user-defined, custom JSON. It can be used to override the corresponding default stack configuration JSON values or to pass data to recipes. The string should be in the following format:  \"{ \"key1 \":  \"value1 \",  \"key2 \":  \"value2 \",...}\"  For more information about custom JSON, see Use Custom JSON to Modify the Stack Configuration Attributes.
+- `CustomJson`: A string that contains user-defined, custom JSON. It can be used to override the corresponding default stack configuration JSON values or to pass data to recipes. The string should be in the following format:  \"{\"key1\": \"value1\", \"key2\": \"value2\",...}\"  For more information about custom JSON, see Use Custom JSON to Modify the Stack Configuration Attributes.
 - `DefaultAvailabilityZone`: The stack's default Availability Zone, which must be in the stack's region. For more information, see Regions and Endpoints. If you also specify a value for DefaultSubnetId, the subnet must be in the same zone. For more information, see CreateStack. 
 - `DefaultInstanceProfileArn`: The ARN of an IAM profile that is the default profile for all of the stack's EC2 instances. For more information about IAM ARNs, see Using Identifiers.
 - `DefaultOs`: The stack's operating system, which must be set to one of the following:   A supported Linux operating system: An Amazon Linux version, such as Amazon Linux 2018.03, Amazon Linux 2017.09, Amazon Linux 2017.03, Amazon Linux 2016.09, Amazon Linux 2016.03, Amazon Linux 2015.09, or Amazon Linux 2015.03.   A supported Ubuntu operating system, such as Ubuntu 16.04 LTS, Ubuntu 14.04 LTS, or Ubuntu 12.04 LTS.    CentOS Linux 7     Red Hat Enterprise Linux 7    A supported Windows operating system, such as Microsoft Windows Server 2012 R2 Base, Microsoft Windows Server 2012 R2 with SQL Server Express, Microsoft Windows Server 2012 R2 with SQL Server Standard, or Microsoft Windows Server 2012 R2 with SQL Server Web.   A custom AMI: Custom. You specify the custom AMI you want to use when you create instances. For more information about how to use custom AMIs with OpsWorks, see Using Custom AMIs.   The default option is the stack's current operating system. For more information about supported operating systems, see AWS OpsWorks Stacks Operating Systems.
diff --git a/src/services/opsworkscm.jl b/src/services/opsworkscm.jl
index f901764e08..dc0f38beeb 100644
--- a/src/services/opsworkscm.jl
+++ b/src/services/opsworkscm.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: opsworkscm
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateNode()
 
@@ -55,7 +55,7 @@ create_backup(ServerName, args::AbstractDict{String, <:Any}; aws_config::AWSConf
 - `CustomDomain`: An optional public endpoint of a server, such as https://aws.my-company.com. To access the server, create a CNAME DNS record in your preferred DNS service that points the custom domain to the endpoint that is generated when the server is created (the value of the CreateServer Endpoint attribute). You cannot access the server by using the generated Endpoint value if the server is using a custom domain. If you specify a custom domain, you must also specify values for CustomCertificate and CustomPrivateKey.
 - `CustomPrivateKey`: A private key in PEM format for connecting to the server by using HTTPS. The private key must not be encrypted; it cannot be protected by a password or passphrase. If you specify a custom private key, you must also specify values for CustomDomain and CustomCertificate.
 - `DisableAutomatedBackup`:  Enable or disable scheduled backups. Valid values are true or false. The default value is true. 
-- `EngineAttributes`: Optional engine attributes on a specified server.   Attributes accepted in a Chef createServer request:     CHEF_AUTOMATE_PIVOTAL_KEY: A base64-encoded RSA public key. The corresponding private key is required to access the Chef API. When no CHEF_AUTOMATE_PIVOTAL_KEY is set, a private key is generated and returned in the response.     CHEF_AUTOMATE_ADMIN_PASSWORD: The password for the administrative user in the Chef Automate web-based dashboard. The password length is a minimum of eight characters, and a maximum of 32. The password can contain letters, numbers, and special characters (!/@# %^&amp;+=_). The password must contain at least one lower case letter, one upper case letter, one number, and one special character. When no CHEF_AUTOMATE_ADMIN_PASSWORD is set, one is generated and returned in the response.    Attributes accepted in a Puppet createServer request:     PUPPET_ADMIN_PASSWORD: To work with the Puppet Enterprise console, a password must use ASCII characters.    PUPPET_R10K_REMOTE: The r10k remote is the URL of your control repository (for example, ssh://git@your.git-repo.com:user/control-repo.git). Specifying an r10k remote opens TCP port 8170.    PUPPET_R10K_PRIVATE_KEY: If you are using a private Git repository, add PUPPET_R10K_PRIVATE_KEY to specify a PEM-encoded private SSH key.  
+- `EngineAttributes`: Optional engine attributes on a specified server.   Attributes accepted in a Chef createServer request:     CHEF_AUTOMATE_PIVOTAL_KEY: A base64-encoded RSA public key. The corresponding private key is required to access the Chef API. When no CHEF_AUTOMATE_PIVOTAL_KEY is set, a private key is generated and returned in the response.     CHEF_AUTOMATE_ADMIN_PASSWORD: The password for the administrative user in the Chef Automate web-based dashboard. The password length is a minimum of eight characters, and a maximum of 32. The password can contain letters, numbers, and special characters (!/@#%^&amp;+=_). The password must contain at least one lower case letter, one upper case letter, one number, and one special character. When no CHEF_AUTOMATE_ADMIN_PASSWORD is set, one is generated and returned in the response.    Attributes accepted in a Puppet createServer request:     PUPPET_ADMIN_PASSWORD: To work with the Puppet Enterprise console, a password must use ASCII characters.    PUPPET_R10K_REMOTE: The r10k remote is the URL of your control repository (for example, ssh://git@your.git-repo.com:user/control-repo.git). Specifying an r10k remote opens TCP port 8170.    PUPPET_R10K_PRIVATE_KEY: If you are using a private Git repository, add PUPPET_R10K_PRIVATE_KEY to specify a PEM-encoded private SSH key.  
 - `EngineModel`:  The engine model of the server. Valid values in this release include Monolithic for Puppet and Single for Chef. 
 - `EngineVersion`:  The major release version of the engine that you want to use. For a Chef server, the valid value for EngineVersion is currently 2. For a Puppet server, the valid value is 2017. 
 - `KeyPair`:  The Amazon EC2 key pair to set for the instance. This parameter is optional; if desired, you may specify this parameter to connect to your instances by using SSH. 
diff --git a/src/services/organizations.jl b/src/services/organizations.jl
index a12050ef04..2038c75bbc 100644
--- a/src/services/organizations.jl
+++ b/src/services/organizations.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: organizations
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptHandshake()
 
diff --git a/src/services/outposts.jl b/src/services/outposts.jl
index bf39840747..9bcdda5098 100644
--- a/src/services/outposts.jl
+++ b/src/services/outposts.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: outposts
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateOutpost()
 
diff --git a/src/services/personalize.jl b/src/services/personalize.jl
index ed247de5ea..41919fda8f 100644
--- a/src/services/personalize.jl
+++ b/src/services/personalize.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: personalize
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateBatchInferenceJob()
 
diff --git a/src/services/personalize_events.jl b/src/services/personalize_events.jl
index 0c0e494f70..99415fb476 100644
--- a/src/services/personalize_events.jl
+++ b/src/services/personalize_events.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: personalize_events
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     PutEvents()
 
diff --git a/src/services/personalize_runtime.jl b/src/services/personalize_runtime.jl
index 2754526240..b1dd269ca6 100644
--- a/src/services/personalize_runtime.jl
+++ b/src/services/personalize_runtime.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: personalize_runtime
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GetPersonalizedRanking()
 
diff --git a/src/services/pi.jl b/src/services/pi.jl
index e83c9a91b1..e762a3b286 100644
--- a/src/services/pi.jl
+++ b/src/services/pi.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: pi
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeDimensionKeys()
 
diff --git a/src/services/pinpoint.jl b/src/services/pinpoint.jl
index 981f0bf760..47a55b005e 100644
--- a/src/services/pinpoint.jl
+++ b/src/services/pinpoint.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: pinpoint
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApp()
 
diff --git a/src/services/pinpoint_email.jl b/src/services/pinpoint_email.jl
index e5347475ca..ebcdde3fa7 100644
--- a/src/services/pinpoint_email.jl
+++ b/src/services/pinpoint_email.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: pinpoint_email
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateConfigurationSet()
 
diff --git a/src/services/pinpoint_sms_voice.jl b/src/services/pinpoint_sms_voice.jl
index 4f17cd9e16..0d7d6f445a 100644
--- a/src/services/pinpoint_sms_voice.jl
+++ b/src/services/pinpoint_sms_voice.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: pinpoint_sms_voice
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateConfigurationSet()
 
diff --git a/src/services/polly.jl b/src/services/polly.jl
index c42b0f2435..a907b3f46f 100644
--- a/src/services/polly.jl
+++ b/src/services/polly.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: polly
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteLexicon()
 
diff --git a/src/services/pricing.jl b/src/services/pricing.jl
index 195ed42ac5..1c1a1463a3 100644
--- a/src/services/pricing.jl
+++ b/src/services/pricing.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: pricing
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeServices()
 
diff --git a/src/services/qldb.jl b/src/services/qldb.jl
index 2c9e329d59..d8765c34e4 100644
--- a/src/services/qldb.jl
+++ b/src/services/qldb.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: qldb
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelJournalKinesisStream()
 
diff --git a/src/services/qldb_session.jl b/src/services/qldb_session.jl
index d8975949d6..d3c36effd1 100644
--- a/src/services/qldb_session.jl
+++ b/src/services/qldb_session.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: qldb_session
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     SendCommand()
 
diff --git a/src/services/quicksight.jl b/src/services/quicksight.jl
index 7cb7134e15..40e624633d 100644
--- a/src/services/quicksight.jl
+++ b/src/services/quicksight.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: quicksight
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelIngestion()
 
@@ -235,7 +235,7 @@ create_template(AwsAccountId, SourceEntity, TemplateId, args::AbstractDict{Strin
 Creates a template alias for a template.
 
 # Required Parameters
-- `AliasName`: The name that you want to give to the template alias that you're creating. Don't start the alias name with the   character. Alias names that start with   are reserved by QuickSight. 
+- `AliasName`: The name that you want to give to the template alias that you're creating. Don't start the alias name with the  character. Alias names that start with  are reserved by QuickSight. 
 - `AwsAccountId`: The ID of the AWS account that contains the template that you creating an alias for.
 - `TemplateId`: An ID for the template.
 - `TemplateVersionNumber`: The version number of the template.
@@ -272,7 +272,7 @@ create_theme(AwsAccountId, BaseThemeId, Configuration, Name, ThemeId, args::Abst
 Creates a theme alias for a theme.
 
 # Required Parameters
-- `AliasName`: The name that you want to give to the theme alias that you are creating. The alias name can't begin with a  . Alias names that start with   are reserved by Amazon QuickSight. 
+- `AliasName`: The name that you want to give to the theme alias that you are creating. The alias name can't begin with a . Alias names that start with  are reserved by Amazon QuickSight. 
 - `AwsAccountId`: The ID of the AWS account that contains the theme for the new theme alias.
 - `ThemeId`: An ID for the theme alias.
 - `ThemeVersionNumber`: The version number of the theme.
@@ -440,7 +440,7 @@ delete_template(AwsAccountId, TemplateId, args::AbstractDict{String, <:Any}; aws
 Deletes the item that the specified template alias points to. If you provide a specific alias, you delete the version of the template that the alias points to.
 
 # Required Parameters
-- `AliasName`: The name for the template alias. To delete a specific alias, you delete the version that the alias points to. You can specify the alias name, or specify the latest version of the template by providing the keyword  LATEST in the AliasName parameter. 
+- `AliasName`: The name for the template alias. To delete a specific alias, you delete the version that the alias points to. You can specify the alias name, or specify the latest version of the template by providing the keyword LATEST in the AliasName parameter. 
 - `AwsAccountId`: The ID of the AWS account that contains the item to delete.
 - `TemplateId`: The ID for the template that the specified alias is for.
 
@@ -723,7 +723,7 @@ Describes a template's metadata.
 - `TemplateId`: The ID for the template.
 
 # Optional Parameters
-- `alias-name`: The alias of the template that you want to describe. If you name a specific alias, you describe the version that the alias points to. You can specify the latest version of the template by providing the keyword  LATEST in the AliasName parameter. The keyword  PUBLISHED doesn't apply to templates.
+- `alias-name`: The alias of the template that you want to describe. If you name a specific alias, you describe the version that the alias points to. You can specify the latest version of the template by providing the keyword LATEST in the AliasName parameter. The keyword PUBLISHED doesn't apply to templates.
 - `version-number`: (Optional) The number for the version to describe. If a VersionNumber parameter value isn't provided, the latest version of the template is described.
 """
 
@@ -736,7 +736,7 @@ describe_template(AwsAccountId, TemplateId, args::AbstractDict{String, <:Any}; a
 Describes the template alias for a template.
 
 # Required Parameters
-- `AliasName`: The name of the template alias that you want to describe. If you name a specific alias, you describe the version that the alias points to. You can specify the latest version of the template by providing the keyword  LATEST in the AliasName parameter. The keyword  PUBLISHED doesn't apply to templates.
+- `AliasName`: The name of the template alias that you want to describe. If you name a specific alias, you describe the version that the alias points to. You can specify the latest version of the template by providing the keyword LATEST in the AliasName parameter. The keyword PUBLISHED doesn't apply to templates.
 - `AwsAccountId`: The ID of the AWS account that contains the template alias that you're describing.
 - `TemplateId`: The ID for the template.
 
@@ -769,7 +769,7 @@ Describes a theme.
 - `ThemeId`: The ID for the theme.
 
 # Optional Parameters
-- `alias-name`: The alias of the theme that you want to describe. If you name a specific alias, you describe the version that the alias points to. You can specify the latest version of the theme by providing the keyword  LATEST in the AliasName parameter. The keyword  PUBLISHED doesn't apply to themes.
+- `alias-name`: The alias of the theme that you want to describe. If you name a specific alias, you describe the version that the alias points to. You can specify the latest version of the theme by providing the keyword LATEST in the AliasName parameter. The keyword PUBLISHED doesn't apply to themes.
 - `version-number`: The version number for the version to describe. If a VersionNumber parameter value isn't provided, the latest version of the theme is described.
 """
 
@@ -1545,7 +1545,7 @@ update_template(AwsAccountId, SourceEntity, TemplateId, args::AbstractDict{Strin
 Updates the template alias of a template.
 
 # Required Parameters
-- `AliasName`: The alias of the template that you want to update. If you name a specific alias, you update the version that the alias points to. You can specify the latest version of the template by providing the keyword  LATEST in the AliasName parameter. The keyword  PUBLISHED doesn't apply to templates.
+- `AliasName`: The alias of the template that you want to update. If you name a specific alias, you update the version that the alias points to. You can specify the latest version of the template by providing the keyword LATEST in the AliasName parameter. The keyword PUBLISHED doesn't apply to templates.
 - `AwsAccountId`: The ID of the AWS account that contains the template alias that you're updating.
 - `TemplateId`: The ID for the template.
 - `TemplateVersionNumber`: The version number of the template.
diff --git a/src/services/ram.jl b/src/services/ram.jl
index 119f542bc0..2947f3a31a 100644
--- a/src/services/ram.jl
+++ b/src/services/ram.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ram
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptResourceShareInvitation()
 
diff --git a/src/services/rds.jl b/src/services/rds.jl
index 4f4c7ad148..6dbf67c888 100644
--- a/src/services/rds.jl
+++ b/src/services/rds.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: rds
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddRoleToDBCluster()
 
diff --git a/src/services/rds_data.jl b/src/services/rds_data.jl
index 5b98e7e3e0..e0485dd001 100644
--- a/src/services/rds_data.jl
+++ b/src/services/rds_data.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: rds_data
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchExecuteStatement()
 
diff --git a/src/services/redshift.jl b/src/services/redshift.jl
index 2668127fbf..60d9167166 100644
--- a/src/services/redshift.jl
+++ b/src/services/redshift.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: redshift
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptReservedNodeExchange()
 
diff --git a/src/services/rekognition.jl b/src/services/rekognition.jl
index de9727737b..cf0bbc7330 100644
--- a/src/services/rekognition.jl
+++ b/src/services/rekognition.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: rekognition
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CompareFaces()
 
diff --git a/src/services/resource_groups.jl b/src/services/resource_groups.jl
index 11373fd0cc..9fb0465fbb 100644
--- a/src/services/resource_groups.jl
+++ b/src/services/resource_groups.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: resource_groups
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateGroup()
 
diff --git a/src/services/resource_groups_tagging_api.jl b/src/services/resource_groups_tagging_api.jl
index 5eec0c96b0..98e1d373d7 100644
--- a/src/services/resource_groups_tagging_api.jl
+++ b/src/services/resource_groups_tagging_api.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: resource_groups_tagging_api
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DescribeReportCreation()
 
diff --git a/src/services/robomaker.jl b/src/services/robomaker.jl
index dd7141282f..de4083d708 100644
--- a/src/services/robomaker.jl
+++ b/src/services/robomaker.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: robomaker
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchDeleteWorlds()
 
diff --git a/src/services/route53resolver.jl b/src/services/route53resolver.jl
index 0b443b7bec..419cef9f38 100644
--- a/src/services/route53resolver.jl
+++ b/src/services/route53resolver.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: route53resolver
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateResolverEndpointIpAddress()
 
diff --git a/src/services/route_53.jl b/src/services/route_53.jl
index 049fbec527..bb68cade99 100644
--- a/src/services/route_53.jl
+++ b/src/services/route_53.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: route_53
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateVPCWithHostedZone()
 
diff --git a/src/services/route_53_domains.jl b/src/services/route_53_domains.jl
index 8bb78372a0..7ea648b543 100644
--- a/src/services/route_53_domains.jl
+++ b/src/services/route_53_domains.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: route_53_domains
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptDomainTransferFromAnotherAwsAccount()
 
diff --git a/src/services/s3.jl b/src/services/s3.jl
index a72dc5d401..aa674cd6e0 100644
--- a/src/services/s3.jl
+++ b/src/services/s3.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: s3
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AbortMultipartUpload()
 
@@ -1431,7 +1431,7 @@ restore_object(Bucket, Key, args::AbstractDict{String, <:Any}; aws_config::AWSCo
 """
     SelectObjectContent()
 
-This operation filters the contents of an Amazon S3 object based on a simple structured query language (SQL) statement. In the request, along with the SQL expression, you must also specify a data serialization format (JSON, CSV, or Apache Parquet) of the object. Amazon S3 uses this format to parse object data into records, and returns only records that match the specified SQL expression. You must also specify the data serialization format for the response. For more information about Amazon S3 Select, see Selecting Content from Objects in the Amazon Simple Storage Service Developer Guide. For more information about using SQL with Amazon S3 Select, see  SQL Reference for Amazon S3 Select and S3 Glacier Select in the Amazon Simple Storage Service Developer Guide.   Permissions  You must have s3:GetObject permission for this operation. Amazon S3 Select does not support anonymous access. For more information about permissions, see Specifying Permissions in a Policy in the Amazon Simple Storage Service Developer Guide.   Object Data Formats  You can use Amazon S3 Select to query objects that have the following format properties:    CSV, JSON, and Parquet - Objects must be in CSV, JSON, or Parquet format.    UTF-8 - UTF-8 is the only encoding type Amazon S3 Select supports.    GZIP or BZIP2 - CSV and JSON files can be compressed using GZIP or BZIP2. GZIP and BZIP2 are the only compression formats that Amazon S3 Select supports for CSV and JSON files. Amazon S3 Select supports columnar compression for Parquet using GZIP or Snappy. Amazon S3 Select does not support whole-object compression for Parquet objects.    Server-side encryption - Amazon S3 Select supports querying objects that are protected with server-side encryption. For objects that are encrypted with customer-provided encryption keys (SSE-C), you must use HTTPS, and you must use the headers that are documented in the GetObject. For more information about SSE-C, see Server-Side Encryption (Using Customer-Provided Encryption Keys) in the Amazon Simple Storage Service Developer Guide. For objects that are encrypted with Amazon S3 managed encryption keys (SSE-S3) and customer master keys (CMKs) stored in AWS Key Management Service (SSE-KMS), server-side encryption is handled transparently, so you don't need to specify anything. For more information about server-side encryption, including SSE-S3 and SSE-KMS, see Protecting Data Using Server-Side Encryption in the Amazon Simple Storage Service Developer Guide.    Working with the Response Body  Given the response size is unknown, Amazon S3 Select streams the response as a series of messages and includes a Transfer-Encoding header with chunked as its value in the response. For more information, see RESTSelectObjectAppendix .   GetObject Support  The SelectObjectContent operation does not support the following GetObject functionality. For more information, see GetObject.    Range: Although you can specify a scan range for an Amazon S3 Select request (see SelectObjectContentRequest ScanRange in the request parameters), you cannot specify the range of bytes of an object to return.    GLACIER, DEEP_ARCHIVE and REDUCED_REDUNDANCY storage classes: You cannot specify the GLACIER, DEEP_ARCHIVE, or REDUCED_REDUNDANCY storage classes. For more information, about storage classes see Storage Classes in the Amazon Simple Storage Service Developer Guide.     Special Errors  For a list of special errors for this operation, see SelectObjectContentErrorCodeList   Related Resources     GetObject     GetBucketLifecycleConfiguration     PutBucketLifecycleConfiguration   
+This operation filters the contents of an Amazon S3 object based on a simple structured query language (SQL) statement. In the request, along with the SQL expression, you must also specify a data serialization format (JSON, CSV, or Apache Parquet) of the object. Amazon S3 uses this format to parse object data into records, and returns only records that match the specified SQL expression. You must also specify the data serialization format for the response. For more information about Amazon S3 Select, see Selecting Content from Objects in the Amazon Simple Storage Service Developer Guide. For more information about using SQL with Amazon S3 Select, see  SQL Reference for Amazon S3 Select and S3 Glacier Select in the Amazon Simple Storage Service Developer Guide.   Permissions  You must have s3:GetObject permission for this operation. Amazon S3 Select does not support anonymous access. For more information about permissions, see Specifying Permissions in a Policy in the Amazon Simple Storage Service Developer Guide.   Object Data Formats  You can use Amazon S3 Select to query objects that have the following format properties:    CSV, JSON, and Parquet - Objects must be in CSV, JSON, or Parquet format.    UTF-8 - UTF-8 is the only encoding type Amazon S3 Select supports.    GZIP or BZIP2 - CSV and JSON files can be compressed using GZIP or BZIP2. GZIP and BZIP2 are the only compression formats that Amazon S3 Select supports for CSV and JSON files. Amazon S3 Select supports columnar compression for Parquet using GZIP or Snappy. Amazon S3 Select does not support whole-object compression for Parquet objects.    Server-side encryption - Amazon S3 Select supports querying objects that are protected with server-side encryption. For objects that are encrypted with customer-provided encryption keys (SSE-C), you must use HTTPS, and you must use the headers that are documented in the GetObject. For more information about SSE-C, see Server-Side Encryption (Using Customer-Provided Encryption Keys) in the Amazon Simple Storage Service Developer Guide. For objects that are encrypted with Amazon S3 managed encryption keys (SSE-S3) and customer master keys (CMKs) stored in AWS Key Management Service (SSE-KMS), server-side encryption is handled transparently, so you don't need to specify anything. For more information about server-side encryption, including SSE-S3 and SSE-KMS, see Protecting Data Using Server-Side Encryption in the Amazon Simple Storage Service Developer Guide.    Working with the Response Body  Given the response size is unknown, Amazon S3 Select streams the response as a series of messages and includes a Transfer-Encoding header with chunked as its value in the response. For more information, see RESTSelectObjectAppendix .   GetObject Support  The SelectObjectContent operation does not support the following GetObject functionality. For more information, see GetObject.    Range: Although you can specify a scan range for an Amazon S3 Select request (see SelectObjectContentRequestScanRange in the request parameters), you cannot specify the range of bytes of an object to return.    GLACIER, DEEP_ARCHIVE and REDUCED_REDUNDANCY storage classes: You cannot specify the GLACIER, DEEP_ARCHIVE, or REDUCED_REDUNDANCY storage classes. For more information, about storage classes see Storage Classes in the Amazon Simple Storage Service Developer Guide.     Special Errors  For a list of special errors for this operation, see SelectObjectContentErrorCodeList   Related Resources     GetObject     GetBucketLifecycleConfiguration     PutBucketLifecycleConfiguration   
 
 # Required Parameters
 - `Bucket`: The S3 bucket.
diff --git a/src/services/s3_control.jl b/src/services/s3_control.jl
index 9cfa5d13dd..f97db16123 100644
--- a/src/services/s3_control.jl
+++ b/src/services/s3_control.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: s3_control
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateAccessPoint()
 
diff --git a/src/services/sagemaker.jl b/src/services/sagemaker.jl
index ef7d7edf6c..6f32863ef7 100644
--- a/src/services/sagemaker.jl
+++ b/src/services/sagemaker.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sagemaker
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTags()
 
@@ -83,7 +83,7 @@ Creates an Autopilot job. Find the best performing model after you run an Autopi
 
 # Optional Parameters
 - `AutoMLJobConfig`: Contains CompletionCriteria and SecurityConfig.
-- `AutoMLJobObjective`: Defines the objective of a an AutoML job. You provide a AutoMLJobObjective MetricName and Autopilot infers whether to minimize or maximize it. If a metric is not specified, the most commonly used ObjectiveMetric for problem type is automaically selected.
+- `AutoMLJobObjective`: Defines the objective of a an AutoML job. You provide a AutoMLJobObjectiveMetricName and Autopilot infers whether to minimize or maximize it. If a metric is not specified, the most commonly used ObjectiveMetric for problem type is automaically selected.
 - `GenerateCandidateDefinitionsOnly`: Generates possible candidates without training a model. A candidate is a combination of data preprocessors, algorithms, and algorithm parameter settings.
 - `ProblemType`: Defines the kind of preprocessing and algorithms intended for the candidates. Options include: BinaryClassification, MulticlassClassification, and Regression.
 - `Tags`: Each tag consists of a key and an optional value. Tag keys must be unique per resource.
@@ -357,7 +357,7 @@ create_notebook_instance(InstanceType, NotebookInstanceName, RoleArn, args::Abst
 """
     CreateNotebookInstanceLifecycleConfig()
 
-Creates a lifecycle configuration that you can associate with a notebook instance. A lifecycle configuration is a collection of shell scripts that run when you create or start a notebook instance. Each lifecycle configuration script has a limit of 16384 characters. The value of the  PATH environment variable that is available to both scripts is /sbin:bin:/usr/sbin:/usr/bin. View CloudWatch Logs for notebook instance lifecycle configurations in log group /aws/sagemaker/NotebookInstances in log stream [notebook-instance-name]/[LifecycleConfigHook]. Lifecycle configuration scripts cannot run for longer than 5 minutes. If a script runs for longer than 5 minutes, it fails and the notebook instance is not created or started. For information about notebook instance lifestyle configurations, see Step 2.1: (Optional) Customize a Notebook Instance.
+Creates a lifecycle configuration that you can associate with a notebook instance. A lifecycle configuration is a collection of shell scripts that run when you create or start a notebook instance. Each lifecycle configuration script has a limit of 16384 characters. The value of the PATH environment variable that is available to both scripts is /sbin:bin:/usr/sbin:/usr/bin. View CloudWatch Logs for notebook instance lifecycle configurations in log group /aws/sagemaker/NotebookInstances in log stream [notebook-instance-name]/[LifecycleConfigHook]. Lifecycle configuration scripts cannot run for longer than 5 minutes. If a script runs for longer than 5 minutes, it fails and the notebook instance is not created or started. For information about notebook instance lifestyle configurations, see Step 2.1: (Optional) Customize a Notebook Instance.
 
 # Required Parameters
 - `NotebookInstanceLifecycleConfigName`: The name of the lifecycle configuration.
@@ -1339,7 +1339,7 @@ Lists model compilation jobs that satisfy various filters. To create a model com
 - `NextToken`: If the result of the previous ListCompilationJobs request was truncated, the response includes a NextToken. To retrieve the next set of model compilation jobs, use the token in the next request.
 - `SortBy`: The field by which to sort results. The default is CreationTime.
 - `SortOrder`: The sort order for results. The default is Ascending.
-- `StatusEquals`: A filter that retrieves model compilation jobs with a specific DescribeCompilationJobResponse CompilationJobStatus status.
+- `StatusEquals`: A filter that retrieves model compilation jobs with a specific DescribeCompilationJobResponseCompilationJobStatus status.
 """
 
 list_compilation_jobs(; aws_config::AWSConfig=global_aws_config()) = sagemaker("ListCompilationJobs"; aws_config=aws_config)
@@ -1913,7 +1913,7 @@ stop_auto_mljob(AutoMLJobName, args::AbstractDict{String, <:Any}; aws_config::AW
 """
     StopCompilationJob()
 
-Stops a model compilation job.  To stop a job, Amazon SageMaker sends the algorithm the SIGTERM signal. This gracefully shuts the job down. If the job hasn't stopped, it sends the SIGKILL signal. When it receives a StopCompilationJob request, Amazon SageMaker changes the CompilationJobSummary CompilationJobStatus of the job to Stopping. After Amazon SageMaker stops the job, it sets the CompilationJobSummary CompilationJobStatus to Stopped. 
+Stops a model compilation job.  To stop a job, Amazon SageMaker sends the algorithm the SIGTERM signal. This gracefully shuts the job down. If the job hasn't stopped, it sends the SIGKILL signal. When it receives a StopCompilationJob request, Amazon SageMaker changes the CompilationJobSummaryCompilationJobStatus of the job to Stopping. After Amazon SageMaker stops the job, it sets the CompilationJobSummaryCompilationJobStatus to Stopped. 
 
 # Required Parameters
 - `CompilationJobName`: The name of the model compilation job to stop.
@@ -2054,7 +2054,7 @@ Deploys the new EndpointConfig specified in the request, switches to using newly
 - `EndpointName`: The name of the endpoint whose configuration you want to update.
 
 # Optional Parameters
-- `ExcludeRetainedVariantProperties`: When you are updating endpoint resources with UpdateEndpointInput RetainAllVariantProperties, whose value is set to true, ExcludeRetainedVariantProperties specifies the list of type VariantProperty to override with the values provided by EndpointConfig. If you don't specify a value for ExcludeAllVariantProperties, no variant properties are overridden. 
+- `ExcludeRetainedVariantProperties`: When you are updating endpoint resources with UpdateEndpointInputRetainAllVariantProperties, whose value is set to true, ExcludeRetainedVariantProperties specifies the list of type VariantProperty to override with the values provided by EndpointConfig. If you don't specify a value for ExcludeAllVariantProperties, no variant properties are overridden. 
 - `RetainAllVariantProperties`: When updating endpoint resources, enables or disables the retention of variant properties, such as the instance count or the variant weight. To retain the variant properties of an endpoint when updating it, set RetainAllVariantProperties to true. To use the variant properties specified in a new EndpointConfig call when updating an endpoint, set RetainAllVariantProperties to false.
 """
 
diff --git a/src/services/sagemaker_a2i_runtime.jl b/src/services/sagemaker_a2i_runtime.jl
index 6759a0a5f1..fa24510c85 100644
--- a/src/services/sagemaker_a2i_runtime.jl
+++ b/src/services/sagemaker_a2i_runtime.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sagemaker_a2i_runtime
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteHumanLoop()
 
diff --git a/src/services/sagemaker_runtime.jl b/src/services/sagemaker_runtime.jl
index 1eb85ac077..ddc12c3207 100644
--- a/src/services/sagemaker_runtime.jl
+++ b/src/services/sagemaker_runtime.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sagemaker_runtime
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     InvokeEndpoint()
 
diff --git a/src/services/savingsplans.jl b/src/services/savingsplans.jl
index 5c9f77a044..2445d0bb51 100644
--- a/src/services/savingsplans.jl
+++ b/src/services/savingsplans.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: savingsplans
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateSavingsPlan()
 
diff --git a/src/services/schemas.jl b/src/services/schemas.jl
index bb63fc2a60..17bfc39651 100644
--- a/src/services/schemas.jl
+++ b/src/services/schemas.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: schemas
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateDiscoverer()
 
diff --git a/src/services/secrets_manager.jl b/src/services/secrets_manager.jl
index e57d84d284..1d5076bc67 100644
--- a/src/services/secrets_manager.jl
+++ b/src/services/secrets_manager.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: secrets_manager
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelRotateSecret()
 
@@ -88,7 +88,7 @@ Generates a random password of the specified complexity. This operation is inten
 - `ExcludeCharacters`: A string that includes characters that should not be included in the generated password. The default is that all characters from the included sets can be used.
 - `ExcludeLowercase`: Specifies that the generated password should not include lowercase letters. The default if you do not include this switch parameter is that lowercase letters can be included.
 - `ExcludeNumbers`: Specifies that the generated password should not include digits. The default if you do not include this switch parameter is that digits can be included.
-- `ExcludePunctuation`: Specifies that the generated password should not include punctuation characters. The default if you do not include this switch parameter is that punctuation characters can be included. The following are the punctuation characters that can be included in the generated password if you don't explicitly exclude them with ExcludeCharacters or ExcludePunctuation:  ! \" #   % &amp; ' ( ) * + , - . / : ; &lt; = &gt; ? @ [   ] ^ _ ` { | } ~ 
+- `ExcludePunctuation`: Specifies that the generated password should not include punctuation characters. The default if you do not include this switch parameter is that punctuation characters can be included. The following are the punctuation characters that can be included in the generated password if you don't explicitly exclude them with ExcludeCharacters or ExcludePunctuation:  ! \" #  % &amp; ' ( ) * + , - . / : ; &lt; = &gt; ? @ [  ] ^ _ ` { | } ~ 
 - `ExcludeUppercase`: Specifies that the generated password should not include uppercase letters. The default if you do not include this switch parameter is that uppercase letters can be included.
 - `IncludeSpace`: Specifies that the generated password can include the space character. The default if you do not include this switch parameter is that the space character is not included.
 - `PasswordLength`: The desired length of the generated password. The default value if you do not include this parameter is 32 characters.
@@ -264,7 +264,7 @@ Modifies many of the details of the specified secret. If you include a ClientReq
 - `Description`: (Optional) Specifies an updated user-provided description of the secret.
 - `KmsKeyId`: (Optional) Specifies an updated ARN or alias of the AWS KMS customer master key (CMK) to be used to encrypt the protected text in new versions of this secret.  You can only use the account's default CMK to encrypt and decrypt if you call this operation using credentials from the same account that owns the secret. If the secret is in a different account, then you must create a custom CMK and provide the ARN of that CMK in this field. The user making the call must have permissions to both the secret and the CMK in their respective accounts. 
 - `SecretBinary`: (Optional) Specifies updated binary data that you want to encrypt and store in the new version of the secret. To use this parameter in the command-line tools, we recommend that you store your binary data in a file and then use the appropriate technique for your tool to pass the contents of the file as a parameter. Either SecretBinary or SecretString must have a value, but not both. They cannot both be empty. This parameter is not accessible using the Secrets Manager console.
-- `SecretString`: (Optional) Specifies updated text data that you want to encrypt and store in this new version of the secret. Either SecretBinary or SecretString must have a value, but not both. They cannot both be empty. If you create this secret by using the Secrets Manager console then Secrets Manager puts the protected secret text in only the SecretString parameter. The Secrets Manager console stores the information as a JSON structure of key/value pairs that the default Lambda rotation function knows how to parse. For storing multiple values, we recommend that you use a JSON text string argument and specify key/value pairs. For information on how to format a JSON parameter for the various command line tool environments, see Using JSON for Parameters in the AWS CLI User Guide. For example:  [{\"username\":\"bob\"},{\"password\":\"abc123xyz456\"}]  If your command-line tool or SDK requires quotation marks around the parameter, you should use single quotes to avoid confusion with the double quotes required in the JSON text. You can also 'escape' the double quote character in the embedded JSON text by prefacing each with a backslash. For example, the following string is surrounded by double-quotes. All of the embedded double quotes are escaped:  \"[{ \"username \": \"bob \"},{ \"password \": \"abc123xyz456 \"}]\" 
+- `SecretString`: (Optional) Specifies updated text data that you want to encrypt and store in this new version of the secret. Either SecretBinary or SecretString must have a value, but not both. They cannot both be empty. If you create this secret by using the Secrets Manager console then Secrets Manager puts the protected secret text in only the SecretString parameter. The Secrets Manager console stores the information as a JSON structure of key/value pairs that the default Lambda rotation function knows how to parse. For storing multiple values, we recommend that you use a JSON text string argument and specify key/value pairs. For information on how to format a JSON parameter for the various command line tool environments, see Using JSON for Parameters in the AWS CLI User Guide. For example:  [{\"username\":\"bob\"},{\"password\":\"abc123xyz456\"}]  If your command-line tool or SDK requires quotation marks around the parameter, you should use single quotes to avoid confusion with the double quotes required in the JSON text. You can also 'escape' the double quote character in the embedded JSON text by prefacing each with a backslash. For example, the following string is surrounded by double-quotes. All of the embedded double quotes are escaped:  \"[{\"username\":\"bob\"},{\"password\":\"abc123xyz456\"}]\" 
 """
 
 update_secret(SecretId; aws_config::AWSConfig=global_aws_config()) = secrets_manager("UpdateSecret", Dict{String, Any}("SecretId"=>SecretId, "ClientRequestToken"=>string(uuid4())); aws_config=aws_config)
diff --git a/src/services/securityhub.jl b/src/services/securityhub.jl
index 721240dffd..646334db21 100644
--- a/src/services/securityhub.jl
+++ b/src/services/securityhub.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: securityhub
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptInvitation()
 
diff --git a/src/services/serverlessapplicationrepository.jl b/src/services/serverlessapplicationrepository.jl
index fdf838a696..88723a8ba4 100644
--- a/src/services/serverlessapplicationrepository.jl
+++ b/src/services/serverlessapplicationrepository.jl
@@ -2,21 +2,21 @@
 using AWS
 using AWS.AWSServices: serverlessapplicationrepository
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApplication()
 
 Creates an application, optionally including an AWS SAM file to create the first application version in the same call.
 
 # Required Parameters
-- `author`: The name of the author publishing the app.Minimum length=1. Maximum length=127.Pattern \"^[a-z0-9](([a-z0-9]|-(?!-))*[a-z0-9])? \";
+- `author`: The name of the author publishing the app.Minimum length=1. Maximum length=127.Pattern \"^[a-z0-9](([a-z0-9]|-(?!-))*[a-z0-9])?\";
 - `description`: The description of the application.Minimum length=1. Maximum length=256
-- `name`: The name of the application that you want to publish.Minimum length=1. Maximum length=140Pattern: \"[a-zA-Z0-9  -]+\";
+- `name`: The name of the application that you want to publish.Minimum length=1. Maximum length=140Pattern: \"[a-zA-Z0-9-]+\";
 
 # Optional Parameters
 - `homePageUrl`: A URL with more information about the application, for example the location of your GitHub repository for the application.
-- `labels`: Labels to improve discovery of apps in search results.Minimum length=1. Maximum length=127. Maximum number of labels: 10Pattern: \"^[a-zA-Z0-9+  -_:  /@]+ \";
+- `labels`: Labels to improve discovery of apps in search results.Minimum length=1. Maximum length=127. Maximum number of labels: 10Pattern: \"^[a-zA-Z0-9+-_:/@]+\";
 - `licenseBody`: A local text file that contains the license of the app that matches the spdxLicenseID value of your application.
  The file has the format file://&lt;path>/&lt;filename>.Maximum size 5 MBYou can specify only one of licenseBody and licenseUrl; otherwise, an error results.
 - `licenseUrl`: A link to the S3 object that contains the license of the app that matches the spdxLicenseID value of your application.Maximum size 5 MBYou can specify only one of licenseBody and licenseUrl; otherwise, an error results.
@@ -108,7 +108,7 @@ Creates an AWS CloudFormation change set for the given application.
  
 - `tags`: This property corresponds to the parameter of the same name for the AWS CloudFormation CreateChangeSet
   API.
-- `templateId`: The UUID returned by CreateCloudFormationTemplate.Pattern: [0-9a-fA-F]{8} -[0-9a-fA-F]{4} -[0-9a-fA-F]{4} -[0-9a-fA-F]{4} -[0-9a-fA-F]{12}
+- `templateId`: The UUID returned by CreateCloudFormationTemplate.Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}
 """
 
 create_cloud_formation_change_set(applicationId, stackName; aws_config::AWSConfig=global_aws_config()) = serverlessapplicationrepository("POST", "/applications/$(applicationId)/changesets", Dict{String, Any}("stackName"=>stackName); aws_config=aws_config)
@@ -179,7 +179,7 @@ Gets the specified AWS CloudFormation template.
 
 # Required Parameters
 - `applicationId`: The Amazon Resource Name (ARN) of the application.
-- `templateId`: The UUID returned by CreateCloudFormationTemplate.Pattern: [0-9a-fA-F]{8} -[0-9a-fA-F]{4} -[0-9a-fA-F]{4} -[0-9a-fA-F]{4} -[0-9a-fA-F]{12}
+- `templateId`: The UUID returned by CreateCloudFormationTemplate.Pattern: [0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}
 
 """
 
@@ -272,10 +272,10 @@ Updates the specified application.
 - `applicationId`: The Amazon Resource Name (ARN) of the application.
 
 # Optional Parameters
-- `author`: The name of the author publishing the app.Minimum length=1. Maximum length=127.Pattern \"^[a-z0-9](([a-z0-9]|-(?!-))*[a-z0-9])? \";
+- `author`: The name of the author publishing the app.Minimum length=1. Maximum length=127.Pattern \"^[a-z0-9](([a-z0-9]|-(?!-))*[a-z0-9])?\";
 - `description`: The description of the application.Minimum length=1. Maximum length=256
 - `homePageUrl`: A URL with more information about the application, for example the location of your GitHub repository for the application.
-- `labels`: Labels to improve discovery of apps in search results.Minimum length=1. Maximum length=127. Maximum number of labels: 10Pattern: \"^[a-zA-Z0-9+  -_:  /@]+ \";
+- `labels`: Labels to improve discovery of apps in search results.Minimum length=1. Maximum length=127. Maximum number of labels: 10Pattern: \"^[a-zA-Z0-9+-_:/@]+\";
 - `readmeBody`: A text readme file in Markdown language that contains a more detailed description of the application and how it works.Maximum size 5 MB
 - `readmeUrl`: A link to the readme file in Markdown language that contains a more detailed description of the application and how it works.Maximum size 5 MB
 """
diff --git a/src/services/service_catalog.jl b/src/services/service_catalog.jl
index b591e67297..610ae1d50b 100644
--- a/src/services/service_catalog.jl
+++ b/src/services/service_catalog.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: service_catalog
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AcceptPortfolioShare()
 
@@ -277,7 +277,7 @@ create_provisioning_artifact(IdempotencyToken, Parameters, ProductId, args::Abst
 Creates a self-service action.
 
 # Required Parameters
-- `Definition`: The self-service action definition. Can be one of the following:  Name  The name of the AWS Systems Manager document (SSM document). For example, AWS-RestartEC2Instance. If you are using a shared SSM document, you must provide the ARN instead of the name.  Version  The AWS Systems Manager automation document version. For example, \"Version\": \"1\"   AssumeRole  The Amazon Resource Name (ARN) of the role that performs the self-service actions on your behalf. For example, \"AssumeRole\": \"arn:aws:iam::12345678910:role/ActionRole\". To reuse the provisioned product launch role, set to \"AssumeRole\": \"LAUNCH_ROLE\".  Parameters  The list of parameters in JSON format. For example: [{ \"Name \": \"InstanceId \", \"Type \": \"TARGET \"}] or [{ \"Name \": \"InstanceId \", \"Type \": \"TEXT_VALUE \"}].  
+- `Definition`: The self-service action definition. Can be one of the following:  Name  The name of the AWS Systems Manager document (SSM document). For example, AWS-RestartEC2Instance. If you are using a shared SSM document, you must provide the ARN instead of the name.  Version  The AWS Systems Manager automation document version. For example, \"Version\": \"1\"   AssumeRole  The Amazon Resource Name (ARN) of the role that performs the self-service actions on your behalf. For example, \"AssumeRole\": \"arn:aws:iam::12345678910:role/ActionRole\". To reuse the provisioned product launch role, set to \"AssumeRole\": \"LAUNCH_ROLE\".  Parameters  The list of parameters in JSON format. For example: [{\"Name\":\"InstanceId\",\"Type\":\"TARGET\"}] or [{\"Name\":\"InstanceId\",\"Type\":\"TEXT_VALUE\"}].  
 - `DefinitionType`: The service action definition type. For example, SSM_AUTOMATION.
 - `IdempotencyToken`: A unique identifier that you provide to ensure idempotency. If multiple requests differ only by the idempotency token, the same response is returned for each repeated request.
 - `Name`: The self-service action name.
diff --git a/src/services/service_quotas.jl b/src/services/service_quotas.jl
index ae9084c650..cae28af01f 100644
--- a/src/services/service_quotas.jl
+++ b/src/services/service_quotas.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: service_quotas
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateServiceQuotaTemplate()
 
diff --git a/src/services/servicediscovery.jl b/src/services/servicediscovery.jl
index 0e8fbc4365..7a132899da 100644
--- a/src/services/servicediscovery.jl
+++ b/src/services/servicediscovery.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: servicediscovery
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateHttpNamespace()
 
diff --git a/src/services/ses.jl b/src/services/ses.jl
index b326160d41..135bc9ebd2 100644
--- a/src/services/ses.jl
+++ b/src/services/ses.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ses
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CloneReceiptRuleSet()
 
diff --git a/src/services/sesv2.jl b/src/services/sesv2.jl
index ff004e1028..1e10e0fad4 100644
--- a/src/services/sesv2.jl
+++ b/src/services/sesv2.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sesv2
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateConfigurationSet()
 
diff --git a/src/services/sfn.jl b/src/services/sfn.jl
index 24c61dbeb9..d146994f02 100644
--- a/src/services/sfn.jl
+++ b/src/services/sfn.jl
@@ -2,15 +2,15 @@
 using AWS
 using AWS.AWSServices: sfn
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateActivity()
 
 Creates an activity. An activity is a task that you write in any programming language and host on any machine that has access to AWS Step Functions. Activities must poll Step Functions using the GetActivityTask API action and respond using SendTask* API actions. This function lets Step Functions know the existence of your activity and returns an identifier for use in a state machine and when polling from the activity.  This operation is eventually consistent. The results are best effort and may not reflect very recent updates and changes.    CreateActivity is an idempotent API. Subsequent requests won’t create a duplicate resource if it was already created. CreateActivity's idempotency check is based on the activity name. If a following request has different tags values, Step Functions will ignore these differences and treat it as an idempotent request of the previous. In this case, tags will not be updated, even if they are different. 
 
 # Required Parameters
-- `name`: The name of the activity to create. This name must be unique for your AWS account and region for 90 days. For more information, see  Limits Related to State Machine Executions in the AWS Step Functions Developer Guide. A name must not contain:   white space   brackets &lt; &gt; { } [ ]    wildcard characters ? *    special characters \" # %   ^ | ~ `   &amp; , ; : /    control characters (U+0000-001F, U+007F-009F)   To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.
+- `name`: The name of the activity to create. This name must be unique for your AWS account and region for 90 days. For more information, see  Limits Related to State Machine Executions in the AWS Step Functions Developer Guide. A name must not contain:   white space   brackets &lt; &gt; { } [ ]    wildcard characters ? *    special characters \" # %  ^ | ~ `  &amp; , ; : /    control characters (U+0000-001F, U+007F-009F)   To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.
 
 # Optional Parameters
 - `tags`: The list of tags to add to a resource. An array of key-value pairs. For more information, see Using Cost Allocation Tags in the AWS Billing and Cost Management User Guide, and Controlling Access Using IAM Tags. Tags may only contain Unicode letters, digits, white space, or these symbols: _ . : / = + - @.
@@ -26,7 +26,7 @@ Creates a state machine. A state machine consists of a collection of states that
 
 # Required Parameters
 - `definition`: The Amazon States Language definition of the state machine. See Amazon States Language.
-- `name`: The name of the state machine.  A name must not contain:   white space   brackets &lt; &gt; { } [ ]    wildcard characters ? *    special characters \" # %   ^ | ~ `   &amp; , ; : /    control characters (U+0000-001F, U+007F-009F)   To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.
+- `name`: The name of the state machine.  A name must not contain:   white space   brackets &lt; &gt; { } [ ]    wildcard characters ? *    special characters \" # %  ^ | ~ `  &amp; , ; : /    control characters (U+0000-001F, U+007F-009F)   To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.
 - `roleArn`: The Amazon Resource Name (ARN) of the IAM role to use for this state machine.
 
 # Optional Parameters
@@ -210,7 +210,7 @@ list_tags_for_resource(resourceArn, args::AbstractDict{String, <:Any}; aws_confi
 Used by activity workers and task states using the callback pattern to report that the task identified by the taskToken failed.
 
 # Required Parameters
-- `taskToken`: The token that represents this task. Task tokens are generated by Step Functions when tasks are assigned to a worker, or in the context object when a workflow enters a task state. See GetActivityTaskOutput taskToken.
+- `taskToken`: The token that represents this task. Task tokens are generated by Step Functions when tasks are assigned to a worker, or in the context object when a workflow enters a task state. See GetActivityTaskOutputtaskToken.
 
 # Optional Parameters
 - `cause`: A more detailed explanation of the cause of the failure.
@@ -226,7 +226,7 @@ send_task_failure(taskToken, args::AbstractDict{String, <:Any}; aws_config::AWSC
 Used by activity workers and task states using the callback pattern to report to Step Functions that the task represented by the specified taskToken is still making progress. This action resets the Heartbeat clock. The Heartbeat threshold is specified in the state machine's Amazon States Language definition (HeartbeatSeconds). This action does not in itself create an event in the execution history. However, if the task times out, the execution history contains an ActivityTimedOut entry for activities, or a TaskTimedOut entry for for tasks using the job run or callback pattern.  The Timeout of a task, defined in the state machine's Amazon States Language definition, is its maximum allowed duration, regardless of the number of SendTaskHeartbeat requests received. Use HeartbeatSeconds to configure the timeout interval for heartbeats. 
 
 # Required Parameters
-- `taskToken`: The token that represents this task. Task tokens are generated by Step Functions when tasks are assigned to a worker, or in the context object when a workflow enters a task state. See GetActivityTaskOutput taskToken.
+- `taskToken`: The token that represents this task. Task tokens are generated by Step Functions when tasks are assigned to a worker, or in the context object when a workflow enters a task state. See GetActivityTaskOutputtaskToken.
 
 """
 
@@ -240,7 +240,7 @@ Used by activity workers and task states using the callback pattern to report th
 
 # Required Parameters
 - `output`: The JSON output of the task.
-- `taskToken`: The token that represents this task. Task tokens are generated by Step Functions when tasks are assigned to a worker, or in the context object when a workflow enters a task state. See GetActivityTaskOutput taskToken.
+- `taskToken`: The token that represents this task. Task tokens are generated by Step Functions when tasks are assigned to a worker, or in the context object when a workflow enters a task state. See GetActivityTaskOutputtaskToken.
 
 """
 
@@ -256,8 +256,8 @@ Starts a state machine execution.   StartExecution is idempotent. If StartExecut
 - `stateMachineArn`: The Amazon Resource Name (ARN) of the state machine to execute.
 
 # Optional Parameters
-- `input`: The string that contains the JSON input data for the execution, for example:  \"input\": \"{ \"first_name \" :  \"test \"}\"   If you don't include any JSON input data, you still must include the two braces, for example: \"input\": \"{}\"  
-- `name`: The name of the execution. This name must be unique for your AWS account, region, and state machine for 90 days. For more information, see  Limits Related to State Machine Executions in the AWS Step Functions Developer Guide. A name must not contain:   white space   brackets &lt; &gt; { } [ ]    wildcard characters ? *    special characters \" # %   ^ | ~ `   &amp; , ; : /    control characters (U+0000-001F, U+007F-009F)   To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.
+- `input`: The string that contains the JSON input data for the execution, for example:  \"input\": \"{\"first_name\" : \"test\"}\"   If you don't include any JSON input data, you still must include the two braces, for example: \"input\": \"{}\"  
+- `name`: The name of the execution. This name must be unique for your AWS account, region, and state machine for 90 days. For more information, see  Limits Related to State Machine Executions in the AWS Step Functions Developer Guide. A name must not contain:   white space   brackets &lt; &gt; { } [ ]    wildcard characters ? *    special characters \" # %  ^ | ~ `  &amp; , ; : /    control characters (U+0000-001F, U+007F-009F)   To enable logging with CloudWatch Logs, the name should only contain 0-9, A-Z, a-z, - and _.
 """
 
 start_execution(stateMachineArn; aws_config::AWSConfig=global_aws_config()) = sfn("StartExecution", Dict{String, Any}("stateMachineArn"=>stateMachineArn); aws_config=aws_config)
diff --git a/src/services/shield.jl b/src/services/shield.jl
index 831d4b2add..c0c4f1190d 100644
--- a/src/services/shield.jl
+++ b/src/services/shield.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: shield
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateDRTLogBucket()
 
diff --git a/src/services/signer.jl b/src/services/signer.jl
index 3a4510b435..d65306115b 100644
--- a/src/services/signer.jl
+++ b/src/services/signer.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: signer
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelSigningProfile()
 
diff --git a/src/services/simpledb.jl b/src/services/simpledb.jl
index dbe30a5062..fb448462d1 100644
--- a/src/services/simpledb.jl
+++ b/src/services/simpledb.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: simpledb
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchDeleteAttributes()
 
diff --git a/src/services/sms.jl b/src/services/sms.jl
index 87b1351723..af85bed246 100644
--- a/src/services/sms.jl
+++ b/src/services/sms.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sms
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateApp()
 
diff --git a/src/services/snowball.jl b/src/services/snowball.jl
index aaf0cfd965..ce98286106 100644
--- a/src/services/snowball.jl
+++ b/src/services/snowball.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: snowball
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CancelCluster()
 
diff --git a/src/services/sns.jl b/src/services/sns.jl
index b613045060..e0c811f9bb 100644
--- a/src/services/sns.jl
+++ b/src/services/sns.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sns
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddPermission()
 
diff --git a/src/services/sqs.jl b/src/services/sqs.jl
index 01e59425c4..5fd13be1ba 100644
--- a/src/services/sqs.jl
+++ b/src/services/sqs.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sqs
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddPermission()
 
diff --git a/src/services/ssm.jl b/src/services/ssm.jl
index f7f11adbc0..5081b5cfe5 100644
--- a/src/services/ssm.jl
+++ b/src/services/ssm.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: ssm
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddTagsToResource()
 
@@ -425,7 +425,7 @@ Describes the association for the specified target or instance. If you created t
 
 # Optional Parameters
 - `AssociationId`: The association ID for which you want information.
-- `AssociationVersion`: Specify the association version to retrieve. To view the latest version, either specify  LATEST for this parameter, or omit this parameter. To view a list of all associations for an instance, use ListAssociations. To get a list of versions for a specific association, use ListAssociationVersions. 
+- `AssociationVersion`: Specify the association version to retrieve. To view the latest version, either specify LATEST for this parameter, or omit this parameter. To view a list of all associations for an instance, use ListAssociations. To get a list of versions for a specific association, use ListAssociationVersions. 
 - `InstanceId`: The instance ID.
 - `Name`: The name of the Systems Manager document.
 """
@@ -867,7 +867,7 @@ describe_patch_group_state(PatchGroup, args::AbstractDict{String, <:Any}; aws_co
 Lists all patch groups that have been registered with patch baselines.
 
 # Optional Parameters
-- `Filters`: One or more filters. Use a filter to return a more specific list of results. For DescribePatchGroups,valid filter keys include the following:    NAME_PREFIX: The name of the patch group. Wildcards (*) are accepted.    OPERATING_SYSTEM: The supported operating system type to return results for. For valid operating system values, see GetDefaultPatchBaselineRequest OperatingSystem in CreatePatchBaseline. Examples:    --filters Key=NAME_PREFIX,Values=MyPatchGroup*     --filters Key=OPERATING_SYSTEM,Values=AMAZON_LINUX_2     
+- `Filters`: One or more filters. Use a filter to return a more specific list of results. For DescribePatchGroups,valid filter keys include the following:    NAME_PREFIX: The name of the patch group. Wildcards (*) are accepted.    OPERATING_SYSTEM: The supported operating system type to return results for. For valid operating system values, see GetDefaultPatchBaselineRequestOperatingSystem in CreatePatchBaseline. Examples:    --filters Key=NAME_PREFIX,Values=MyPatchGroup*     --filters Key=OPERATING_SYSTEM,Values=AMAZON_LINUX_2     
 - `MaxResults`: The maximum number of patch groups to return (per page).
 - `NextToken`: The token for the next set of items to return. (You received this token from a previous call.)
 """
@@ -1510,7 +1510,7 @@ Add a parameter to the system.
 - `Value`: The parameter value that you want to add to the system. Standard parameters have a value limit of 4 KB. Advanced parameters have a value limit of 8 KB.  Parameters can't be referenced or nested in the values of other parameters. You can't include {{}} or {{ssm:parameter-name}} in a parameter value. 
 
 # Optional Parameters
-- `AllowedPattern`: A regular expression used to validate the parameter value. For example, for String types with values restricted to numbers, you can specify the following: AllowedPattern=^ d+  
+- `AllowedPattern`: A regular expression used to validate the parameter value. For example, for String types with values restricted to numbers, you can specify the following: AllowedPattern=^d+ 
 - `DataType`: The data type for a String parameter. Supported data types include plain text and Amazon Machine Image IDs.  The following data type values are supported.     text     aws:ec2:image    When you create a String parameter and specify aws:ec2:image, Systems Manager validates the parameter value is in the required format, such as ami-12345abcdeEXAMPLE, and that the specified AMI is available in your AWS account. For more information, see Native parameter support for Amazon Machine Image IDs in the AWS Systems Manager User Guide.
 - `Description`: Information about the parameter that you want to add to the system. Optional but recommended.  Do not enter personally identifiable information in this field. 
 - `KeyId`: The KMS Key ID that you want to use to encrypt a parameter. Either the default AWS Key Management Service (AWS KMS) key automatically assigned to your AWS account or a custom key. Required for parameters that use the SecureString data type. If you don't specify a key ID, the system uses the default key associated with your AWS account.   To use your default AWS KMS key, choose the SecureString data type, and do not specify the Key ID when you create the parameter. The system automatically populates Key ID with your default KMS key.   To use a custom KMS key, choose the SecureString data type with the Key ID parameter.  
@@ -1668,7 +1668,7 @@ Runs commands on one or more managed instances.
 - `Comment`: User-specified information about the command, such as a brief description of what the command should do.
 - `DocumentHash`: The Sha256 or Sha1 hash created by the system when the document was created.   Sha1 hashes have been deprecated. 
 - `DocumentHashType`: Sha256 or Sha1.  Sha1 hashes have been deprecated. 
-- `DocumentVersion`: The SSM document version to use in the request. You can specify  DEFAULT,  LATEST, or a specific version number. If you run commands by using the AWS CLI, then you must escape the first two options by using a backslash. If you specify a version number, then you don't need to use the backslash. For example: --document-version \"  DEFAULT\" --document-version \"  LATEST\" --document-version \"3\"
+- `DocumentVersion`: The SSM document version to use in the request. You can specify DEFAULT, LATEST, or a specific version number. If you run commands by using the AWS CLI, then you must escape the first two options by using a backslash. If you specify a version number, then you don't need to use the backslash. For example: --document-version \"DEFAULT\" --document-version \"LATEST\" --document-version \"3\"
 - `InstanceIds`: The IDs of the instances where the command should run. Specifying instance IDs is most useful when you are targeting a limited number of instances, though you can specify up to 50 IDs. To target a larger number of instances, or if you prefer not to list individual instance IDs, we recommend using the Targets option instead. Using Targets, which accepts tag key-value pairs to identify the instances to send commands to, you can a send command to tens, hundreds, or thousands of instances at once. For more information about how to use targets, see Using targets and rate controls to send commands to a fleet in the AWS Systems Manager User Guide.
 - `MaxConcurrency`: (Optional) The maximum number of instances that are allowed to run the command at the same time. You can specify a number such as 10 or a percentage such as 10%. The default value is 50. For more information about how to use MaxConcurrency, see Using concurrency controls in the AWS Systems Manager User Guide.
 - `MaxErrors`: The maximum number of errors allowed without the command failing. When the command fails one more time beyond the value of MaxErrors, the systems stops sending the command to additional targets. You can specify a number like 10 or a percentage like 10%. The default value is 0. For more information about how to use MaxErrors, see Using error controls in the AWS Systems Manager User Guide.
@@ -1778,7 +1778,7 @@ Updates an association. You can update the association name and version, the doc
 # Optional Parameters
 - `ApplyOnlyAtCronInterval`: By default, when you update an association, the system runs it immediately after it is updated and then according to the schedule you specified. Specify this option if you don't want an association to run immediately after you update it. Also, if you specified this option when you created the association, you can reset it. To do so, specify the no-apply-only-at-cron-interval parameter when you update the association from the command line. This parameter forces the association to run immediately after updating it and according to the interval specified.
 - `AssociationName`: The name of the association that you want to update.
-- `AssociationVersion`: This parameter is provided for concurrency control purposes. You must specify the latest association version in the service. If you want to ensure that this request succeeds, either specify  LATEST, or omit this parameter.
+- `AssociationVersion`: This parameter is provided for concurrency control purposes. You must specify the latest association version in the service. If you want to ensure that this request succeeds, either specify LATEST, or omit this parameter.
 - `AutomationTargetParameterName`: Specify the target for the association. This target is required for associations that use an Automation document and target resources by using rate controls.
 - `ComplianceSeverity`: The severity level to assign to the association.
 - `DocumentVersion`: The document version you want update for the association. 
@@ -1822,7 +1822,7 @@ Updates one or more values for an SSM document.
 # Optional Parameters
 - `Attachments`: A list of key and value pairs that describe attachments to a version of a document.
 - `DocumentFormat`: Specify the document format for the new document version. Systems Manager supports JSON and YAML documents. JSON is the default format.
-- `DocumentVersion`: (Required) The latest version of the document that you want to update. The latest document version can be specified using the  LATEST variable or by the version number. Updating a previous version of a document is not supported.
+- `DocumentVersion`: (Required) The latest version of the document that you want to update. The latest document version can be specified using the LATEST variable or by the version number. Updating a previous version of a document is not supported.
 - `TargetType`: Specify a new target type for the document.
 - `VersionName`: An optional field specifying the version of the artifact you are updating with the document. For example, \"Release 12, Update 6\". This value is unique across all versions of a document, and cannot be changed.
 """
diff --git a/src/services/sso.jl b/src/services/sso.jl
index dfd93a45e3..29ceeb7abd 100644
--- a/src/services/sso.jl
+++ b/src/services/sso.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sso
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GetRoleCredentials()
 
diff --git a/src/services/sso_oidc.jl b/src/services/sso_oidc.jl
index 5c57a8968e..85ca711e86 100644
--- a/src/services/sso_oidc.jl
+++ b/src/services/sso_oidc.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sso_oidc
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateToken()
 
diff --git a/src/services/storage_gateway.jl b/src/services/storage_gateway.jl
index d88cd218ea..15f3a8aa63 100644
--- a/src/services/storage_gateway.jl
+++ b/src/services/storage_gateway.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: storage_gateway
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     ActivateGateway()
 
@@ -208,7 +208,7 @@ Creates a Server Message Block (SMB) file share on an existing file gateway. In
 - `Role`: The ARN of the AWS Identity and Access Management (IAM) role that a file gateway assumes when it accesses the underlying storage.
 
 # Optional Parameters
-- `AdminUserList`: A list of users or groups in the Active Directory that will be granted administrator privileges on the file share. These users can do all file operations as the super-user. Acceptable formats include: DOMAIN User1, user1, @group1, and @DOMAIN group1.  Use this option very carefully, because any user in this list can do anything they like on the file share, regardless of file permissions. 
+- `AdminUserList`: A list of users or groups in the Active Directory that will be granted administrator privileges on the file share. These users can do all file operations as the super-user. Acceptable formats include: DOMAINUser1, user1, @group1, and @DOMAINgroup1.  Use this option very carefully, because any user in this list can do anything they like on the file share, regardless of file permissions. 
 - `AuditDestinationARN`: The Amazon Resource Name (ARN) of the storage used for the audit logs.
 - `Authentication`: The authentication method that users use to access the file share. The default is ActiveDirectory. Valid Values: ActiveDirectory | GuestAccess 
 - `CacheAttributes`: Refresh cache information.
@@ -216,7 +216,7 @@ Creates a Server Message Block (SMB) file share on an existing file gateway. In
 - `DefaultStorageClass`: The default storage class for objects put into an Amazon S3 bucket by the file gateway. The default value is S3_INTELLIGENT_TIERING. Optional. Valid Values: S3_STANDARD | S3_INTELLIGENT_TIERING | S3_STANDARD_IA | S3_ONEZONE_IA 
 - `FileShareName`: The name of the file share. Optional.   FileShareName must be set if an S3 prefix name is set in LocationARN. 
 - `GuessMIMETypeEnabled`: A value that enables guessing of the MIME type for uploaded objects based on file extensions. Set this value to true to enable MIME type guessing, otherwise set to false. The default value is true. Valid Values: true | false 
-- `InvalidUserList`: A list of users or groups in the Active Directory that are not allowed to access the file share. A group must be prefixed with the @ character. Acceptable formats include: DOMAIN User1, user1, @group1, and @DOMAIN group1. Can only be set if Authentication is set to ActiveDirectory.
+- `InvalidUserList`: A list of users or groups in the Active Directory that are not allowed to access the file share. A group must be prefixed with the @ character. Acceptable formats include: DOMAINUser1, user1, @group1, and @DOMAINgroup1. Can only be set if Authentication is set to ActiveDirectory.
 - `KMSEncrypted`: Set to true to use Amazon S3 server-side encryption with your own AWS KMS key, or false to use a key managed by Amazon S3. Optional. Valid Values: true | false 
 - `KMSKey`: The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) used for Amazon S3 server-side encryption. Storage Gateway does not support asymmetric CMKs. This value can only be set when KMSEncrypted is true. Optional.
 - `ObjectACL`: A value that sets the access control list (ACL) permission for objects in the S3 bucket that a file gateway puts objects into. The default value is private.
@@ -224,7 +224,7 @@ Creates a Server Message Block (SMB) file share on an existing file gateway. In
 - `RequesterPays`: A value that sets who pays the cost of the request and the cost associated with data download from the S3 bucket. If this value is set to true, the requester pays the costs; otherwise, the S3 bucket owner pays. However, the S3 bucket owner always pays the cost of storing data.   RequesterPays is a configuration for the S3 bucket that backs the file share, so make sure that the configuration on the file share is the same as the S3 bucket configuration.  Valid Values: true | false 
 - `SMBACLEnabled`: Set this value to true to enable access control list (ACL) on the SMB file share. Set it to false to map file and directory permissions to the POSIX permissions. For more information, see Using Microsoft Windows ACLs to control access to an SMB file share in the AWS Storage Gateway User Guide. Valid Values: true | false 
 - `Tags`: A list of up to 50 tags that can be assigned to the NFS file share. Each tag is a key-value pair.  Valid characters for key and value are letters, spaces, and numbers representable in UTF-8 format, and the following special characters: + - = . _ : / @. The maximum length of a tag's key is 128 characters, and the maximum length for a tag's value is 256. 
-- `ValidUserList`: A list of users or groups in the Active Directory that are allowed to access the file  share. A group must be prefixed with the @ character. Acceptable formats include: DOMAIN User1, user1, @group1, and @DOMAIN group1. Can only be set if Authentication is set to ActiveDirectory.
+- `ValidUserList`: A list of users or groups in the Active Directory that are allowed to access the file  share. A group must be prefixed with the @ character. Acceptable formats include: DOMAINUser1, user1, @group1, and @DOMAINgroup1. Can only be set if Authentication is set to ActiveDirectory.
 """
 
 create_smbfile_share(ClientToken, GatewayARN, LocationARN, Role; aws_config::AWSConfig=global_aws_config()) = storage_gateway("CreateSMBFileShare", Dict{String, Any}("ClientToken"=>ClientToken, "GatewayARN"=>GatewayARN, "LocationARN"=>LocationARN, "Role"=>Role); aws_config=aws_config)
@@ -1196,21 +1196,21 @@ Updates a Server Message Block (SMB) file share.  To leave a file share field un
 - `FileShareARN`: The Amazon Resource Name (ARN) of the SMB file share that you want to update.
 
 # Optional Parameters
-- `AdminUserList`: A list of users or groups in the Active Directory that have administrator rights to the file share. A group must be prefixed with the @ character. Acceptable formats include: DOMAIN User1, user1, @group1, and @DOMAIN group1. Can only be set if Authentication is set to ActiveDirectory.
+- `AdminUserList`: A list of users or groups in the Active Directory that have administrator rights to the file share. A group must be prefixed with the @ character. Acceptable formats include: DOMAINUser1, user1, @group1, and @DOMAINgroup1. Can only be set if Authentication is set to ActiveDirectory.
 - `AuditDestinationARN`: The Amazon Resource Name (ARN) of the storage used for the audit logs.
 - `CacheAttributes`: Refresh cache information.
 - `CaseSensitivity`: The case of an object name in an Amazon S3 bucket. For ClientSpecified, the client determines the case sensitivity. For CaseSensitive, the gateway determines the case sensitivity. The default value is ClientSpecified.
 - `DefaultStorageClass`: The default storage class for objects put into an Amazon S3 bucket by the file gateway. The default value is S3_INTELLIGENT_TIERING. Optional. Valid Values: S3_STANDARD | S3_INTELLIGENT_TIERING | S3_STANDARD_IA | S3_ONEZONE_IA 
 - `FileShareName`: The name of the file share. Optional.   FileShareName must be set if an S3 prefix name is set in LocationARN. 
 - `GuessMIMETypeEnabled`: A value that enables guessing of the MIME type for uploaded objects based on file extensions. Set this value to true to enable MIME type guessing, otherwise set to false. The default value is true. Valid Values: true | false 
-- `InvalidUserList`: A list of users or groups in the Active Directory that are not allowed to access the file share. A group must be prefixed with the @ character. Acceptable formats include: DOMAIN User1, user1, @group1, and @DOMAIN group1. Can only be set if Authentication is set to ActiveDirectory.
+- `InvalidUserList`: A list of users or groups in the Active Directory that are not allowed to access the file share. A group must be prefixed with the @ character. Acceptable formats include: DOMAINUser1, user1, @group1, and @DOMAINgroup1. Can only be set if Authentication is set to ActiveDirectory.
 - `KMSEncrypted`: Set to true to use Amazon S3 server-side encryption with your own AWS KMS key, or false to use a key managed by Amazon S3. Optional. Valid Values: true | false 
 - `KMSKey`: The Amazon Resource Name (ARN) of a symmetric customer master key (CMK) used for Amazon S3 server-side encryption. Storage Gateway does not support asymmetric CMKs. This value can only be set when KMSEncrypted is true. Optional.
 - `ObjectACL`: A value that sets the access control list (ACL) permission for objects in the S3 bucket that a file gateway puts objects into. The default value is private.
 - `ReadOnly`: A value that sets the write status of a file share. Set this value to true to set write status to read-only, otherwise set to false. Valid Values: true | false 
 - `RequesterPays`: A value that sets who pays the cost of the request and the cost associated with data download from the S3 bucket. If this value is set to true, the requester pays the costs; otherwise, the S3 bucket owner pays. However, the S3 bucket owner always pays the cost of storing data.   RequesterPays is a configuration for the S3 bucket that backs the file share, so make sure that the configuration on the file share is the same as the S3 bucket configuration.  Valid Values: true | false 
 - `SMBACLEnabled`: Set this value to true to enable access control list (ACL) on the SMB file share. Set it to false to map file and directory permissions to the POSIX permissions. For more information, see Using Microsoft Windows ACLs to control access to an SMB file share in the AWS Storage Gateway User Guide. Valid Values: true | false 
-- `ValidUserList`: A list of users or groups in the Active Directory that are allowed to access the file share. A group must be prefixed with the @ character. Acceptable formats include: DOMAIN User1, user1, @group1, and @DOMAIN group1. Can only be set if Authentication is set to ActiveDirectory.
+- `ValidUserList`: A list of users or groups in the Active Directory that are allowed to access the file share. A group must be prefixed with the @ character. Acceptable formats include: DOMAINUser1, user1, @group1, and @DOMAINgroup1. Can only be set if Authentication is set to ActiveDirectory.
 """
 
 update_smbfile_share(FileShareARN; aws_config::AWSConfig=global_aws_config()) = storage_gateway("UpdateSMBFileShare", Dict{String, Any}("FileShareARN"=>FileShareARN); aws_config=aws_config)
diff --git a/src/services/sts.jl b/src/services/sts.jl
index cf148339c4..329a16606f 100644
--- a/src/services/sts.jl
+++ b/src/services/sts.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: sts
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssumeRole()
 
@@ -16,7 +16,7 @@ Returns a set of temporary security credentials that you can use to access AWS r
 # Optional Parameters
 - `DurationSeconds`: The duration, in seconds, of the role session. The value can range from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. If you specify a value higher than this setting, the operation fails. For example, if you specify a session duration of 12 hours, but your administrator set the maximum session duration to 6 hours, your operation fails. To learn how to view the maximum value for your role, see View the Maximum Session Duration Setting for a Role in the IAM User Guide. By default, the value is set to 3600 seconds.   The DurationSeconds parameter is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a SessionDuration parameter that specifies the maximum length of the console session. For more information, see Creating a URL that Enables Federated Users to Access the AWS Management Console in the IAM User Guide. 
 - `ExternalId`: A unique identifier that might be required when you assume a role in another account. If the administrator of the account to which the role belongs provided you with an external ID, then provide that value in the ExternalId parameter. This value can be any string, such as a passphrase or account number. A cross-account role is usually set up to trust everyone in an account. Therefore, the administrator of the trusting account might send an external ID to the administrator of the trusted account. That way, only someone with the ID can assume the role, rather than everyone in the account. For more information about the external ID, see How to Use an External ID When Granting Access to Your AWS Resources to a Third Party in the IAM User Guide. The regex used to validate this parameter is a string of characters consisting of upper- and lower-case alphanumeric characters with no spaces. You can also include underscores or any of the following characters: =,.@:/-
-- `Policy`: An IAM policy in JSON format that you want to use as an inline session policy. This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list ( u0020 through  u00FF). It can also include the tab ( u0009), linefeed ( u000A), and carriage return ( u000D) characters.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
+- `Policy`: An IAM policy in JSON format that you want to use as an inline session policy. This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (u0020 through u00FF). It can also include the tab (u0009), linefeed (u000A), and carriage return (u000D) characters.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
 - `PolicyArns`: The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role. This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies can't exceed 2,048 characters. For more information about ARNs, see Amazon Resource Names (ARNs) and AWS Service Namespaces in the AWS General Reference.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.   Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.
 - `SerialNumber`: The identification number of the MFA device that is associated with the user who is making the AssumeRole call. Specify this value if the trust policy of the role being assumed includes a condition that requires MFA authentication. The value is either the serial number for a hardware device (such as GAHT12345678) or an Amazon Resource Name (ARN) for a virtual device (such as arn:aws:iam::123456789012:mfa/user). The regex used to validate this parameter is a string of characters consisting of upper- and lower-case alphanumeric characters with no spaces. You can also include underscores or any of the following characters: =,.@-
 - `Tags`: A list of session tags that you want to pass. Each session tag consists of a key name and an associated value. For more information about session tags, see Tagging AWS STS Sessions in the IAM User Guide. This parameter is optional. You can pass up to 50 session tags. The plain text session tag keys can’t exceed 128 characters, and the values can’t exceed 256 characters. For these and additional limits, see IAM and STS Character Limits in the IAM User Guide.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.   You can pass a session tag with the same key as a tag that is already attached to the role. When you do, session tags override a role tag with the same key.  Tag key–value pairs are not case sensitive, but case is preserved. This means that you cannot have separate Department and department tag keys. Assume that the role has the Department=Marketing tag and you pass the department=engineering session tag. Department and department are not saved as separate tags, and the session tag passed in the request takes precedence over the role tag. Additionally, if you used temporary credentials to perform this operation, the new session inherits any transitive session tags from the calling session. If you pass a session tag with the same key as an inherited tag, the operation fails. To view the inherited tags for a session, see the AWS CloudTrail logs. For more information, see Viewing Session Tags in CloudTrail in the IAM User Guide.
@@ -39,7 +39,7 @@ Returns a set of temporary security credentials for users who have been authenti
 
 # Optional Parameters
 - `DurationSeconds`: The duration, in seconds, of the role session. Your role session lasts for the duration that you specify for the DurationSeconds parameter, or until the time specified in the SAML authentication response's SessionNotOnOrAfter value, whichever is shorter. You can provide a DurationSeconds value from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. If you specify a value higher than this setting, the operation fails. For example, if you specify a session duration of 12 hours, but your administrator set the maximum session duration to 6 hours, your operation fails. To learn how to view the maximum value for your role, see View the Maximum Session Duration Setting for a Role in the IAM User Guide. By default, the value is set to 3600 seconds.   The DurationSeconds parameter is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a SessionDuration parameter that specifies the maximum length of the console session. For more information, see Creating a URL that Enables Federated Users to Access the AWS Management Console in the IAM User Guide. 
-- `Policy`: An IAM policy in JSON format that you want to use as an inline session policy. This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.  The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list ( u0020 through  u00FF). It can also include the tab ( u0009), linefeed ( u000A), and carriage return ( u000D) characters.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
+- `Policy`: An IAM policy in JSON format that you want to use as an inline session policy. This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.  The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (u0020 through u00FF). It can also include the tab (u0009), linefeed (u000A), and carriage return (u000D) characters.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
 - `PolicyArns`: The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role. This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies can't exceed 2,048 characters. For more information about ARNs, see Amazon Resource Names (ARNs) and AWS Service Namespaces in the AWS General Reference.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.   Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.
 """
 
@@ -58,7 +58,7 @@ Returns a set of temporary security credentials for users who have been authenti
 
 # Optional Parameters
 - `DurationSeconds`: The duration, in seconds, of the role session. The value can range from 900 seconds (15 minutes) up to the maximum session duration setting for the role. This setting can have a value from 1 hour to 12 hours. If you specify a value higher than this setting, the operation fails. For example, if you specify a session duration of 12 hours, but your administrator set the maximum session duration to 6 hours, your operation fails. To learn how to view the maximum value for your role, see View the Maximum Session Duration Setting for a Role in the IAM User Guide. By default, the value is set to 3600 seconds.   The DurationSeconds parameter is separate from the duration of a console session that you might request using the returned credentials. The request to the federation endpoint for a console sign-in token takes a SessionDuration parameter that specifies the maximum length of the console session. For more information, see Creating a URL that Enables Federated Users to Access the AWS Management Console in the IAM User Guide. 
-- `Policy`: An IAM policy in JSON format that you want to use as an inline session policy. This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list ( u0020 through  u00FF). It can also include the tab ( u0009), linefeed ( u000A), and carriage return ( u000D) characters.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
+- `Policy`: An IAM policy in JSON format that you want to use as an inline session policy. This parameter is optional. Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (u0020 through u00FF). It can also include the tab (u0009), linefeed (u000A), and carriage return (u000D) characters.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
 - `PolicyArns`: The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as managed session policies. The policies must exist in the same account as the role. This parameter is optional. You can provide up to 10 managed policy ARNs. However, the plain text that you use for both inline and managed session policies can't exceed 2,048 characters. For more information about ARNs, see Amazon Resource Names (ARNs) and AWS Service Namespaces in the AWS General Reference.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.   Passing policies to this operation returns new temporary credentials. The resulting session's permissions are the intersection of the role's identity-based policy and the session policies. You can use the role's temporary credentials in subsequent AWS API calls to access resources in the account that owns the role. You cannot use session policies to grant more permissions than those allowed by the identity-based policy of the role that is being assumed. For more information, see Session Policies in the IAM User Guide.
 - `ProviderId`: The fully qualified host component of the domain name of the identity provider. Specify this value only for OAuth 2.0 access tokens. Currently www.amazon.com and graph.facebook.com are the only supported identity providers for OAuth 2.0 access tokens. Do not include URL schemes and port numbers. Do not specify this value for OpenID Connect ID tokens.
 """
@@ -112,7 +112,7 @@ Returns a set of temporary security credentials (consisting of an access key ID,
 
 # Optional Parameters
 - `DurationSeconds`: The duration, in seconds, that the session should last. Acceptable durations for federation sessions range from 900 seconds (15 minutes) to 129,600 seconds (36 hours), with 43,200 seconds (12 hours) as the default. Sessions obtained using AWS account root user credentials are restricted to a maximum of 3,600 seconds (one hour). If the specified duration is longer than one hour, the session obtained by using root user credentials defaults to one hour.
-- `Policy`: An IAM policy in JSON format that you want to use as an inline session policy. You must pass an inline or managed session policy to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. This parameter is optional. However, if you do not pass any session policies, then the resulting federated user session has no permissions. When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see Session Policies in the IAM User Guide. The resulting credentials can be used to access a resource that has a resource-based policy. If that policy specifically references the federated user session in the Principal element of the policy, the session has the permissions allowed by the policy. These permissions are granted in addition to the permissions that are granted by the session policies. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list ( u0020 through  u00FF). It can also include the tab ( u0009), linefeed ( u000A), and carriage return ( u000D) characters.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
+- `Policy`: An IAM policy in JSON format that you want to use as an inline session policy. You must pass an inline or managed session policy to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. This parameter is optional. However, if you do not pass any session policies, then the resulting federated user session has no permissions. When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see Session Policies in the IAM User Guide. The resulting credentials can be used to access a resource that has a resource-based policy. If that policy specifically references the federated user session in the Principal element of the policy, the session has the permissions allowed by the policy. These permissions are granted in addition to the permissions that are granted by the session policies. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. The JSON policy characters can be any ASCII character from the space character to the end of the valid character list (u0020 through u00FF). It can also include the tab (u0009), linefeed (u000A), and carriage return (u000D) characters.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
 - `PolicyArns`: The Amazon Resource Names (ARNs) of the IAM managed policies that you want to use as a managed session policy. The policies must exist in the same account as the IAM user that is requesting federated access. You must pass an inline or managed session policy to this operation. You can pass a single JSON policy document to use as an inline session policy. You can also specify up to 10 managed policies to use as managed session policies. The plain text that you use for both inline and managed session policies can't exceed 2,048 characters. You can provide up to 10 managed policy ARNs. For more information about ARNs, see Amazon Resource Names (ARNs) and AWS Service Namespaces in the AWS General Reference. This parameter is optional. However, if you do not pass any session policies, then the resulting federated user session has no permissions. When you pass session policies, the session permissions are the intersection of the IAM user policies and the session policies that you pass. This gives you a way to further restrict the permissions for a federated user. You cannot use session policies to grant more permissions than those that are defined in the permissions policy of the IAM user. For more information, see Session Policies in the IAM User Guide. The resulting credentials can be used to access a resource that has a resource-based policy. If that policy specifically references the federated user session in the Principal element of the policy, the session has the permissions allowed by the policy. These permissions are granted in addition to the permissions that are granted by the session policies.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.  
 - `Tags`: A list of session tags. Each session tag consists of a key name and an associated value. For more information about session tags, see Passing Session Tags in STS in the IAM User Guide. This parameter is optional. You can pass up to 50 session tags. The plain text session tag keys can’t exceed 128 characters and the values can’t exceed 256 characters. For these and additional limits, see IAM and STS Character Limits in the IAM User Guide.  An AWS conversion compresses the passed session policies and session tags into a packed binary format that has a separate limit. Your request can fail for this limit even if your plain text meets the other requirements. The PackedPolicySize response element indicates by percentage how close the policies and tags for your request are to the upper size limit.   You can pass a session tag with the same key as a tag that is already attached to the user you are federating. When you do, session tags override a user tag with the same key.  Tag key–value pairs are not case sensitive, but case is preserved. This means that you cannot have separate Department and department tag keys. Assume that the role has the Department=Marketing tag and you pass the department=engineering session tag. Department and department are not saved as separate tags, and the session tag passed in the request takes precedence over the role tag.
 """
diff --git a/src/services/support.jl b/src/services/support.jl
index cf6b922241..eea18e3baf 100644
--- a/src/services/support.jl
+++ b/src/services/support.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: support
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AddAttachmentsToSet()
 
diff --git a/src/services/swf.jl b/src/services/swf.jl
index 52da318c30..048f33f4e6 100644
--- a/src/services/swf.jl
+++ b/src/services/swf.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: swf
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CountClosedWorkflowExecutions()
 
@@ -303,7 +303,7 @@ Used by workers to get an ActivityTask from the specified activity taskList. Thi
 
 # Required Parameters
 - `domain`: The name of the domain that contains the task lists being polled.
-- `taskList`: Specifies the task list to poll for activity tasks. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
+- `taskList`: Specifies the task list to poll for activity tasks. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
 
 # Optional Parameters
 - `identity`: Identity of the worker making the request, recorded in the ActivityTaskStarted event in the workflow history. This enables diagnostic tracing when problems arise. The form of this identity is user defined.
@@ -319,7 +319,7 @@ Used by deciders to get a DecisionTask from the specified decision taskList. A d
 
 # Required Parameters
 - `domain`: The name of the domain containing the task lists to poll.
-- `taskList`: Specifies the task list to poll for decision tasks. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
+- `taskList`: Specifies the task list to poll for decision tasks. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
 
 # Optional Parameters
 - `identity`: Identity of the decider making the request, which is recorded in the DecisionTaskStarted event in the workflow history. This enables diagnostic tracing when problems arise. The form of this identity is user defined.
@@ -353,8 +353,8 @@ Registers a new activity type along with its configuration settings in the speci
 
 # Required Parameters
 - `domain`: The name of the domain in which this activity is to be registered.
-- `name`: The name of the activity type within the domain. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
-- `version`: The version of the activity type.  The activity type consists of the name and version, the combination of which must be unique within the domain.  The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
+- `name`: The name of the activity type within the domain. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
+- `version`: The version of the activity type.  The activity type consists of the name and version, the combination of which must be unique within the domain.  The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
 
 # Optional Parameters
 - `defaultTaskHeartbeatTimeout`: If set, specifies the default maximum time before which a worker processing a task of this type must report progress by calling RecordActivityTaskHeartbeat. If the timeout is exceeded, the activity task is automatically timed out. This default can be overridden when scheduling an activity task using the ScheduleActivityTask Decision. If the activity worker subsequently attempts to record a heartbeat or returns a result, the activity worker receives an UnknownResource fault. In this case, Amazon SWF no longer considers the activity task to be valid; the activity worker should clean up the activity task. The duration is specified in seconds, an integer greater than or equal to 0. You can use NONE to specify unlimited duration.
@@ -375,7 +375,7 @@ register_activity_type(domain, name, version, args::AbstractDict{String, <:Any};
 Registers a new domain.  Access Control  You can use IAM policies to control this action's access to Amazon SWF resources as follows:   You cannot use an IAM policy to control domain access for this action. The name of the domain being registered is available as the resource of this action.   Use an Action element to allow or deny permission to call this action.   You cannot use an IAM policy to constrain this action's parameters.   If the caller doesn't have sufficient permissions to invoke the action, or the parameter values fall outside the specified constraints, the action fails. The associated event attribute's cause parameter is set to OPERATION_NOT_PERMITTED. For details and example IAM policies, see Using IAM to Manage Access to Amazon SWF Workflows in the Amazon SWF Developer Guide.
 
 # Required Parameters
-- `name`: Name of the domain to register. The name must be unique in the region that the domain is registered in. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
+- `name`: Name of the domain to register. The name must be unique in the region that the domain is registered in. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
 - `workflowExecutionRetentionPeriodInDays`: The duration (in days) that records and histories of workflow executions on the domain should be kept by the service. After the retention period, the workflow execution isn't available in the results of visibility calls. If you pass the value NONE or 0 (zero), then the workflow execution history isn't retained. As soon as the workflow execution completes, the execution record and its history are deleted. The maximum workflow execution retention period is 90 days. For more information about Amazon SWF service limits, see: Amazon SWF Service Limits in the Amazon SWF Developer Guide.
 
 # Optional Parameters
@@ -393,8 +393,8 @@ Registers a new workflow type and its configuration settings in the specified do
 
 # Required Parameters
 - `domain`: The name of the domain in which to register the workflow type.
-- `name`: The name of the workflow type. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
-- `version`: The version of the workflow type.  The workflow type consists of the name and version, the combination of which must be unique within the domain. To get a list of all currently registered workflow types, use the ListWorkflowTypes action.  The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
+- `name`: The name of the workflow type. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
+- `version`: The version of the workflow type.  The workflow type consists of the name and version, the combination of which must be unique within the domain. To get a list of all currently registered workflow types, use the ListWorkflowTypes action.  The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
 
 # Optional Parameters
 - `defaultChildPolicy`: If set, specifies the default policy to use for the child workflow executions when a workflow execution of this type is terminated, by calling the TerminateWorkflowExecution action explicitly or due to an expired timeout. This default can be overridden when starting a workflow execution using the StartWorkflowExecution action or the StartChildWorkflowExecution Decision. The supported child policies are:    TERMINATE – The child executions are terminated.    REQUEST_CANCEL – A request to cancel is attempted for each child execution by recording a WorkflowExecutionCancelRequested event in its history. It is up to the decider to take appropriate actions when it receives an execution history with this event.    ABANDON – No action is taken. The child executions continue to run.  
@@ -512,7 +512,7 @@ Starts an execution of the workflow type in the specified domain using the provi
 
 # Required Parameters
 - `domain`: The name of the domain in which the workflow execution is created.
-- `workflowId`: The user defined identifier associated with the workflow execution. You can use this to associate a custom identifier with the workflow execution. You may specify the same identifier if a workflow execution is logically a restart of a previous execution. You cannot have two open workflow executions with the same workflowId at the same time within the same domain. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
+- `workflowId`: The user defined identifier associated with the workflow execution. You can use this to associate a custom identifier with the workflow execution. You may specify the same identifier if a workflow execution is logically a restart of a previous execution. You cannot have two open workflow executions with the same workflowId at the same time within the same domain. The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
 - `workflowType`: The type of the workflow to start.
 
 # Optional Parameters
@@ -521,7 +521,7 @@ Starts an execution of the workflow type in the specified domain using the provi
 - `input`: The input for the workflow execution. This is a free form string which should be meaningful to the workflow you are starting. This input is made available to the new workflow execution in the WorkflowExecutionStarted history event.
 - `lambdaRole`: The IAM role to attach to this workflow execution.  Executions of this workflow type need IAM roles to invoke Lambda functions. If you don't attach an IAM role, any attempt to schedule a Lambda task fails. This results in a ScheduleLambdaFunctionFailed history event. For more information, see https://docs.aws.amazon.com/amazonswf/latest/developerguide/lambda-task.html in the Amazon SWF Developer Guide. 
 - `tagList`: The list of tags to associate with the workflow execution. You can specify a maximum of 5 tags. You can list workflow executions with a specific tag by calling ListOpenWorkflowExecutions or ListClosedWorkflowExecutions and specifying a TagFilter.
-- `taskList`: The task list to use for the decision tasks generated for this workflow execution. This overrides the defaultTaskList specified when registering the workflow type.  A task list for this workflow execution must be specified either as a default for the workflow type or through this parameter. If neither this parameter is set nor a default task list was specified at registration time then a fault is returned.  The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters ( u0000- u001f |  u007f- u009f). Also, it must not be the literal string arn.
+- `taskList`: The task list to use for the decision tasks generated for this workflow execution. This overrides the defaultTaskList specified when registering the workflow type.  A task list for this workflow execution must be specified either as a default for the workflow type or through this parameter. If neither this parameter is set nor a default task list was specified at registration time then a fault is returned.  The specified string must not start or end with whitespace. It must not contain a : (colon), / (slash), | (vertical bar), or any control characters (u0000-u001f | u007f-u009f). Also, it must not be the literal string arn.
 - `taskPriority`: The task priority to use for this workflow execution. This overrides any default priority that was assigned when the workflow type was registered. If not set, then the default task priority for the workflow type is used. Valid values are integers that range from Java's Integer.MIN_VALUE (-2147483648) to Integer.MAX_VALUE (2147483647). Higher numbers indicate higher priority. For more information about setting task priority, see Setting Task Priority in the Amazon SWF Developer Guide.
 - `taskStartToCloseTimeout`: Specifies the maximum duration of decision tasks for this workflow execution. This parameter overrides the defaultTaskStartToCloseTimout specified when registering the workflow type using RegisterWorkflowType. The duration is specified in seconds, an integer greater than or equal to 0. You can use NONE to specify unlimited duration.  A task start-to-close timeout for this workflow execution must be specified either as a default for the workflow type or through this parameter. If neither this parameter is set nor a default task start-to-close timeout was specified at registration time then a fault is returned. 
 """
diff --git a/src/services/synthetics.jl b/src/services/synthetics.jl
index 135b6a9814..bb653a6410 100644
--- a/src/services/synthetics.jl
+++ b/src/services/synthetics.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: synthetics
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateCanary()
 
diff --git a/src/services/textract.jl b/src/services/textract.jl
index c67aa76520..7dd1cf78b4 100644
--- a/src/services/textract.jl
+++ b/src/services/textract.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: textract
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AnalyzeDocument()
 
diff --git a/src/services/transcribe.jl b/src/services/transcribe.jl
index 06d7e3103a..a8864124fb 100644
--- a/src/services/transcribe.jl
+++ b/src/services/transcribe.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: transcribe
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateLanguageModel()
 
diff --git a/src/services/transfer.jl b/src/services/transfer.jl
index 7b04466a6d..3143c6dc59 100644
--- a/src/services/transfer.jl
+++ b/src/services/transfer.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: transfer
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateServer()
 
@@ -37,9 +37,9 @@ Creates a user and associates them with an existing file transfer protocol-enabl
 
 # Optional Parameters
 - `HomeDirectory`: The landing directory (folder) for a user when they log in to the file transfer protocol-enabled server using the client. An example is  your-Amazon-S3-bucket-name&gt;/home/username .
-- `HomeDirectoryMappings`: Logical directory mappings that specify what Amazon S3 paths and keys should be visible to your user and how you want to make them visible. You will need to specify the \"Entry\" and \"Target\" pair, where Entry shows how the path is made visible and Target is the actual Amazon S3 path. If you only specify a target, it will be displayed as is. You will need to also make sure that your IAM role provides access to paths in Target. The following is an example.  '[ \"/bucket2/documentation\", { \"Entry\": \"your-personal-report.pdf\", \"Target\": \"/bucket3/customized-reports/ {transfer:UserName}.pdf\" } ]'  In most cases, you can use this value instead of the scope-down policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set Entry to '/' and set Target to the HomeDirectory parameter value.  If the target of a logical directory entry does not exist in Amazon S3, the entry will be ignored. As a workaround, you can use the Amazon S3 API to create 0 byte objects as place holders for your directory. If using the CLI, use the s3api call instead of s3 so you can use the put-object operation. For example, you use the following: aws s3api put-object --bucket bucketname --key path/to/folder/. Make sure that the end of the key name ends in a '/' for it to be considered a folder. 
+- `HomeDirectoryMappings`: Logical directory mappings that specify what Amazon S3 paths and keys should be visible to your user and how you want to make them visible. You will need to specify the \"Entry\" and \"Target\" pair, where Entry shows how the path is made visible and Target is the actual Amazon S3 path. If you only specify a target, it will be displayed as is. You will need to also make sure that your IAM role provides access to paths in Target. The following is an example.  '[ \"/bucket2/documentation\", { \"Entry\": \"your-personal-report.pdf\", \"Target\": \"/bucket3/customized-reports/{transfer:UserName}.pdf\" } ]'  In most cases, you can use this value instead of the scope-down policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set Entry to '/' and set Target to the HomeDirectory parameter value.  If the target of a logical directory entry does not exist in Amazon S3, the entry will be ignored. As a workaround, you can use the Amazon S3 API to create 0 byte objects as place holders for your directory. If using the CLI, use the s3api call instead of s3 so you can use the put-object operation. For example, you use the following: aws s3api put-object --bucket bucketname --key path/to/folder/. Make sure that the end of the key name ends in a '/' for it to be considered a folder. 
 - `HomeDirectoryType`: The type of landing directory (folder) you want your users' home directory to be when they log into the file transfer protocol-enabled server. If you set it to PATH, the user will see the absolute Amazon S3 bucket paths as is in their file transfer protocol clients. If you set it LOGICAL, you will need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 paths visible to your users.
-- `Policy`: A scope-down policy for your user so you can use the same IAM role across multiple users. This policy scopes down user access to portions of their Amazon S3 bucket. Variables that you can use inside this policy include  {Transfer:UserName},  {Transfer:HomeDirectory}, and  {Transfer:HomeBucket}.  For scope-down policies, AWS Transfer Family stores the policy as a JSON blob, instead of the Amazon Resource Name (ARN) of the policy. You save the policy as a JSON blob and pass it in the Policy argument. For an example of a scope-down policy, see Creating a scope-down policy. For more information, see AssumeRole in the AWS Security Token Service API Reference. 
+- `Policy`: A scope-down policy for your user so you can use the same IAM role across multiple users. This policy scopes down user access to portions of their Amazon S3 bucket. Variables that you can use inside this policy include {Transfer:UserName}, {Transfer:HomeDirectory}, and {Transfer:HomeBucket}.  For scope-down policies, AWS Transfer Family stores the policy as a JSON blob, instead of the Amazon Resource Name (ARN) of the policy. You save the policy as a JSON blob and pass it in the Policy argument. For an example of a scope-down policy, see Creating a scope-down policy. For more information, see AssumeRole in the AWS Security Token Service API Reference. 
 - `SshPublicKeyBody`: The public portion of the Secure Shell (SSH) key used to authenticate the user to the file transfer protocol-enabled server.
 - `Tags`: Key-value pairs that can be used to group and search for users. Tags are metadata attached to users for any purpose.
 """
@@ -307,9 +307,9 @@ Assigns new properties to a user. Parameters you pass modify any or all of the f
 
 # Optional Parameters
 - `HomeDirectory`: Specifies the landing directory (folder) for a user when they log in to the file transfer protocol-enabled server using their file transfer protocol client. An example is your-Amazon-S3-bucket-name&gt;/home/username.
-- `HomeDirectoryMappings`: Logical directory mappings that specify what Amazon S3 paths and keys should be visible to your user and how you want to make them visible. You will need to specify the \"Entry\" and \"Target\" pair, where Entry shows how the path is made visible and Target is the actual Amazon S3 path. If you only specify a target, it will be displayed as is. You will need to also make sure that your IAM role provides access to paths in Target. The following is an example.  '[ \"/bucket2/documentation\", { \"Entry\": \"your-personal-report.pdf\", \"Target\": \"/bucket3/customized-reports/ {transfer:UserName}.pdf\" } ]'  In most cases, you can use this value instead of the scope-down policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set Entry to '/' and set Target to the HomeDirectory parameter value.  If the target of a logical directory entry does not exist in Amazon S3, the entry will be ignored. As a workaround, you can use the Amazon S3 API to create 0 byte objects as place holders for your directory. If using the CLI, use the s3api call instead of s3 so you can use the put-object operation. For example, you use the following: aws s3api put-object --bucket bucketname --key path/to/folder/. Make sure that the end of the key name ends in a / for it to be considered a folder. 
+- `HomeDirectoryMappings`: Logical directory mappings that specify what Amazon S3 paths and keys should be visible to your user and how you want to make them visible. You will need to specify the \"Entry\" and \"Target\" pair, where Entry shows how the path is made visible and Target is the actual Amazon S3 path. If you only specify a target, it will be displayed as is. You will need to also make sure that your IAM role provides access to paths in Target. The following is an example.  '[ \"/bucket2/documentation\", { \"Entry\": \"your-personal-report.pdf\", \"Target\": \"/bucket3/customized-reports/{transfer:UserName}.pdf\" } ]'  In most cases, you can use this value instead of the scope-down policy to lock your user down to the designated home directory (\"chroot\"). To do this, you can set Entry to '/' and set Target to the HomeDirectory parameter value.  If the target of a logical directory entry does not exist in Amazon S3, the entry will be ignored. As a workaround, you can use the Amazon S3 API to create 0 byte objects as place holders for your directory. If using the CLI, use the s3api call instead of s3 so you can use the put-object operation. For example, you use the following: aws s3api put-object --bucket bucketname --key path/to/folder/. Make sure that the end of the key name ends in a / for it to be considered a folder. 
 - `HomeDirectoryType`: The type of landing directory (folder) you want your users' home directory to be when they log into the file transfer protocol-enabled server. If you set it to PATH, the user will see the absolute Amazon S3 bucket paths as is in their file transfer protocol clients. If you set it LOGICAL, you will need to provide mappings in the HomeDirectoryMappings for how you want to make Amazon S3 paths visible to your users.
-- `Policy`: Allows you to supply a scope-down policy for your user so you can use the same IAM role across multiple users. The policy scopes down user access to portions of your Amazon S3 bucket. Variables you can use inside this policy include  {Transfer:UserName},  {Transfer:HomeDirectory}, and  {Transfer:HomeBucket}.  For scope-down policies, AWS Transfer Family stores the policy as a JSON blob, instead of the Amazon Resource Name (ARN) of the policy. You save the policy as a JSON blob and pass it in the Policy argument. For an example of a scope-down policy, see Creating a scope-down policy. For more information, see AssumeRole in the AWS Security Token Service API Reference. 
+- `Policy`: Allows you to supply a scope-down policy for your user so you can use the same IAM role across multiple users. The policy scopes down user access to portions of your Amazon S3 bucket. Variables you can use inside this policy include {Transfer:UserName}, {Transfer:HomeDirectory}, and {Transfer:HomeBucket}.  For scope-down policies, AWS Transfer Family stores the policy as a JSON blob, instead of the Amazon Resource Name (ARN) of the policy. You save the policy as a JSON blob and pass it in the Policy argument. For an example of a scope-down policy, see Creating a scope-down policy. For more information, see AssumeRole in the AWS Security Token Service API Reference. 
 - `Role`: The IAM role that controls your users' access to your Amazon S3 bucket. The policies attached to this role will determine the level of access you want to provide your users when transferring files into and out of your Amazon S3 bucket or buckets. The IAM role should also contain a trust relationship that allows the file transfer protocol-enabled server to access your resources when servicing your users' transfer requests.
 """
 
diff --git a/src/services/translate.jl b/src/services/translate.jl
index ee0f11abd6..731e0c985a 100644
--- a/src/services/translate.jl
+++ b/src/services/translate.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: translate
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     DeleteTerminology()
 
diff --git a/src/services/waf.jl b/src/services/waf.jl
index a97fc4931c..10e46bdbd0 100644
--- a/src/services/waf.jl
+++ b/src/services/waf.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: waf
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     CreateByteMatchSet()
 
@@ -917,7 +917,7 @@ update_byte_match_set(ByteMatchSetId, ChangeToken, Updates, args::AbstractDict{S
 """
     UpdateGeoMatchSet()
 
- This is AWS WAF Classic documentation. For more information, see AWS WAF Classic in the developer guide.  For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS WAF Developer Guide. With the latest version, AWS WAF has a single set of endpoints for regional and global use.   Inserts or deletes GeoMatchConstraint objects in an GeoMatchSet. For each GeoMatchConstraint object, you specify the following values:    Whether to insert or delete the object from the array. If you want to change an GeoMatchConstraint object, you delete the existing object and add a new one.   The Type. The only valid value for Type is Country.   The Value, which is a two character code for the country to add to the GeoMatchConstraint object. Valid codes are listed in GeoMatchConstraint Value.   To create and configure an GeoMatchSet, perform the following steps:   Submit a CreateGeoMatchSet request.   Use GetChangeToken to get the change token that you provide in the ChangeToken parameter of an UpdateGeoMatchSet request.   Submit an UpdateGeoMatchSet request to specify the country that you want AWS WAF to watch for.   When you update an GeoMatchSet, you specify the country that you want to add and/or the country that you want to delete. If you want to change a country, you delete the existing country and add the new one. For more information about how to use the AWS WAF API to allow or block HTTP requests, see the AWS WAF Developer Guide.
+ This is AWS WAF Classic documentation. For more information, see AWS WAF Classic in the developer guide.  For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS WAF Developer Guide. With the latest version, AWS WAF has a single set of endpoints for regional and global use.   Inserts or deletes GeoMatchConstraint objects in an GeoMatchSet. For each GeoMatchConstraint object, you specify the following values:    Whether to insert or delete the object from the array. If you want to change an GeoMatchConstraint object, you delete the existing object and add a new one.   The Type. The only valid value for Type is Country.   The Value, which is a two character code for the country to add to the GeoMatchConstraint object. Valid codes are listed in GeoMatchConstraintValue.   To create and configure an GeoMatchSet, perform the following steps:   Submit a CreateGeoMatchSet request.   Use GetChangeToken to get the change token that you provide in the ChangeToken parameter of an UpdateGeoMatchSet request.   Submit an UpdateGeoMatchSet request to specify the country that you want AWS WAF to watch for.   When you update an GeoMatchSet, you specify the country that you want to add and/or the country that you want to delete. If you want to change a country, you delete the existing country and add the new one. For more information about how to use the AWS WAF API to allow or block HTTP requests, see the AWS WAF Developer Guide.
 
 # Required Parameters
 - `ChangeToken`: The value returned by the most recent call to GetChangeToken.
@@ -1053,7 +1053,7 @@ update_sql_injection_match_set(ChangeToken, SqlInjectionMatchSetId, Updates, arg
 """
     UpdateWebACL()
 
- This is AWS WAF Classic documentation. For more information, see AWS WAF Classic in the developer guide.  For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS WAF Developer Guide. With the latest version, AWS WAF has a single set of endpoints for regional and global use.   Inserts or deletes ActivatedRule objects in a WebACL. Each Rule identifies web requests that you want to allow, block, or count. When you update a WebACL, you specify the following values:   A default action for the WebACL, either ALLOW or BLOCK. AWS WAF performs the default action if a request doesn't match the criteria in any of the Rules in a WebACL.   The Rules that you want to add or delete. If you want to replace one Rule with another, you delete the existing Rule and add the new one.   For each Rule, whether you want AWS WAF to allow requests, block requests, or count requests that match the conditions in the Rule.   The order in which you want AWS WAF to evaluate the Rules in a WebACL. If you add more than one Rule to a WebACL, AWS WAF evaluates each request against the Rules in order based on the value of Priority. (The Rule that has the lowest value for Priority is evaluated first.) When a web request matches all the predicates (such as ByteMatchSets and IPSets) in a Rule, AWS WAF immediately takes the corresponding action, allow or block, and doesn't evaluate the request against the remaining Rules in the WebACL, if any.    To create and configure a WebACL, perform the following steps:   Create and update the predicates that you want to include in Rules. For more information, see CreateByteMatchSet, UpdateByteMatchSet, CreateIPSet, UpdateIPSet, CreateSqlInjectionMatchSet, and UpdateSqlInjectionMatchSet.   Create and update the Rules that you want to include in the WebACL. For more information, see CreateRule and UpdateRule.   Create a WebACL. See CreateWebACL.   Use GetChangeToken to get the change token that you provide in the ChangeToken parameter of an UpdateWebACL request.   Submit an UpdateWebACL request to specify the Rules that you want to include in the WebACL, to specify the default action, and to associate the WebACL with a CloudFront distribution.  The ActivatedRule can be a rule group. If you specify a rule group as your ActivatedRule , you can exclude specific rules from that rule group. If you already have a rule group associated with a web ACL and want to submit an UpdateWebACL request to exclude certain rules from that rule group, you must first remove the rule group from the web ACL, the re-insert it again, specifying the excluded rules. For details, see ActivatedRule ExcludedRules .    Be aware that if you try to add a RATE_BASED rule to a web ACL without setting the rule type when first creating the rule, the UpdateWebACL request will fail because the request tries to add a REGULAR rule (the default rule type) with the specified ID, which does not exist.  For more information about how to use the AWS WAF API to allow or block HTTP requests, see the AWS WAF Developer Guide.
+ This is AWS WAF Classic documentation. For more information, see AWS WAF Classic in the developer guide.  For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS WAF Developer Guide. With the latest version, AWS WAF has a single set of endpoints for regional and global use.   Inserts or deletes ActivatedRule objects in a WebACL. Each Rule identifies web requests that you want to allow, block, or count. When you update a WebACL, you specify the following values:   A default action for the WebACL, either ALLOW or BLOCK. AWS WAF performs the default action if a request doesn't match the criteria in any of the Rules in a WebACL.   The Rules that you want to add or delete. If you want to replace one Rule with another, you delete the existing Rule and add the new one.   For each Rule, whether you want AWS WAF to allow requests, block requests, or count requests that match the conditions in the Rule.   The order in which you want AWS WAF to evaluate the Rules in a WebACL. If you add more than one Rule to a WebACL, AWS WAF evaluates each request against the Rules in order based on the value of Priority. (The Rule that has the lowest value for Priority is evaluated first.) When a web request matches all the predicates (such as ByteMatchSets and IPSets) in a Rule, AWS WAF immediately takes the corresponding action, allow or block, and doesn't evaluate the request against the remaining Rules in the WebACL, if any.    To create and configure a WebACL, perform the following steps:   Create and update the predicates that you want to include in Rules. For more information, see CreateByteMatchSet, UpdateByteMatchSet, CreateIPSet, UpdateIPSet, CreateSqlInjectionMatchSet, and UpdateSqlInjectionMatchSet.   Create and update the Rules that you want to include in the WebACL. For more information, see CreateRule and UpdateRule.   Create a WebACL. See CreateWebACL.   Use GetChangeToken to get the change token that you provide in the ChangeToken parameter of an UpdateWebACL request.   Submit an UpdateWebACL request to specify the Rules that you want to include in the WebACL, to specify the default action, and to associate the WebACL with a CloudFront distribution.  The ActivatedRule can be a rule group. If you specify a rule group as your ActivatedRule , you can exclude specific rules from that rule group. If you already have a rule group associated with a web ACL and want to submit an UpdateWebACL request to exclude certain rules from that rule group, you must first remove the rule group from the web ACL, the re-insert it again, specifying the excluded rules. For details, see ActivatedRuleExcludedRules .    Be aware that if you try to add a RATE_BASED rule to a web ACL without setting the rule type when first creating the rule, the UpdateWebACL request will fail because the request tries to add a REGULAR rule (the default rule type) with the specified ID, which does not exist.  For more information about how to use the AWS WAF API to allow or block HTTP requests, see the AWS WAF Developer Guide.
 
 # Required Parameters
 - `ChangeToken`: The value returned by the most recent call to GetChangeToken.
diff --git a/src/services/waf_regional.jl b/src/services/waf_regional.jl
index 17f829401b..ded0118eae 100644
--- a/src/services/waf_regional.jl
+++ b/src/services/waf_regional.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: waf_regional
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateWebACL()
 
@@ -972,7 +972,7 @@ update_byte_match_set(ByteMatchSetId, ChangeToken, Updates, args::AbstractDict{S
 """
     UpdateGeoMatchSet()
 
- This is AWS WAF Classic documentation. For more information, see AWS WAF Classic in the developer guide.  For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS WAF Developer Guide. With the latest version, AWS WAF has a single set of endpoints for regional and global use.   Inserts or deletes GeoMatchConstraint objects in an GeoMatchSet. For each GeoMatchConstraint object, you specify the following values:    Whether to insert or delete the object from the array. If you want to change an GeoMatchConstraint object, you delete the existing object and add a new one.   The Type. The only valid value for Type is Country.   The Value, which is a two character code for the country to add to the GeoMatchConstraint object. Valid codes are listed in GeoMatchConstraint Value.   To create and configure an GeoMatchSet, perform the following steps:   Submit a CreateGeoMatchSet request.   Use GetChangeToken to get the change token that you provide in the ChangeToken parameter of an UpdateGeoMatchSet request.   Submit an UpdateGeoMatchSet request to specify the country that you want AWS WAF to watch for.   When you update an GeoMatchSet, you specify the country that you want to add and/or the country that you want to delete. If you want to change a country, you delete the existing country and add the new one. For more information about how to use the AWS WAF API to allow or block HTTP requests, see the AWS WAF Developer Guide.
+ This is AWS WAF Classic documentation. For more information, see AWS WAF Classic in the developer guide.  For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS WAF Developer Guide. With the latest version, AWS WAF has a single set of endpoints for regional and global use.   Inserts or deletes GeoMatchConstraint objects in an GeoMatchSet. For each GeoMatchConstraint object, you specify the following values:    Whether to insert or delete the object from the array. If you want to change an GeoMatchConstraint object, you delete the existing object and add a new one.   The Type. The only valid value for Type is Country.   The Value, which is a two character code for the country to add to the GeoMatchConstraint object. Valid codes are listed in GeoMatchConstraintValue.   To create and configure an GeoMatchSet, perform the following steps:   Submit a CreateGeoMatchSet request.   Use GetChangeToken to get the change token that you provide in the ChangeToken parameter of an UpdateGeoMatchSet request.   Submit an UpdateGeoMatchSet request to specify the country that you want AWS WAF to watch for.   When you update an GeoMatchSet, you specify the country that you want to add and/or the country that you want to delete. If you want to change a country, you delete the existing country and add the new one. For more information about how to use the AWS WAF API to allow or block HTTP requests, see the AWS WAF Developer Guide.
 
 # Required Parameters
 - `ChangeToken`: The value returned by the most recent call to GetChangeToken.
@@ -1108,7 +1108,7 @@ update_sql_injection_match_set(ChangeToken, SqlInjectionMatchSetId, Updates, arg
 """
     UpdateWebACL()
 
- This is AWS WAF Classic documentation. For more information, see AWS WAF Classic in the developer guide.  For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS WAF Developer Guide. With the latest version, AWS WAF has a single set of endpoints for regional and global use.   Inserts or deletes ActivatedRule objects in a WebACL. Each Rule identifies web requests that you want to allow, block, or count. When you update a WebACL, you specify the following values:   A default action for the WebACL, either ALLOW or BLOCK. AWS WAF performs the default action if a request doesn't match the criteria in any of the Rules in a WebACL.   The Rules that you want to add or delete. If you want to replace one Rule with another, you delete the existing Rule and add the new one.   For each Rule, whether you want AWS WAF to allow requests, block requests, or count requests that match the conditions in the Rule.   The order in which you want AWS WAF to evaluate the Rules in a WebACL. If you add more than one Rule to a WebACL, AWS WAF evaluates each request against the Rules in order based on the value of Priority. (The Rule that has the lowest value for Priority is evaluated first.) When a web request matches all the predicates (such as ByteMatchSets and IPSets) in a Rule, AWS WAF immediately takes the corresponding action, allow or block, and doesn't evaluate the request against the remaining Rules in the WebACL, if any.    To create and configure a WebACL, perform the following steps:   Create and update the predicates that you want to include in Rules. For more information, see CreateByteMatchSet, UpdateByteMatchSet, CreateIPSet, UpdateIPSet, CreateSqlInjectionMatchSet, and UpdateSqlInjectionMatchSet.   Create and update the Rules that you want to include in the WebACL. For more information, see CreateRule and UpdateRule.   Create a WebACL. See CreateWebACL.   Use GetChangeToken to get the change token that you provide in the ChangeToken parameter of an UpdateWebACL request.   Submit an UpdateWebACL request to specify the Rules that you want to include in the WebACL, to specify the default action, and to associate the WebACL with a CloudFront distribution.  The ActivatedRule can be a rule group. If you specify a rule group as your ActivatedRule , you can exclude specific rules from that rule group. If you already have a rule group associated with a web ACL and want to submit an UpdateWebACL request to exclude certain rules from that rule group, you must first remove the rule group from the web ACL, the re-insert it again, specifying the excluded rules. For details, see ActivatedRule ExcludedRules .    Be aware that if you try to add a RATE_BASED rule to a web ACL without setting the rule type when first creating the rule, the UpdateWebACL request will fail because the request tries to add a REGULAR rule (the default rule type) with the specified ID, which does not exist.  For more information about how to use the AWS WAF API to allow or block HTTP requests, see the AWS WAF Developer Guide.
+ This is AWS WAF Classic documentation. For more information, see AWS WAF Classic in the developer guide.  For the latest version of AWS WAF, use the AWS WAFV2 API and see the AWS WAF Developer Guide. With the latest version, AWS WAF has a single set of endpoints for regional and global use.   Inserts or deletes ActivatedRule objects in a WebACL. Each Rule identifies web requests that you want to allow, block, or count. When you update a WebACL, you specify the following values:   A default action for the WebACL, either ALLOW or BLOCK. AWS WAF performs the default action if a request doesn't match the criteria in any of the Rules in a WebACL.   The Rules that you want to add or delete. If you want to replace one Rule with another, you delete the existing Rule and add the new one.   For each Rule, whether you want AWS WAF to allow requests, block requests, or count requests that match the conditions in the Rule.   The order in which you want AWS WAF to evaluate the Rules in a WebACL. If you add more than one Rule to a WebACL, AWS WAF evaluates each request against the Rules in order based on the value of Priority. (The Rule that has the lowest value for Priority is evaluated first.) When a web request matches all the predicates (such as ByteMatchSets and IPSets) in a Rule, AWS WAF immediately takes the corresponding action, allow or block, and doesn't evaluate the request against the remaining Rules in the WebACL, if any.    To create and configure a WebACL, perform the following steps:   Create and update the predicates that you want to include in Rules. For more information, see CreateByteMatchSet, UpdateByteMatchSet, CreateIPSet, UpdateIPSet, CreateSqlInjectionMatchSet, and UpdateSqlInjectionMatchSet.   Create and update the Rules that you want to include in the WebACL. For more information, see CreateRule and UpdateRule.   Create a WebACL. See CreateWebACL.   Use GetChangeToken to get the change token that you provide in the ChangeToken parameter of an UpdateWebACL request.   Submit an UpdateWebACL request to specify the Rules that you want to include in the WebACL, to specify the default action, and to associate the WebACL with a CloudFront distribution.  The ActivatedRule can be a rule group. If you specify a rule group as your ActivatedRule , you can exclude specific rules from that rule group. If you already have a rule group associated with a web ACL and want to submit an UpdateWebACL request to exclude certain rules from that rule group, you must first remove the rule group from the web ACL, the re-insert it again, specifying the excluded rules. For details, see ActivatedRuleExcludedRules .    Be aware that if you try to add a RATE_BASED rule to a web ACL without setting the rule type when first creating the rule, the UpdateWebACL request will fail because the request tries to add a REGULAR rule (the default rule type) with the specified ID, which does not exist.  For more information about how to use the AWS WAF API to allow or block HTTP requests, see the AWS WAF Developer Guide.
 
 # Required Parameters
 - `ChangeToken`: The value returned by the most recent call to GetChangeToken.
diff --git a/src/services/wafv2.jl b/src/services/wafv2.jl
index 800b047b3e..578a23ae6e 100644
--- a/src/services/wafv2.jl
+++ b/src/services/wafv2.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: wafv2
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateWebACL()
 
diff --git a/src/services/workdocs.jl b/src/services/workdocs.jl
index 6887b8330d..ba03e44948 100644
--- a/src/services/workdocs.jl
+++ b/src/services/workdocs.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: workdocs
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AbortDocumentVersionUpload()
 
diff --git a/src/services/worklink.jl b/src/services/worklink.jl
index 75b7ab5664..8739f89944 100644
--- a/src/services/worklink.jl
+++ b/src/services/worklink.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: worklink
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateDomain()
 
diff --git a/src/services/workmail.jl b/src/services/workmail.jl
index b9b5a851d6..7e692477a2 100644
--- a/src/services/workmail.jl
+++ b/src/services/workmail.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: workmail
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateDelegateToResource()
 
diff --git a/src/services/workmailmessageflow.jl b/src/services/workmailmessageflow.jl
index e5f021faf7..81558040c3 100644
--- a/src/services/workmailmessageflow.jl
+++ b/src/services/workmailmessageflow.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: workmailmessageflow
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     GetRawMessageContent()
 
diff --git a/src/services/workspaces.jl b/src/services/workspaces.jl
index 85f2159cd2..a0d0b2ec5a 100644
--- a/src/services/workspaces.jl
+++ b/src/services/workspaces.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: workspaces
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     AssociateIpGroups()
 
@@ -362,7 +362,7 @@ list_available_management_cidr_ranges(ManagementCidrRangeConstraint, args::Abstr
 """
     MigrateWorkspace()
 
-Migrates a WorkSpace from one operating system or bundle type to another, while retaining the data on the user volume. The migration process recreates the WorkSpace by using a new root volume from the target bundle image and the user volume from the last available snapshot of the original WorkSpace. During migration, the original D: Users %USERNAME% user profile folder is renamed to D: Users %USERNAME%MMddyyTHHmmss%.NotMigrated. A new D: Users %USERNAME%  folder is generated by the new OS. Certain files in the old user profile are moved to the new user profile. For available migration scenarios, details about what happens during migration, and best practices, see Migrate a WorkSpace.
+Migrates a WorkSpace from one operating system or bundle type to another, while retaining the data on the user volume. The migration process recreates the WorkSpace by using a new root volume from the target bundle image and the user volume from the last available snapshot of the original WorkSpace. During migration, the original D:Users%USERNAME% user profile folder is renamed to D:Users%USERNAME%MMddyyTHHmmss%.NotMigrated. A new D:Users%USERNAME% folder is generated by the new OS. Certain files in the old user profile are moved to the new user profile. For available migration scenarios, details about what happens during migration, and best practices, see Migrate a WorkSpace.
 
 # Required Parameters
 - `BundleId`: The identifier of the target bundle type to migrate the WorkSpace to.
diff --git a/src/services/xray.jl b/src/services/xray.jl
index 1c14c9602b..f0ee09b88c 100644
--- a/src/services/xray.jl
+++ b/src/services/xray.jl
@@ -2,8 +2,8 @@
 using AWS
 using AWS.AWSServices: xray
 
-using Compat
-using UUIDs
+using AWS.Compat
+using AWS.UUIDs
 """
     BatchGetTraces()
 
diff --git a/test/resources/TestPkg/Project.toml b/test/resources/TestPkg/Project.toml
new file mode 100644
index 0000000000..f7a3808119
--- /dev/null
+++ b/test/resources/TestPkg/Project.toml
@@ -0,0 +1,10 @@
+name = "TestPkg"
+uuid = "0b677583-7719-5417-97d5-0bb959d9de70"
+version = "0.0.1"
+
+[deps]
+AWS = "fbe9abb3-538b-5e4e-ba9e-bc94f4f92ebc"
+
+[compat]
+AWS = "1"
+julia = "1"
diff --git a/test/resources/TestPkg/src/TestPkg.jl b/test/resources/TestPkg/src/TestPkg.jl
new file mode 100644
index 0000000000..263211b72f
--- /dev/null
+++ b/test/resources/TestPkg/src/TestPkg.jl
@@ -0,0 +1,7 @@
+module TestPkg
+
+using AWS
+
+@service S3
+
+end
diff --git a/test/runtests.jl b/test/runtests.jl
index 24d0c9ae72..567a525bb5 100644
--- a/test/runtests.jl
+++ b/test/runtests.jl
@@ -14,7 +14,9 @@ using JSON
 using OrderedCollections: LittleDict, OrderedDict
 using MbedTLS: digest, MD_SHA256, MD_MD5
 using Mocking
+using Pkg
 using Retry
+using Suppressor
 using Test
 using UUIDs
 using XMLDict
@@ -31,4 +33,5 @@ aws = AWSConfig()
     include("AWSCredentials.jl")
     include("AWSExceptions.jl")
     include("AWSMetadataUtilities.jl")
+    include("test_pkg.jl")
 end
diff --git a/test/test_pkg.jl b/test/test_pkg.jl
new file mode 100644
index 0000000000..6e67dc9c4c
--- /dev/null
+++ b/test/test_pkg.jl
@@ -0,0 +1,18 @@
+path = joinpath(@__DIR__, "resources", "TestPkg")
+
+if VERSION >= v"1.5"
+    Pkg.develop(path=path)
+else
+    Pkg.develop(PackageSpec(path=path))
+end
+
+# Check to see if we get any warnings when using AWS.jl inside of another package.
+out = @capture_out begin
+    err = @capture_err begin
+        @eval using TestPkg
+    end
+
+    @test isempty(err)
+end
+
+@test isempty(out)